暂降事件查询

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java

@@ -28,25 +28,21 @@ public class CsEquipmentDeliveryDTO  {
     /**
      * id
      */
-    @TableField(value = "id")
     private String id;
 
     /**
      * 装置名称
      */
-    @TableField(value = "name")
     private String name;
 
     /**
      * 网关识别码
      */
-    @TableField(value = "ndid")
     private String ndid;
 
     /**
      * 装置mac地址
      */
-    @TableField(value = "mac")
     private String mac;
 
     /**
@@ -58,31 +54,26 @@ public class CsEquipmentDeliveryDTO  {
     /**
      * 装置类型(直连设备、网关设备、装置)
      */
-    @TableField(value = "dev_type")
     private String devType;
 
     /**
      * 装置型号（pqs588、pqs680...）
      */
-    @TableField(value = "dev_model")
     private String devModel;
 
     /**
      * 装置接入方式（mqtt、cloud）
      */
-    @TableField(value = "dev_access_method")
     private String devAccessMethod;
 
     /**
      * 装置程序版本
      */
-    @TableField(value = "program_version")
     private String programVersion;
 
     /**
      * 调试人员
      */
-    @TableField(value = "debug_person")
     private String debugPerson;
 
 
@@ -90,26 +81,23 @@ public class CsEquipmentDeliveryDTO  {
     /**
      * 合同号
      */
-    @TableField(value = "cntract_no")
     private String cntractNo;
 
     /**
      * 营销经理
      */
-    @TableField(value = "sales_manager")
     private String salesManager;
 
     /**
      * 接入状态(1:未注册 2:注册 3:接入)
      */
-    @TableField(value = "status")
     private String status;
 
     /**
      * 设备状态(0:删除 1:离线 2:在线)
      */
-    @TableField(value = "run_status")
     private Integer runStatus;
 
+    private Integer moduleNumber;
 
 }

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

@@ -261,8 +261,10 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 //            userId = null;
 //        }
         /*如何为空前端没传，查询所有*/
+        List<String> device = new ArrayList<>();
         if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){
             List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+            device = roleEngineerDevService.getDevice();
             appProjectQueryParm.setEngineeringIds(roleengineer);
 
             if(CollectionUtils.isEmpty(roleengineer)){
@@ -274,11 +276,17 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
 
         QueryWrapper<CsLedger> queryWrapper = new QueryWrapper<>();
         returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
+        List<String> finalDevice = device;
         List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {
             AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
-            queryWrapper.clear();
-            queryWrapper.lambda().eq(CsLedger::getPid,temp.getId()).eq(CsLedger::getState,1);
-            Integer integer = csLedgerMapper.selectCount(queryWrapper);
+            Integer integer =0;
+            if(!CollectionUtils.isEmpty(finalDevice)){
+                queryWrapper.clear();
+                queryWrapper.lambda().eq(CsLedger::getPid,temp.getId()).eq(CsLedger::getState,1).in(CsLedger::getId, finalDevice);
+
+                integer = csLedgerMapper.selectCount(queryWrapper);
+            }
+
             temp.setDevNum(integer);
             appTopologyDiagramQueryParm.setProjectId(temp.getId());