Merge branch 'han' into server-165

gaojingzengjia xiugaipanduan

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

@@ -12,14 +12,12 @@ import com.usky.iot.service.BaseAlarmService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.service.DmpDeviceInfoService;
 import com.usky.iot.service.DmpProductInfoService;
-import com.usky.iot.service.config.mqtt.MqttOutConfig;
 import com.usky.iot.service.vo.BaseAlarmListVO;
 import com.usky.iot.service.vo.BaseAlarmRequestVO;
 import com.usky.iot.service.vo.BaseAlarmResponeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -210,7 +208,17 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     public boolean add(BaseAlarm baseAlarm) {
         baseAlarm.setHandleStatus(0);
         baseAlarm.setTenantId(SecurityUtils.getTenantId());
-        return this.save(baseAlarm);
+        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);
+        }
     }
 }