心跳-修复BUG

app-api/src/main/java/com/hboxs/control/api/equipment/IndexController.java

@@ -66,8 +66,8 @@ public class IndexController extends BaseController {
         String gtClientId = equipmentVo.getGtClientId();
         String netWorkingMode = equipmentVo.getNetWorkingMode();
         String odorConcentration = equipmentVo.getOdorConcentration();
-        String cleaner = equipmentVo.getCleaner();
-        String disinfectant = equipmentVo.getDisinfectant();
+        Integer cleaner = equipmentVo.getCleaner();
+        Integer disinfectant = equipmentVo.getDisinfectant();
         Long peopleCounting = equipmentVo.getPeopleCounting();
         //有记录，则进行修改
         Equipment _new = equipmentService.findByClientId(clientId);
@@ -82,7 +82,6 @@ public class IndexController extends BaseController {
             _new.setLatitude(latitude);
             _new.setGtClientId(gtClientId);
             _new.setOdorConcentration(odorConcentration);
-            _new.setOdorConcentration(odorConcentration);
             _new.setCleaner(cleaner);
             _new.setDisinfectant(disinfectant);
             _new.setPeopleCounting(peopleCounting);

app-entity/src/main/java/com/hboxs/ViewObject/EquipmentVo.java

@@ -44,11 +44,11 @@ public class EquipmentVo {
     /**
      * 清洁剂余量
      */
-    private String cleaner;
+    private Integer cleaner;
     /**
      * 消毒水余量
      */
-    private String  disinfectant;
+    private Integer  disinfectant;
     /**
      * 人流量
      */
@@ -89,19 +89,19 @@ public class EquipmentVo {
         this.odorConcentration = odorConcentration;
     }
 
-    public String getCleaner() {
+    public Integer getCleaner() {
         return cleaner;
     }
 
-    public void setCleaner(String cleaner) {
+    public void setCleaner(Integer cleaner) {
         this.cleaner = cleaner;
     }
 
-    public String getDisinfectant() {
+    public Integer getDisinfectant() {
         return disinfectant;
     }
 
-    public void setDisinfectant(String disinfectant) {
+    public void setDisinfectant(Integer disinfectant) {
         this.disinfectant = disinfectant;
     }
 

app-entity/src/main/java/com/hboxs/entity/Equipment.java

@@ -399,11 +399,11 @@ public class Equipment extends BaseEntity {
     /**
      * 清洁剂余量
      */
-    private String cleaner;
+    private Integer cleaner;
     /**
      * 消毒水余量
      */
-    private String  disinfectant;
+    private Integer  disinfectant;
     /**
      * 过期时间；
      */
@@ -446,19 +446,19 @@ public class Equipment extends BaseEntity {
         this.site = site;
     }
 
-    public String getCleaner() {
+    public Integer getCleaner() {
         return cleaner;
     }
 
-    public void setCleaner(String cleaner) {
+    public void setCleaner(Integer cleaner) {
         this.cleaner = cleaner;
     }
 
-    public String getDisinfectant() {
+    public Integer getDisinfectant() {
         return disinfectant;
     }
 
-    public void setDisinfectant(String disinfectant) {
+    public void setDisinfectant(Integer disinfectant) {
         this.disinfectant = disinfectant;
     }