接口调整

2023-06-27 20:23:07 +08:00
parent 022bf29a39
commit d07718437a
9 changed files with 74 additions and 29 deletions
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -131,10 +131,13 @@ public class EquipmentDeliveryController extends BaseController {
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/deviceData")
    @ApiOperation("装置基础数据和模板数据")
-    @ApiImplicitParam(name = "deviceId", value = "装置id", required = true)
-    public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deviceId", value = "装置id", required = true),
+            @ApiImplicitParam(name = "type", value = "类型", required = true),
+    })
+    public HttpResult<DeviceManagerVO> getDeviceData(@RequestParam String deviceId,@RequestParam String type){
        String methodDescribe = getMethodDescribe("getDeviceData");
-        DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId);
+        DeviceManagerVO vo = csEquipmentDeliveryService.getDeviceData(deviceId,type);
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
    }

--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
@@ -75,5 +75,5 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
     * 获取装置基础数据和模板数据
     * @return
     */
-    DeviceManagerVO getDeviceData(String deviceId);
+    DeviceManagerVO getDeviceData(String deviceId,String type);
 }
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
@@ -82,7 +82,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                vo1.setId(item.getDataSetId());
                DataArrayTreeVO vo2 = new DataArrayTreeVO();
                List<DataArrayTreeVO> list3 = new ArrayList<>();
-                vo2.setId("1");
+                vo2.setId(item.getDataSetId() + item.getDataArrayName());
                vo2.setName(item.getDataArrayName());
                vo2.setShowName(item.getDataArrayShowName());
                List<String> statMethodList = Arrays.asList(item.getStatMethod().split(","));
