feat：“添加报警状态上传“

src/main/java/com/szwl/controller/IndexController.java

@@ -110,8 +110,6 @@ public class IndexController {
 
         String clientId = equipmentVo.getClientId();
         Date lastUpdateTime = equipmentVo.getLastUpdateTime();
-//        Double longitude = equipmentVo.getLongitude();
-//        Double latitude = equipmentVo.getLatitude();
         String cabinetHd = equipmentVo.getCabinetHd();
         String cabinetTm = equipmentVo.getCabinetTm();
         String furnaceSp = equipmentVo.getFurnaceSp();
@@ -126,6 +124,7 @@ public class IndexController {
         String outsideTm = equipmentVo.getOutsideTm();
         String outsideHd = equipmentVo.getOutsideHd();
         Integer workingMode = equipmentVo.getWorkingMode();
+        Integer isAlarm = equipmentVo.getIsAlarm();
 
         //有记录，则进行修改
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
@@ -146,7 +145,6 @@ public class IndexController {
                 newEquipment.setFurnaceTm(furnaceTm);
             }
             newEquipment.setLastUpdateTime(lastUpdateTime);
-//            newEquipment.setLongitude(longitude);
             if (eqeStatus != null) {
                 newEquipment.setEqeStatus(eqeStatus);
             }
@@ -158,14 +156,21 @@ public class IndexController {
                 if (newEquipment.getEqeStatus() == 0 && fur > 150) {
                     newEquipment.setEqeStatus(1);
                 }
-                if (newEquipment.getEqeStatus() == null && fur > 150) {
+                if (newEquipment.getEqeStatus() == null) {
                     newEquipment.setEqeStatus(1);
                 }
             }
             if (!StringUtils.isEmpty(volume)) {
                 newEquipment.setVolume(volume);
             }
-//            newEquipment.setLatitude(latitude);
+            // 是否报警
+            if (isAlarm != null) {
+                if (isAlarm == 1) {
+                    newEquipment.setIsAlarm(true);
+                } else if (isAlarm == 0) {
+                    newEquipment.setIsAlarm(false);
+                }
+            }
             newEquipment.setGtClientId(gtClientId);
             newEquipment.setModifyDate(new Date());
             equipmentService.updateById(newEquipment);
@@ -193,7 +198,7 @@ public class IndexController {
             }
             // 如果是爆米花机
             String machineType = newEquipment.getMachineType();
-            if(StringUtils.isNotEmpty(machineType) && newEquipment.getMachineType().equals("1")) {
+            if(StringUtils.isNotEmpty(machineType) && "1".equals(newEquipment.getMachineType())) {
                 // 爆米花机搅拌温度
                 if (StringUtils.isNotEmpty(cabinetTm)) {
                     equipmentDesc.setStirTm(cabinetTm);
@@ -208,7 +213,7 @@ public class IndexController {
                 }
             }
             // 如果是雪糕机
-            if (StringUtils.isNotEmpty(machineType) && newEquipment.getMachineType().equals("2")) {
+            if (StringUtils.isNotEmpty(machineType) && "2".equals(newEquipment.getMachineType())) {
                 if (workingMode!= null) {
                     equipmentDesc.setWorkingMode(workingMode);
                 }

src/main/java/com/szwl/model/bean/EquipmentVo.java

@@ -6,6 +6,9 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * @author sz-013
+ */
 @Data
 public class EquipmentVo {
 
@@ -148,4 +151,7 @@ public class EquipmentVo {
     @ApiModelProperty(value = "雪糕机的工作模式，0：制冷，1：搅拌，2：保鲜")
     private Integer workingMode;
 
+    @ApiModelProperty(value = "是否报警，0：不报警，1：报警")
+    private Integer isAlarm;
+
 }