修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificAlarm.java

@@ -86,26 +86,27 @@ public class EquipmentSpecificAlarm extends BaseEntity {
     private Long equipmentIndexId;
 
     @ApiModelProperty(value = "确认类型")
-    @TableField("confirm_type")
+    @TableField(exist = false)
     private String confirmType;
 
     @ApiModelProperty(value = "报警原因")
-    @TableField("alam_reason")
+    @TableField(exist = false)
     private String alamReason;
 
     @ApiModelProperty(value = "处理情况")
-    @TableField("resolve_result")
+    @TableField(exist = false)
     private String resolveResult;
 
     @ApiModelProperty(value = "确警人员")
-    @TableField("confirm_user")
+    @TableField(exist = false)
     private String confirmUser;
 
     @ApiModelProperty(value = "确警人员姓名")
+    @TableField(exist = false)
     private String confirmUserName;
 
     @ApiModelProperty(value = "确警时间")
-    @TableField("confirm_date")
+    @TableField(exist = false)
     private Date confirmDate;
 
     @ApiModelProperty(value = "iot数据上报唯一id")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/ConfirmAlarmMapper.java

@@ -12,7 +12,7 @@ public interface ConfirmAlarmMapper extends BaseMapper<EquipmentSpecificAlarm> {
 
     int confirmAlam(EquipmentSpecificAlarmLog ent);
 
-    EquipmentSpecificAlarm getIdAndConfirmType(String id);
+    EquipmentSpecificAlarmLog getIdAndConfirmType(String id);
 
     int getFireAlarm();
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MainIotMonitorServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.equipmanage.common.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -34,11 +35,6 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
-import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
-import com.yeejoin.equipmanage.common.entity.EquipmentSystemSourceStatistics;
-import com.yeejoin.equipmanage.common.entity.FireFightingSystemEntity;
-import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentStateVo;
 import com.yeejoin.equipmanage.common.entity.vo.MainIotMonitorItemContentVo;
 import com.yeejoin.equipmanage.common.entity.vo.MainIotMonitorItemVo;
@@ -264,7 +260,7 @@ public class MainIotMonitorServiceImpl implements IMainIotMonitorSerivce {
                 type = EquipmentStateEnum.PB.getType();
                 statusType = "shield";
             }
-            EquipmentSpecificAlarm idvo = confirmAlarmMapper.getIdAndConfirmType(id);
+            EquipmentSpecificAlarmLog idvo = confirmAlarmMapper.getIdAndConfirmType(id);
             Date time = new Date();
             if (idvo != null && idvo.getId() != null){
                 itemVo.setAlamId(idvo.getId().toString());
@@ -327,7 +323,7 @@ public class MainIotMonitorServiceImpl implements IMainIotMonitorSerivce {
                     String equSystemId = jsonObj.getString("systemId");
                     /* 设备id */
                     String speId = jsonObj.getString("speId");
-                    EquipmentSpecificAlarm idvo = confirmAlarmMapper.getIdAndConfirmType(speId);
+                    EquipmentSpecificAlarmLog idvo = confirmAlarmMapper.getIdAndConfirmType(speId);
                     if (systemId.equals(equSystemId) && StringUtil.isNotEmpty(speId)) {
                         /* 设备名称 */
                         String speName = jsonObj.getString("speName");

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -422,9 +422,12 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
         String cleanType = equipmentSpecificMapper.getEquipmentBySpecificId(log.getEquipmentSpecificId());
         EquipmentSpecific specific = equipmentSpecificMapper.selectById(log.getEquipmentSpecificId());
         Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateString = formatter.format(date);
         logs.forEach(x -> {
             x.setCleanTime(new Date());
             x.setStatus(AlarmStatusEnum.HF.getCode());
+            x.setEquipmentSpecificIndexValue(TrueOrFalseEnum.fake.value);
             if (!StringUtils.isEmpty(traceId)) {
                 x.setTraceId(traceId);
             }
@@ -438,18 +441,18 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                 } else {
                     x.setAlarmReason(equipmentName + "引起设备报警");
                 }
-                x.setResolveResult(date + "系统收到设备复归（已消除）信号，系统自动处理。");
+                x.setResolveResult(dateString + "系统收到设备复归（已消除）信号，系统自动处理。");
                 x.setConfirmUser("");
                 x.setConfirmUserName("系统自动处理");
                 x.setConfirmDate(date);
             }
         });
-        Token token = remoteSecurityService.getServerToken();
-        String toke = token.getToke();
-        String appKey = token.getAppKey();
-        String product = token.getProduct();
-        String userId = remoteSecurityService.getAgencyUser().getUserId();
         if (jcsSwitch && AlarmTypeEnum.HZGJ.getCode().equals(log.getType())) {
+            Token token = remoteSecurityService.getServerToken();
+            String toke = token.getToke();
+            String appKey = token.getAppKey();
+            String product = token.getProduct();
+            String userId = remoteSecurityService.getAgencyUser().getUserId();
             // 确警消息发送
             if (org.apache.commons.lang3.StringUtils.isNotBlank(userId)) {
                 new Thread(new Runnable() {