优化离线设备查询接口、添加巡检记最外层备注字段

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionRecordServiceImpl.java

@@ -198,6 +198,7 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
             patrolInspectionRecordVo.setTenantId(patrolInspectionRecordList.get(i).getTenantId());
             patrolInspectionRecordVo.setCompanyId(patrolInspectionRecordList.get(i).getCompanyId());
             patrolInspectionRecordVo.setCreator(patrolInspectionRecordList.get(i).getCreator());
+            patrolInspectionRecordVo.setRemarks(patrolInspectionRecordList.get(i).getRemarks());
             patrolInspectionRecordVo.setRecordPictureList(patrolInspectionRecordPictureList);
             patrolInspectionRecordVo.setContentVoList(patrolInspectionContentVoList);
             list.add(patrolInspectionRecordVo);

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpHj2017Service.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface SpHj2017Service extends CrudService<SpHj2017> {
     List<Map<String, Object>> statusCount(String requestBody);
     List<Map<String, Object>> typeList(String requestBody);
-    Long countDevice (String requestBody);
+    Integer countDevice (String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpRtu2017Service.java

@@ -19,5 +19,5 @@ public interface SpRtu2017Service extends CrudService<SpRtu2017> {
 
     List<Map<String, Object>> typeList(String requestBody);
 
-    Long countDevice(String requestBody);
+    Integer countDevice(String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpSj2017Service.java

@@ -17,5 +17,5 @@ import java.util.Map;
 public interface SpSj2017Service extends CrudService<SpSj2017> {
     List<Map<String, Object>> statusCount(String requestBody);
     List<Map<String, Object>> typeList(String deviceCode);
-    Long countDevice(String requestBody);
+    Integer countDevice(String requestBody);
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpHj2017ServiceImpl.java

@@ -85,7 +85,7 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
         return deviceStatusList1;
     }
 
-    public Long countDevice(String requestBody) {
+    public Integer countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
 
@@ -94,7 +94,7 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
                 .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
         List<SpHj2017> SpHj2017 = this.list(queryWrapper1);
 
-        Long deviceCount = Long.valueOf(SpHj2017.size());
+        Integer deviceCount = SpHj2017.size();
 
         return deviceCount;
     }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpRtu2017ServiceImpl.java

@@ -87,7 +87,7 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
         return deviceStatusList1;
     }
 
-    public Long countDevice(String requestBody) {
+    public Integer countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
 
@@ -96,7 +96,7 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
                 .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
         List<SpRtu2017> SpRtu2017 = this.list(queryWrapper1);
 
-        Long deviceCount = Long.valueOf(SpRtu2017.size());
+        Integer deviceCount = SpRtu2017.size();
 
         return deviceCount;
     }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpSj2017ServiceImpl.java

@@ -83,17 +83,14 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         List<Map<String, Object>> deviceStatusList1 = this.listMaps(queryWrapper1);
         return deviceStatusList1;
     }
-    public Long countDevice(String requestBody) {
+    public Integer countDevice(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
         String companyCode = requestVO.get("companyCode").toString();
-
         QueryWrapper<SpSj2017> queryWrapper1 = Wrappers.query();
         queryWrapper1.select("DISTINCT device_code")
                 .inSql("device_code", "SELECT device_code FROM yt_device_status WHERE company_code = '" + companyCode + "'");
         List<SpSj2017> SpSj2017 = this.list(queryWrapper1);
-
-        Long deviceCount = Long.valueOf(SpSj2017.size());
-
+        Integer deviceCount = SpSj2017.size();
         return deviceCount;
     }
 }

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/YtDeviceStatusServiceImpl.java

@@ -115,6 +115,10 @@ public class YtDeviceStatusServiceImpl extends AbstractCrudService<YtDeviceStatu
                     // 2水系统
                     Long countSj = (spSj2017Service.countDevice(requestBody) != null) ? spSj2017Service.countDevice(requestBody) : 0L;
                     type.put("alarmDeviceSum", countSj);
+                case "液位":
+                    // 5液位
+                    Long countSjYw = (spSj2017Service.countDevice(requestBody) != null) ? spSj2017Service.countDevice(requestBody) : 0L;
+                    type.put("alarmDeviceSum", countSjYw);
                     break;
                 case "烟感系统":
                     // 3烟感系统
@@ -122,11 +126,6 @@ public class YtDeviceStatusServiceImpl extends AbstractCrudService<YtDeviceStatu
                 case "消防栓":
                     // 4消防栓
                     break;
-                case "液位":
-                    // 5液位
-                    Long countSjYw = (spSj2017Service.countDevice(requestBody) != null) ? spSj2017Service.countDevice(requestBody) : 0L;
-                    type.put("alarmDeviceSum", countSjYw);
-                    break;
                 case "rtu":
                     // 6rtu
                     Long countRtu = (spRtu2017Service.countDevice(requestBody) != null) ? spRtu2017Service.countDevice(requestBody) : 0L;