接口调整

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DataSetFeignClient.java

@@ -24,4 +24,7 @@ public interface DataSetFeignClient {
     @PostMapping("/getDataSet")
     HttpResult<List<LineTargetVO>> getDataSet(@RequestParam("modelId") String modelId,@RequestParam("clDev") Integer clDev);
 
+    @PostMapping("/getModuleDataSet")
+    HttpResult<List<CsDataSet>> getModuleDataSet(@RequestParam("modelId") String modelId);
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java

@@ -26,5 +26,5 @@ public interface EquipmentFeignClient {
     HttpResult<List<CsEquipmentDeliveryDTO>> queryDeviceById(@RequestParam("ids") List<String> ids);
 
     @PostMapping("/updateSoftInfoBynDid")
-    HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid,@RequestParam("id")  String id);
+    HttpResult<Boolean> updateSoftInfoBynDid(@RequestParam("nDId") String nDid, @RequestParam("id")  String id, @RequestParam("module") Integer module);
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java

@@ -44,6 +44,12 @@ public class DataSetFeignClientFallbackFactory implements FallbackFactory<DataSe
                 log.error("{}异常，降级处理，异常为：{}","获取数据集",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<CsDataSet>> getModuleDataSet(String modelId) {
+                log.error("{}异常，降级处理，异常为：{}","获取子模块数据集",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java

@@ -48,7 +48,7 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
             }
 
             @Override
-            public HttpResult<Boolean> updateSoftInfoBynDid(String nDid, String id) {
+            public HttpResult<Boolean> updateSoftInfoBynDid(String nDid, String id, Integer module) {
                 log.error("{}异常，降级处理，异常为：{}","根据网关id调整软件信息",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java

@@ -119,4 +119,10 @@ public class CsEquipmentDeliveryAddParm{
     @ApiModelProperty(value="软件信息")
     private String softinfoId;
 
+    /**
+     * 模块个数
+     */
+    @ApiModelProperty(value="模块个数")
+    private Integer modelNumber;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java

@@ -123,4 +123,9 @@ public class CsEquipmentDeliveryAuditParm {
     @ApiModelProperty(value="软件信息")
     private String softinfoId;
 
+    /**
+     * 模块个数
+     */
+    @ApiModelProperty(value="模块个数")
+    private Integer modelNumber;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java

@@ -132,5 +132,11 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "softinfo_id")
     private String softinfoId;
 
+    /**
+     * 模块个数
+     */
+    @TableField(value = "module_number")
+    private Integer moduleNumber;
+
 
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java

@@ -72,5 +72,13 @@ public class CsLinePO  extends BaseEntity {
     @TableField(value = "conType")
     private Integer conType;
 
+    /**
+     * 逻辑子设备id(与模板对应)
+     * 治理监测点 0
+     * 负载监测点 1
+     * 电网监测点 2
+     */
+    @TableField(value = "clDid")
+    private Integer clDid;
 
 }