list = csEngineeringUserService.getEngineeringByUser(userIndex);
+ return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+ }
+
+}
+
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEngineeringUserMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEngineeringUserMapper.java
new file mode 100644
index 0000000..07cd1ba
--- /dev/null
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEngineeringUserMapper.java
@@ -0,0 +1,16 @@
+package com.njcn.csdevice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsEngineeringUserPO;
+
+/**
+ *
+ * 工程用户关系表 Mapper 接口
+ *
+ *
+ * @author xuyang
+ * @since 2023-05-29
+ */
+public interface CsEngineeringUserMapper extends BaseMapper {
+
+}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppProjectService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppProjectService.java
index 78b5652..ce5d5cf 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppProjectService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/AppProjectService.java
@@ -8,6 +8,8 @@ import com.njcn.csdevice.pojo.param.AppProjectQueryParm;
import com.njcn.csdevice.pojo.po.AppProjectPO;
import com.njcn.csdevice.pojo.vo.AppProjectVO;
+import java.util.List;
+
/**
*
* Description:
@@ -43,4 +45,11 @@ public interface AppProjectService extends IService {
* @Date: 2023/3/28
*/
IPage queryProject(AppProjectQueryParm appProjectQueryParm);
+
+ /**
+ * 根据工程获取项目
+ * @param list
+ * @return
+ */
+ List getProjectByEngineering(List list);
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java
index 2a61a3e..8d0f7e7 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java
@@ -48,4 +48,11 @@ public interface CsEngineeringService extends IService{
* @Date: 2023/4/12
*/
IPage queryEngineeringPage(CsEngineeringQueryPageParm csEngineeringQueryPageParm);
+
+ /**
+ * 根据工程id获取工程信息
+ * @param list
+ * @return
+ */
+ List getEngineerings(List list);
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java
index 5700654..4c36f44 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java
@@ -15,6 +15,15 @@ import java.util.List;
*/
public interface CsLinePOService extends IService{
+ /**
+ * 根据装置id获取监测点
+ * @param list
+ * @return
+ */
+ List getLineByDev(List list);
+
List queryByDevId(String devId);
+
+
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsProjectEquipmentService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsProjectEquipmentService.java
index 5162b86..65c04dc 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsProjectEquipmentService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsProjectEquipmentService.java
@@ -3,6 +3,8 @@ package com.njcn.csdevice.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.csdevice.pojo.po.CsProjectEquipmentPO;
+import java.util.List;
+
/**
*
@@ -15,5 +17,11 @@ import com.njcn.csdevice.pojo.po.CsProjectEquipmentPO;
*/
public interface CsProjectEquipmentService extends IService{
+ /**
+ * 根据项目获取装置
+ * @param list
+ * @return
+ */
+ List getDeviceByProject(List list);
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEngineeringUserService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEngineeringUserService.java
new file mode 100644
index 0000000..5d04897
--- /dev/null
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsEngineeringUserService.java
@@ -0,0 +1,19 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+
+import java.util.List;
+
+/**
+ *
+ * 工程用户关系表 服务类
+ *
+ *
+ * @author xuyang
+ * @since 2023-05-29
+ */
+public interface ICsEngineeringUserService {
+
+ List getEngineeringByUser(String userIndex);
+
+}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IDeviceService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IDeviceService.java
new file mode 100644
index 0000000..e7f0bfd
--- /dev/null
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IDeviceService.java
@@ -0,0 +1,17 @@
+package com.njcn.csdevice.service;
+
+import com.njcn.csdevice.pojo.vo.LedgerTreeVO;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/29 19:53
+ */
+
+public interface IDeviceService {
+
+ LedgerTreeVO getLedgerTree();
+
+}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
index 00af0a4..82046f3 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.csdevice.mapper.AppProjectMapper;
-import com.njcn.csdevice.pojo.param.*;
+import com.njcn.csdevice.pojo.param.AppProjectAddParm;
+import com.njcn.csdevice.pojo.param.AppProjectAuditParm;
+import com.njcn.csdevice.pojo.param.AppProjectQueryParm;
+import com.njcn.csdevice.pojo.param.AppTopologyDiagramAddParm;
import com.njcn.csdevice.pojo.po.AppProjectPO;
import com.njcn.csdevice.pojo.vo.AppProjectVO;
import com.njcn.csdevice.service.AppProjectService;
@@ -17,6 +20,8 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
@@ -122,4 +127,9 @@ public class AppProjectServiceImpl extends ServiceImpl getProjectByEngineering(List list) {
+ return this.lambdaQuery().in(AppProjectPO::getEngineeringId,list).list();
+ }
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
index c5fde52..7c65b88 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
@@ -105,6 +105,11 @@ public class CsEngineeringServiceImpl extends ServiceImpl getEngineerings(List list) {
+ return this.lambdaQuery().in(CsEngineeringPO::getId,list).list();
+ }
+
public String getAreaById(String id){
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringUserServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringUserServiceImpl.java
new file mode 100644
index 0000000..3ec8b10
--- /dev/null
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringUserServiceImpl.java
@@ -0,0 +1,41 @@
+package com.njcn.csdevice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.mapper.CsEngineeringUserMapper;
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+import com.njcn.csdevice.pojo.po.CsEngineeringUserPO;
+import com.njcn.csdevice.service.CsEngineeringService;
+import com.njcn.csdevice.service.ICsEngineeringUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * 工程用户关系表 服务实现类
+ *
+ *
+ * @author xuyang
+ * @since 2023-05-29
+ */
+@Service
+@RequiredArgsConstructor
+public class CsEngineeringUserServiceImpl extends ServiceImpl implements ICsEngineeringUserService {
+
+ private final CsEngineeringService csEngineeringService;
+
+ @Override
+ public List getEngineeringByUser(String userIndex) {
+ List result = new ArrayList<>();
+ List list = this.lambdaQuery().eq(CsEngineeringUserPO::getUserId, userIndex).list();
+ if (!CollectionUtils.isEmpty(list)) {
+ List engineering = list.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());
+ result = csEngineeringService.getEngineerings(engineering);
+ }
+ return result;
+ }
+}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
index 30d3484..609a481 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
@@ -19,6 +19,11 @@ import java.util.List;
@Service
public class CsLinePOServiceImpl extends ServiceImpl implements CsLinePOService{
+ @Override
+ public List getLineByDev(List list) {
+ return this.lambdaQuery().eq(CsLinePO::getDevId,list).list();
+ }
+
@Override
public List queryByDevId(String devId) {
QueryWrapper queryWrapper = new QueryWrapper();
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsProjectEquipmentServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsProjectEquipmentServiceImpl.java
index f5e24db..b5ae0db 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsProjectEquipmentServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsProjectEquipmentServiceImpl.java
@@ -6,6 +6,8 @@ import com.njcn.csdevice.pojo.po.CsProjectEquipmentPO;
import com.njcn.csdevice.service.CsProjectEquipmentService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
@@ -19,4 +21,8 @@ import org.springframework.stereotype.Service;
@Service
public class CsProjectEquipmentServiceImpl extends ServiceImpl implements CsProjectEquipmentService {
+ @Override
+ public List getDeviceByProject(List list) {
+ return this.lambdaQuery().in(CsProjectEquipmentPO::getProjectId,list).list();
+ }
}
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceServiceImpl.java
new file mode 100644
index 0000000..3c5dbc8
--- /dev/null
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceServiceImpl.java
@@ -0,0 +1,97 @@
+package com.njcn.csdevice.service.impl;
+
+import com.njcn.csdevice.pojo.po.AppProjectPO;
+import com.njcn.csdevice.pojo.po.CsEngineeringPO;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.po.CsProjectEquipmentPO;
+import com.njcn.csdevice.pojo.vo.LedgerTreeVO;
+import com.njcn.csdevice.service.*;
+import com.njcn.web.utils.RequestUtil;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/5/29 19:53
+ */
+@Service
+@AllArgsConstructor
+public class DeviceServiceImpl implements IDeviceService {
+
+ private final ICsEngineeringUserService csEngineeringUserService;
+
+ private final AppProjectService appProjectService;
+
+ private final CsProjectEquipmentService csProjectEquipmentService;
+
+ private final CsLinePOService csLinePOService;
+
+
+ @Override
+ public LedgerTreeVO getLedgerTree() {
+ List list1;
+ List list2;
+ List list3;
+ List children = new ArrayList<>();
+ LedgerTreeVO ledgerTreeVo = new LedgerTreeVO();
+ ledgerTreeVo.setId("0");
+ ledgerTreeVo.setName("台账管理");
+ String userIndex = RequestUtil.getUserIndex();
+ //获取工程
+ List list = csEngineeringUserService.getEngineeringByUser(userIndex);
+ if (!CollectionUtils.isEmpty(list)){
+ list.forEach(item->{
+ LedgerTreeVO vo = new LedgerTreeVO();
+ BeanUtils.copyProperties(item,vo);
+ children.add(vo);
+ });
+ ledgerTreeVo.setChildren(children);
+ }
+
+
+
+
+
+
+// if (!CollectionUtils.isEmpty(list)){
+// List engineeringList = list.stream().map(CsEngineeringPO::getId).collect(Collectors.toList());
+// //获取项目
+// list1 = appProjectService.getProjectByEngineering(engineeringList);
+// if (!CollectionUtils.isEmpty(list1)){
+// List projectList = list1.stream().map(AppProjectPO::getId).collect(Collectors.toList());
+// //获取装置
+// list2 = csProjectEquipmentService.getDeviceByProject(projectList);
+// if (!CollectionUtils.isEmpty(list2)){
+// List deviceList = list2.stream().map(CsProjectEquipmentPO::getId).collect(Collectors.toList());
+// //获取监测点
+// list3 = csLinePOService.getLineByDev(deviceList);
+// list2.stream().map(l2 -> list3.stream().filter(l3 -> Objects.equals(l2.getEquipmentId(), l3.getDevId())).findAny().map(m -> {
+// LedgerTreeVO vo1 = new LedgerTreeVO();
+// vo1.setId(m.getLineId());
+// vo1.setPid(m.getDevId());
+// vo1.setName(m.getName());
+// test.add(vo1);
+// LedgerTreeVO vo = new LedgerTreeVO();
+// vo.setId(l2.getEquipmentId());
+// vo.setPid(l2.getProjectId());
+// vo.setName(l2.getEquipmentId());
+// vo.setChildren(test);
+// return vo;
+// })).collect(Collectors.toList());
+//
+//
+// }
+// }
+// }
+ return ledgerTreeVo;
+ }
+
+}
diff --git a/cs-device/cs-device-boot/src/main/resources/bootstrap.yml b/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
index 222d245..b5a0b1c 100644
--- a/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
+++ b/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
@@ -45,7 +45,7 @@ logging:
#mybatis配置信息
mybatis-plus:
#别名扫描
- type-aliases-package: com.njcn.device.pojo
+ type-aliases-package: com.njcn.csdevice.pojo
mqtt:
client-id: @artifactId@${random.value}
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/target/classes/bootstrap.yml b/cs-device/cs-device-boot/target/classes/bootstrap.yml
index 08c3233..a73613f 100644
--- a/cs-device/cs-device-boot/target/classes/bootstrap.yml
+++ b/cs-device/cs-device-boot/target/classes/bootstrap.yml
@@ -45,7 +45,7 @@ logging:
#mybatis配置信息
mybatis-plus:
#别名扫描
- type-aliases-package: com.njcn.device.pojo
+ type-aliases-package: com.njcn.csdevice.pojo
mqtt:
client-id: cs-device-boot${random.value}
\ No newline at end of file
diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java b/cs-system/cs-system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java
deleted file mode 100644
index 51c7a58..0000000
--- a/cs-system/cs-system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.njcn.system.api;
-
-import com.njcn.common.pojo.constant.ServerInfo;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.system.api.fallback.EpdFeignClientFallbackFactory;
-import com.njcn.system.pojo.param.EleEpdPqdParam;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2021年05月08日 15:11
- */
-@FeignClient(value = ServerInfo.CS_SYSTEM_BOOT,path = "/csDictData",fallbackFactory = EpdFeignClientFallbackFactory.class,contextId = "csDictData")
-public interface EpdFeignClient {
-
- @PostMapping("/addByModel")
- HttpResult addByModel(@RequestBody List eleEpdPqdParam);
-
- @PostMapping("/dictMarkByDataType")
- HttpResult> dictMarkByDataType(@RequestParam("dataType") String dataType);
-
- @PostMapping("/addEvt")
- HttpResult> addEvt(@RequestBody List eleEpdPqdParam);
-
-}
diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java b/cs-system/cs-system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java
deleted file mode 100644
index f193f04..0000000
--- a/cs-system/cs-system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.njcn.system.api.fallback;
-
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.system.api.EpdFeignClient;
-import com.njcn.system.pojo.param.EleEpdPqdParam;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.utils.CsSystemEnumUtil;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * 类的介绍：
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/5/24 18:46
- */
-@Slf4j
-@Component
-public class EpdFeignClientFallbackFactory implements FallbackFactory {
- @Override
- public EpdFeignClient create(Throwable cause) {
- //判断抛出异常是否为解码器抛出的业务异常
- Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
- if(cause.getCause() instanceof BusinessException){
- BusinessException businessException = (BusinessException) cause.getCause();
- exceptionEnum = CsSystemEnumUtil.getExceptionEnum(businessException.getResult());
- }
- Enum finalExceptionEnum = exceptionEnum;
- return new EpdFeignClient() {
- @Override
- public HttpResult addByModel(List eleEpdPqdParam) {
- log.error("{}异常，降级处理，异常为：{}","通过模板录入字典数据",cause.toString());
- throw new BusinessException(finalExceptionEnum);
- }
-
- @Override
- public HttpResult> dictMarkByDataType(String dataType) {
- log.error("{}异常，降级处理，异常为：{}","通过数据模型获取字典数据组装唯一标识",cause.toString());
- throw new BusinessException(finalExceptionEnum);
- }
-
- @Override
- public HttpResult> addEvt(List eleEpdPqdParam) {
- log.error("{}异常，降级处理，异常为：{}","录入事件字典",cause.toString());
- throw new BusinessException(finalExceptionEnum);
- }
- };
- }
-}
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
deleted file mode 100644
index b45196a..0000000
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.njcn.system.controller;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.common.utils.LogUtil;
-import com.njcn.system.pojo.param.EleEpdPqdParam;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.vo.EleEpdPqdVO;
-import com.njcn.system.service.IEleEpdPqdService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author xuyang
- * @since 2023-05-24
- */
-@Slf4j
-@RestController
-@RequestMapping("/csDictData")
-@RequiredArgsConstructor
-@Api(tags = "数据字典")
-@Validated
-public class EleEpdPqdController extends BaseController {
-
- private final IEleEpdPqdService eleEpdPqdService;
-
- @PostMapping("/addByModel")
- @OperateInfo(info = LogEnum.BUSINESS_COMMON)
- @ApiOperation("根据模板录入字典数据")
- @ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
- @ApiIgnore
- public HttpResult addByModel(@RequestBody @Validated List eleEpdPqdParam){
- log.info("根据模板录入字典数据");
- String methodDescribe = getMethodDescribe("addByModel");
- LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
- eleEpdPqdService.saveData(eleEpdPqdParam);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
- }
-
- @PostMapping("/add")
- @OperateInfo(info = LogEnum.BUSINESS_COMMON)
- @ApiOperation("新增字典数据")
- @ApiImplicitParam(name = "eleEpdPqdParam", value = "字典数据", required = true)
- public HttpResult add(@RequestBody @Validated EleEpdPqdParam eleEpdPqdParam){
- log.info("录入字典数据");
- String methodDescribe = getMethodDescribe("add");
- LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
- eleEpdPqdService.add(eleEpdPqdParam);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
- }
-
- @PostMapping("/delete")
- @OperateInfo(info = LogEnum.BUSINESS_COMMON)
- @ApiOperation("删除字典数据")
- @ApiImplicitParam(name = "id", value = "字典数据id", required = true)
- public HttpResult delete(@RequestParam String id){
- log.info("删除字典数据");
- String methodDescribe = getMethodDescribe("delete");
- LogUtil.njcnDebug(log, "{}，字典id为:", methodDescribe);
- eleEpdPqdService.delete(id);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
- }
-
- @PostMapping("/update")
- @OperateInfo(info = LogEnum.BUSINESS_COMMON)
- @ApiOperation("更新字典数据")
- @ApiImplicitParam(name = "updateParam", value = "字典数据", required = true)
- public HttpResult update(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdUpdateParam updateParam){
- log.info("更新字典数据");
- String methodDescribe = getMethodDescribe("update");
- LogUtil.njcnDebug(log, "{}，字典数据为:", updateParam);
- eleEpdPqdService.update(updateParam);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
- }
-
- @OperateInfo(info = LogEnum.SYSTEM_COMMON)
- @PostMapping("/list")
- @ApiOperation("列表分页")
- @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
- public HttpResult> getList(@RequestBody @Validated EleEpdPqdParam.EleEpdPqdQueryParam queryParam) {
- String methodDescribe = getMethodDescribe("getList");
- LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
- Page list = eleEpdPqdService.eleEpdPqdList(queryParam);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
- }
-
- @OperateInfo(info = LogEnum.SYSTEM_COMMON)
- @PostMapping("/dictMarkByDataType")
- @ApiOperation("字典数据组装唯一标识")
- @ApiImplicitParam(name = "dataType", value = "数据模型", required = true)
- @ApiIgnore
- public HttpResult> dictMarkByDataType(@RequestParam("dataType") @Validated String dataType) {
- String methodDescribe = getMethodDescribe("dictMark");
- List list = eleEpdPqdService.dictMarkByDataType(dataType);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
- }
-
- @PostMapping("/addEvt")
- @OperateInfo(info = LogEnum.BUSINESS_COMMON)
- @ApiOperation("事件录入字典数据")
- @ApiImplicitParam(name = "eleEpdPqdParam", value = "模板的字典数据", required = true)
- @ApiIgnore
- public HttpResult> addEvt(@RequestBody @Validated List eleEpdPqdParam){
- log.info("根据模板录入字典数据");
- String methodDescribe = getMethodDescribe("addEvt");
- LogUtil.njcnDebug(log, "{}，模板当前解析字典数据为:", methodDescribe);
- Map map = eleEpdPqdService.saveEvt(eleEpdPqdParam);
- return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
- }
-
-}
-
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java b/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java
deleted file mode 100644
index 220c82b..0000000
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/EleEpdPqdMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.njcn.system.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.vo.EleEpdPqdVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author xuyang
- * @since 2023-05-24
- */
-public interface EleEpdPqdMapper extends MppBaseMapper {
-
- Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper);
-
-}
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
deleted file mode 100644
index 79558f0..0000000
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java b/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
deleted file mode 100644
index 06d6899..0000000
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.njcn.system.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.system.pojo.param.EleEpdPqdParam;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.vo.EleEpdPqdVO;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- * 服务类
- *
- *
- * @author xuyang
- * @since 2023-05-24
- */
-public interface IEleEpdPqdService {
-
- /**
- * 存储模板的字典数据
- * @param eleEpdPqdParam
- */
- void saveData(List eleEpdPqdParam);
-
- /**
- * 存储字典数据
- * @param eleEpdPqdParam
- */
- void add(EleEpdPqdParam eleEpdPqdParam);
-
- /**
- * 删除字典数据
- * @param id
- */
- void delete(String id);
-
- /**
- * 更新字典数据
- * @param updateParam
- */
- void update(EleEpdPqdParam.EleEpdPqdUpdateParam updateParam);
-
- /**
- * 查询字典分页
- * @param queryParam
- * @return
- */
- Page eleEpdPqdList(EleEpdPqdParam.EleEpdPqdQueryParam queryParam);
-
- /**
- * 查询所有字典数据组成唯一标识，用于验证字典是否重复
- * @return
- */
- List dictMarkByDataType(String dataType);
-
- /**
- * 存储事件的字典数据
- * @param eleEpdPqdParam
- */
- Map saveEvt(List eleEpdPqdParam);
-}
diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
deleted file mode 100644
index 1f7eee1..0000000
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.njcn.system.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.db.constant.DbConstant;
-import com.njcn.system.enums.CsSystemResponseEnum;
-import com.njcn.system.mapper.EleEpdPqdMapper;
-import com.njcn.system.pojo.param.EleEpdPqdParam;
-import com.njcn.system.pojo.po.EleEpdPqd;
-import com.njcn.system.pojo.vo.EleEpdPqdVO;
-import com.njcn.system.service.IEleEpdPqdService;
-import com.njcn.web.factory.PageFactory;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author xuyang
- * @since 2023-05-24
- */
-@Service
-public class EleEpdPqdServiceImpl extends MppServiceImpl implements IEleEpdPqdService {
-
- @Override
- public void saveData(List eleEpdPqdParam) {
- List list = eleEpdPqdParam.stream().map(item->{
- EleEpdPqd eleEpdPqd = new EleEpdPqd();
- BeanUtils.copyProperties(item,eleEpdPqd);
- if (StringUtils.isBlank(item.getType())){
- eleEpdPqd.setType("");
- }
- return eleEpdPqd;
- }).collect(Collectors.toList());
- this.saveBatch(list,1000);
- }
-
- @Override
- public void add(EleEpdPqdParam eleEpdPqdParam) {
- checkEleEpdPqdParam(eleEpdPqdParam,false);
- EleEpdPqd eleEpdPqd = new EleEpdPqd();
- BeanUtils.copyProperties(eleEpdPqdParam,eleEpdPqd);
- this.save(eleEpdPqd);
- }
-
- @Override
- public void delete(String id) {
- this.baseMapper.deleteById(id);
- }
-
- @Override
- public void update(EleEpdPqdParam.EleEpdPqdUpdateParam updateParam) {
- checkEleEpdPqdParam(updateParam,true);
- EleEpdPqd eleEpdPqd = new EleEpdPqd();
- BeanUtils.copyProperties(updateParam,eleEpdPqd);
- this.updateById(eleEpdPqd);
- }
-
- @Override
- public Page eleEpdPqdList(EleEpdPqdParam.EleEpdPqdQueryParam queryParam) {
- QueryWrapper queryWrapper = new QueryWrapper();
- if (ObjectUtil.isNotNull(queryParam)) {
- //查询参数不为空，进行条件填充
- if (StrUtil.isNotBlank(queryParam.getSearchValue())) {
- //部门根据名称模糊查询
- queryWrapper
- .and(param -> param.like("ele_epd_pqd.Name", queryParam.getSearchValue())
- .or().like("ele_epd_pqd.Other_Name", queryParam.getSearchValue())
- .or().like("ele_epd_pqd.Show_Name", queryParam.getSearchValue()));
- }
- //排序
- if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
- queryWrapper.orderBy(true, queryParam.getOrderBy().equalsIgnoreCase(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
- } else {
- //默认根据sort排序
- queryWrapper.orderBy(true, true, "Sort");
- }
- }
- return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
- }
-
- @Override
- public List dictMarkByDataType(String dataType) {
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(EleEpdPqd::getDataType,dataType);
- return this.baseMapper.selectList(lambdaQueryWrapper);
- }
-
- @Override
- public Map saveEvt(List eleEpdPqdParam) {
- List list = eleEpdPqdParam.stream().map(item->{
- EleEpdPqd eleEpdPqd = new EleEpdPqd();
- BeanUtils.copyProperties(item,eleEpdPqd);
- if (StringUtils.isBlank(item.getType())){
- eleEpdPqd.setType("");
- }
- return eleEpdPqd;
- }).collect(Collectors.toList());
- this.saveBatch(list,1000);
- List nameList = eleEpdPqdParam.stream().map(EleEpdPqdParam::getName).collect(Collectors.toList());
- LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper();
- lambdaQueryWrapper.in(EleEpdPqd::getName,nameList);
- List list1 = this.baseMapper.selectList(lambdaQueryWrapper);
- Map map = new HashMap<>();
- list1.forEach(item->{
- map.put(item.getName(),item.getId());
- });
- return map;
- }
-
- /**
- * 校验参数，
- * 1.检查是否存在相同名称的菜单
- * 名称 && 路径做唯一判断
- */
- private void checkEleEpdPqdParam(EleEpdPqdParam eleEpdPqdParam, boolean isExcludeSelf) {
- LambdaQueryWrapper eleEpdPqdLambdaQueryWrapper = new LambdaQueryWrapper<>();
- eleEpdPqdLambdaQueryWrapper
- .eq(EleEpdPqd::getName, eleEpdPqdParam.getName())
- .eq(EleEpdPqd::getPhase, eleEpdPqdParam.getPhase())
- .eq(EleEpdPqd::getClassId,eleEpdPqdParam.getClassId())
- .eq(EleEpdPqd::getDataType, eleEpdPqdParam.getDataType());
- //更新的时候，需排除当前记录
- if (isExcludeSelf) {
- if (eleEpdPqdParam instanceof EleEpdPqdParam.EleEpdPqdUpdateParam) {
- eleEpdPqdLambdaQueryWrapper.ne(EleEpdPqd::getId, ((EleEpdPqdParam.EleEpdPqdUpdateParam) eleEpdPqdParam).getId());
- }
- }
- int countByAccount = this.count(eleEpdPqdLambdaQueryWrapper);
- //大于等于1个则表示重复
- if (countByAccount >= 1) {
- throw new BusinessException(CsSystemResponseEnum.DICT_REPEAT);
- }
- }
-}