设施弹窗及告警投递逻辑修改

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -36,6 +38,7 @@ public class BaseAlarm implements Serializable {
     /**
      * 告警时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime alarmTime;
 
     /**
@@ -81,6 +84,7 @@ public class BaseAlarm implements Serializable {
     /**
      * 处理时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime handleTime;
 
     /**

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

@@ -151,17 +151,17 @@ public class BaseBuild implements Serializable {
     /**
      * 更新人
      */
-    private String updatePerson;
+    private String updateBy;
 
     /**
      * 创建人
      */
-    private String creator;
+    private String createBy;
 
     /**
      * 删除标识
      */
-    private String deleteFlag;
+    private Integer deleteFlag;
 
     /**
      * 地下空间

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.*;
 import com.usky.iot.mapper.BaseAlarmMapper;
@@ -207,17 +208,25 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     @Override
     public boolean add(BaseAlarm baseAlarm) {
         baseAlarm.setHandleStatus(0);
-        baseAlarm.setTenantId(SecurityUtils.getTenantId());
-        if (StringUtils.isNotBlank(baseAlarm.getHandleBy()) || StringUtils.isNotBlank(baseAlarm.getHandlePhone())){
-            baseAlarm.setHandleStatus(1);
-            LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(BaseAlarm::getDeviceId,baseAlarm.getDeviceId())
-                    .eq(BaseAlarm::getAlarmType,baseAlarm.getAlarmType())
-                    .eq(BaseAlarm::getAlarmAddress,baseAlarm.getAlarmAddress())
-                    .eq(BaseAlarm::getAlarmGrade,baseAlarm.getAlarmGrade());
-            return this.update(baseAlarm,queryWrapper);
+        LambdaQueryWrapper<DmpProductInfo> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(StringUtils.isNotBlank(baseAlarm.getProductCode()),DmpProductInfo::getProductCode,baseAlarm.getProductCode())
+                .eq(DmpProductInfo::getDeleteFlag,0);
+        List<DmpProductInfo> records = dmpProductInfoService.list(lambdaQuery);
+        if(records.size()>0){
+            baseAlarm.setTenantId(SecurityUtils.getTenantId());
+            if (StringUtils.isNotBlank(baseAlarm.getHandleBy()) || StringUtils.isNotBlank(baseAlarm.getHandlePhone())){
+                baseAlarm.setHandleStatus(1);
+                LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
+                queryWrapper.eq(BaseAlarm::getDeviceId,baseAlarm.getDeviceId())
+                        .eq(BaseAlarm::getAlarmType,baseAlarm.getAlarmType())
+                        .eq(BaseAlarm::getAlarmAddress,baseAlarm.getAlarmAddress())
+                        .eq(BaseAlarm::getAlarmGrade,baseAlarm.getAlarmGrade());
+                return this.update(baseAlarm,queryWrapper);
+            }else {
+                return this.save(baseAlarm);
+            }
         }else {
-            return this.save(baseAlarm);
+            throw new BusinessException("告警数据投递失败，产品编码有误");
         }
     }
 }

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

@@ -352,12 +352,14 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
                     productCodeList.add(String.valueOf(dmpDeviceInfoList.get(j).get("productCode")));
                 }
                 LambdaQueryWrapper<DmpProductInfo> queryWrapper2 = Wrappers.lambdaQuery();
-                queryWrapper2.in(DmpProductInfo::getProductCode, productCodeList);
+                queryWrapper2.eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
                 List<DmpProductInfo> dmpProductInfoList = dmpProductInfoService.list(queryWrapper2);
                 if (CollectionUtils.isNotEmpty(dmpProductInfoList)){
                     for (int m = 0; m < dmpProductInfoList.size(); m++){
                         Map<String, Object> map2 = new HashMap<>();
                         map2.put("productName",dmpProductInfoList.get(m).getProductName());
+                        map2.put("deviceCount",0);
+                        map2.put("disposalRate",100);
                         for (int n = 0; n < dmpDeviceInfoList.size(); n++){
                             if (dmpProductInfoList.get(m).getProductCode().equals(dmpDeviceInfoList.get(n).get("productCode"))){
                                 map2.put("deviceCount",dmpDeviceInfoList.get(n).get("count"));

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseBuildMapper.xml

@@ -29,8 +29,8 @@
         <result column="company_id" property="companyId" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
-        <result column="update_person" property="updatePerson" />
-        <result column="creator" property="creator" />
+        <result column="update_by" property="updateBy" />
+        <result column="create_by" property="createBy" />
         <result column="delete_flag" property="deleteFlag" />
         <result column="under_space" property="underSpace" />
         <result column="fireproof_coat" property="fireproofCoat" />