@@ -90,7 +90,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                phaseList.forEach(item2->{
                    List<DataArrayTreeVO> list4 = new ArrayList<>();
                    DataArrayTreeVO vo3 = new DataArrayTreeVO();
-                    vo3.setId("2");
+                    vo3.setId(item.getDataSetId() + item.getDataArrayName()+item2);
                    vo3.setName(item2);
                    if (Objects.equals(item2,"M")){
                        vo3.setShowName("无相别");
@@ -99,7 +99,7 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
                    }
                    statMethodList.forEach(item3->{
                        DataArrayTreeVO vo4 = new DataArrayTreeVO();
-                        vo4.setId(IdUtil.simpleUUID()+IdUtil.simpleUUID());
+                        vo4.setId(item.getDataSetId() + item.getDataArrayName()+item2 + item3);
                        vo4.setName(item3);
                        vo4.setShowName(item3);
                        list4.add(vo4);
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -1,6 +1,5 @@
 package com.njcn.csdevice.service.impl;

-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,32 +11,31 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
-import com.njcn.csdevice.enums.LineBaseEnum;
-import com.njcn.csdevice.mapper.CsDataArrayMapper;
 import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
-import com.njcn.csdevice.mapper.CsGroupMapper;
 import com.njcn.csdevice.mapper.CsLedgerMapper;
 import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAddParm;
 import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm;
 import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
 import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
-import com.njcn.csdevice.pojo.po.*;
-import com.njcn.csdevice.pojo.vo.*;
+import com.njcn.csdevice.pojo.po.CsDataSet;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.po.CsLedger;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
+import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
+import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.db.constant.DbConstant;
-import com.njcn.influx.pojo.dto.StatisticalDataDTO;
-import com.njcn.influx.service.CommonService;
-import com.njcn.system.api.EpdFeignClient;
-import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.web.factory.PageFactory;
-import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;

 /**
@@ -156,13 +154,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                queryWrapper.orderBy(true, false, "create_time");
            }
        }
-        if (Strings.isNotBlank(queryParam.getDevType()) || !Objects.isNull(queryParam.getDevType())){
+        if (StrUtil.isNotBlank(queryParam.getDevType()) || !Objects.isNull(queryParam.getDevType())){
            queryWrapper.eq("cs_equipment_delivery.dev_type", queryParam.getDevType());
        }
-        if (Strings.isNotBlank(queryParam.getDevModel()) || !Objects.isNull(queryParam.getDevModel())){
+        if (StrUtil.isNotBlank(queryParam.getDevModel()) || !Objects.isNull(queryParam.getDevModel())){
            queryWrapper.eq("cs_equipment_delivery.dev_model", queryParam.getDevModel());
        }
-        if (Strings.isNotBlank(queryParam.getDevAccessMethod()) || !Objects.isNull(queryParam.getDevAccessMethod())){
+        if (StrUtil.isNotBlank(queryParam.getDevAccessMethod()) || !Objects.isNull(queryParam.getDevAccessMethod())){
            queryWrapper.eq("cs_equipment_delivery.dev_access_method", queryParam.getDevAccessMethod());
        }
        if (!Objects.isNull(queryParam.getStatus())){
@@ -174,7 +172,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
    }

    @Override
-    public DeviceManagerVO getDeviceData(String deviceId) {
+    public DeviceManagerVO getDeviceData(String deviceId,String type) {
        DeviceManagerVO deviceManagerVo = new DeviceManagerVO();
        List<DeviceManagerVO.DataSetVO> dataSetList = new ArrayList<>();
        CsEquipmentDeliveryPO csEquipmentDeliveryPo = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getId,deviceId).one();
@@ -186,6 +184,12 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
            dataSetVO.setId(item.getId());
            dataSetVO.setName(item.getAnotherName());
            dataSetList.add(dataSetVO);
+            if (Objects.equals(type,"history")){
+                DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
+                dataSetVo2.setId(item.getId());
+                dataSetVo2.setName("历史"+item.getAnotherName());
+                dataSetList.add(dataSetVo2);
+            }
        });
        deviceManagerVo.setDataSetList(dataSetList);
        CsLedger csLedger = csLedgerService.findDataById(deviceId);
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/enums/CsHarmonicResponseEnum.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/enums/CsHarmonicResponseEnum.java
@@ -0,0 +1,31 @@
+package com.njcn.csharmonic.enums;
+
+import lombok.Getter;
+
+/**
+ * pqs
+ * Advacne枚举
+ * @author cdf
+ * @date 2021/6/21
+ */
+@Getter
+public enum CsHarmonicResponseEnum {
+
+    /**
+     * A00600 ~ A00700 用于稳态模块的枚举
+      */
+    CS_DEVICE_COMMON_ERROR("A00600","治理稳态模块异常"),
+    BIND_TARGET_ERROR("A00601","指标参数绑定异常"),
+
+    ;
+
+
+    private final String code;
+
+    private final String message;
+
+    CsHarmonicResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/ZuTaiDTO.java
@@ -55,7 +55,7 @@ public class ZuTaiDTO {
    private Double angle;

    @SerializedName("lineId")
-    private String lineId;
+    private List<String> lineId;

    @SerializedName("UID")
    private List<String> uId;
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
@@ -16,9 +16,9 @@ import org.springframework.stereotype.Component;
 import java.util.List;

 /**
- * @author hongawen
+ * @author xuyang
 * @version 1.0.0
- * @date 2022年03月23日 09:41
+ * @date 2023年06月10日 09:41
 */
@Slf4j
@Component
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java
@@ -1,13 +1,16 @@
 package com.njcn.csharmonic.service.impl;

+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.google.common.reflect.TypeToken;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.pojo.po.CsDataArray;
 import com.njcn.csdevice.pojo.po.CsDevModelPO;
 import com.njcn.csdevice.pojo.po.CsDevModelRelationPO;
 import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.pojo.vo.LineTargetVO;
+import com.njcn.csharmonic.enums.CsHarmonicResponseEnum;
 import com.njcn.csharmonic.pojo.dto.ZuTaiDTO;
 import com.njcn.csharmonic.pojo.vo.CsRtDataVO;
 import com.njcn.csharmonic.service.CsPagePOService;
@@ -19,6 +22,7 @@ import com.njcn.system.api.EpdFeignClient;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;

 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -88,11 +92,14 @@ public class LineTargetServiceImpl implements ILineTargetService {
                String targetTag = item.getTarget().split("\\$")[0];
                String phasic = item.getTarget().split("\\$")[1];
                String dataType = item.getTarget().split("\\$")[2];
+                if (CollectionUtils.isEmpty(item.getUId()) || CollectionUtils.isEmpty(item.getLineId())){
+                    throw new BusinessException(CsHarmonicResponseEnum.BIND_TARGET_ERROR);
+                }
                CsDataArray dataArray = dataArrayFeignClient.getDataArrayById(item.getUId().get(0),targetTag).getData().get(0);
                String targetName = dataArray.getAnotherName();
                String dataId = dataArray.getDataId();
                String classId = epdFeignClient.selectById(dataId).getData().getClassId();
-                result.add(getLineRtData(item.getId(),item.getLineId(),classId,targetTag,phasic,dataType,targetName));
+                result.add(getLineRtData(item.getId(),item.getLineId().get(3),classId,targetTag,phasic,dataType,targetName));
            }
        });
        return result;
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
    <!--切换阿里&华为的配置sdk-->
    <micro.sdk>common-microservice</micro.sdk>
    <!--<micro.sdk>common-huawei</micro.sdk>-->
-    <docker.operate>site</docker.operate>
+    <docker.operate>install</docker.operate>
    <java.version>1.8</java.version>
    <maven.compiler.source>8</maven.compiler.source>
    <maven.compiler.target>8</maven.compiler.target>