Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/StatusVO.java

@@ -15,8 +15,6 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = false)
 public class StatusVO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     private String  deviceId;
 
     private LocalDateTime time;

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DeviceHttpController.java

@@ -21,7 +21,7 @@ public class DeviceHttpController {
     @Autowired
     private DmpDataInfoService dmpDataInfoService;
 
-    @PutMapping("/status")
+    @GetMapping("/status")
     public ApiResult<Void> status(){
         dmpDeviceStatusService.status();
         return ApiResult.success();

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseAlarm.java

@@ -108,6 +108,11 @@ public class BaseAlarm implements Serializable {
      */
     private String sitePhoto;
 
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
     /**
      * 组织机构ID
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseAlarmType.java

@@ -42,11 +42,6 @@ public class BaseAlarmType implements Serializable {
      */
     private String typeName;
 
-    /**
-     * 产品编码
-     */
-    private String productCode;
-
     /**
      * 图标
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -54,11 +54,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
     @Override
     public CommonPage<BaseAlarmResponeVO> statistic(BaseAlarmRequestVO baseAlarmRequestVO){
-        IPage<BaseAlarmResponeVO> page = new Page<>(baseAlarmRequestVO.getCurrent(),baseAlarmRequestVO.getSize());
 
         List<BaseAlarmResponeVO> list = new ArrayList<>();
 
-        QueryWrapper<BaseAlarmType> wrapper = new QueryWrapper<>();
+        QueryWrapper<BaseAlarm> wrapper = new QueryWrapper<>();
         if(StringUtils.isNotBlank(baseAlarmRequestVO.getProductName())){
             LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
@@ -73,17 +72,15 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
             if(productCodeList.size() > 0){
                 wrapper.select("distinct product_code as productCode")
-                        .eq("delete_flag",0)
                         .in("product_code",productCodeList);
             }else{
                 wrapper.eq("product_code","");
             }
 
         }else{
-            wrapper.select("distinct product_code as productCode")
-                    .eq("delete_flag",0);
+            wrapper.select("distinct product_code as productCode");
         }
-        List<BaseAlarmType> list1 = baseAlarmTypeService.list(wrapper);
+        List<BaseAlarm> list1 = this.list(wrapper);
         if(CollectionUtils.isNotEmpty(list1)){
             for(int i=0;i<list1.size();i++){
                 BaseAlarmResponeVO responeVO = new BaseAlarmResponeVO();
@@ -98,20 +95,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     responeVO.setDeviceType(one.getDeviceType());
                 }
 
-                LambdaQueryWrapper<BaseAlarmType> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.eq(BaseAlarmType::getDeleteFlag,0)
-                        .eq(BaseAlarmType::getProductCode,list1.get(i).getProductCode());
-                List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper1);
-                List<String> alarmTypeList = new ArrayList<>();
-                if(CollectionUtils.isNotEmpty(list2)){
-                    for(int j=0;j<list2.size();j++){
-                        alarmTypeList.add(list2.get(j).getTypeCode());
-                    }
-                }
                 //未处理
-                int untreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).in(BaseAlarm::getAlarmType,alarmTypeList));
+                int untreated = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,0).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
                 //已处理
-                int processed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).in(BaseAlarm::getAlarmType,alarmTypeList));
+                int processed = this.count(Wrappers.<BaseAlarm>query().lambda().eq(BaseAlarm::getHandleStatus,1).eq(BaseAlarm::getProductCode,list1.get(i).getProductCode()));
                 //总数
                 int count = untreated+processed;
                 //处置率
@@ -147,20 +134,9 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     public CommonPage<BaseAlarm> page(BaseAlarmListVO baseAlarmListVO){
         List<BaseAlarm> list = new ArrayList<>();
 
-        LambdaQueryWrapper<BaseAlarmType> queryWrapper2 = Wrappers.lambdaQuery();
-        queryWrapper2.eq(BaseAlarmType::getDeleteFlag,0)
-                .eq(BaseAlarmType::getProductCode,baseAlarmListVO.getProductCode());
-        List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper2);
-        List<String> alarmTypeList = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(list2)){
-            for(int j=0;j<list2.size();j++){
-                alarmTypeList.add(list2.get(j).getTypeCode());
-            }
-        }
-
         LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper
-                .in(BaseAlarm::getAlarmType,alarmTypeList)
+                .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
                 .eq(baseAlarmListVO.getAlarmType() != null,BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
                 .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
                 .orderByDesc(BaseAlarm::getId);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmTypeServiceImpl.java

@@ -72,7 +72,6 @@ public class BaseAlarmTypeServiceImpl extends AbstractCrudService<BaseAlarmTypeM
         LambdaQueryWrapper<BaseAlarmType> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.like(StringUtils.isNotBlank(requestVO.getTypeCode()),BaseAlarmType::getTypeCode,requestVO.getTypeCode())
                 .like(StringUtils.isNotBlank(requestVO.getTypeName()),BaseAlarmType::getTypeName,requestVO.getTypeName())
-                .eq(StringUtils.isNotBlank(requestVO.getProductCode()),BaseAlarmType::getProductCode,requestVO.getProductCode())
                 .eq(BaseAlarmType::getDeleteFlag,0)
                 .orderByDesc(BaseAlarmType::getId);
         page  = this.page(page,queryWrapper);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseAlarmRequestVO.java

@@ -14,7 +14,7 @@ public class BaseAlarmRequestVO {
     private Integer size;
 
     /**
-     * 产品编码
+     * 产品名称
      */
     private String productName;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseAlarmTypeRequestVO.java

@@ -22,9 +22,4 @@ public class BaseAlarmTypeRequestVO {
      * 类型名称
      */
     private String typeName;
-
-    /**
-     * 产品编码
-     */
-    private String productCode;
 }