数据模板调整

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -31,7 +31,6 @@ import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.db.constant.DbConstant;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
-import com.njcn.poi.util.PoiUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -277,13 +276,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 modelId = csDevModelRelationService.getModelByType(deviceId,0);
                 dataSet = csDataSetService.findDataSetByModelId(modelId,0);
             }
-            //负载侧监测点
+            //电网侧监测点
-            else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
+            else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
                 modelId = csDevModelRelationService.getModelByType(deviceId,1);
                 dataSet = csDataSetService.findDataSetByModelId(modelId,1);
             }
-            //电网侧监测点
+            //负载侧监测点
-            else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
+            else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
                 modelId = csDevModelRelationService.getModelByType(deviceId,1);
                 dataSet = csDataSetService.findDataSetByModelId(modelId,2);
             }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -97,9 +97,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             String areaCode =  dicDataFeignClient.getDicDataById(position).getData().getCode();
             if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){
                 clDid = "0";
-            } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
-                clDid = "1";
             } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){
+                clDid = "1";
+            } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
                 clDid = "2";
             }
             //获取当前组的所有指标项
@@ -153,9 +153,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             String areaCode =  dicDataFeignClient.getDicDataById(position).getData().getCode();
             if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){
                 clDid = "0";
-            } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
-                clDid = "1";
             } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){
+                clDid = "1";
+            } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
                 clDid = "2";
             }
             //获取当前组的所有指标项

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -160,7 +160,7 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
     @Override
     public CsLedger findDataById(String id) {
-        return this.lambdaQuery().eq(CsLedger::getId,id).one();
+        return this.lambdaQuery().eq(CsLedger::getId,id).eq(CsLedger::getState,1).one();
     }
 
     @Override

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java

@@ -64,4 +64,11 @@ public class CsEventPO extends BaseEntity {
      */
     @TableField(value = "type")
     private Integer type;
+
+    /**
+     * 逻辑子设备id
+     * 电能质量设备是监测点、治理设备是各个模块
+     */
+    @TableField(value = "cl_did")
+    private Integer clDid;
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java

@@ -86,13 +86,13 @@ public class LineTargetServiceImpl implements ILineTargetService {
             modelId = devModelRelationFeignClient.getModelByType(devId,0).getData();
             dataSetList = dataSetFeignClient.getDataSet(modelId,0).getData();
         }
-        //负载侧监测点
+        //电网侧监测点
-        else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
+        else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
             modelId = devModelRelationFeignClient.getModelByType(devId,1).getData();
             dataSetList = dataSetFeignClient.getDataSet(modelId,1).getData();
         }
-        //电网侧监测点
+        //负载侧监测点
-        else if (Objects.equals(code, DicDataEnum.GRID_SIDE.getCode())){
+        else if (Objects.equals(code, DicDataEnum.LOAD_SIDE.getCode())){
             modelId = devModelRelationFeignClient.getModelByType(devId,1).getData();
             dataSetList = dataSetFeignClient.getDataSet(modelId,2).getData();
         }
@@ -149,9 +149,9 @@ public class LineTargetServiceImpl implements ILineTargetService {
         String areaCode =  dicDataFeignClient.getDicDataById(position).getData().getCode();
         if (Objects.equals(areaCode, DicDataEnum.OUTPUT_SIDE.getCode())){
             clDid = "0";
-        } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
-            clDid = "1";
         } else if (Objects.equals(areaCode, DicDataEnum.GRID_SIDE.getCode())){
+            clDid = "1";
+        } else if (Objects.equals(areaCode, DicDataEnum.LOAD_SIDE.getCode())){
             clDid = "2";
         }
         return clDid;