feat：“增加雪糕机工作模式字段查询“

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

@@ -305,6 +305,7 @@ public class TEquipmentController {
                 equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
                 equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
                 equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
+                equipmentDTO.setWorkingMode(equipmentDesc.getWorkingMode());
             }
 
         }

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

@@ -5,6 +5,7 @@ import com.szwl.model.entity.TAlarmRecord;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.utils.DateUtils;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -16,88 +17,60 @@ import java.util.List;
 @Accessors(chain = true)
 @NoArgsConstructor
 @ToString
+@Data
 public class TEquipmentDTO extends TEquipment {
+
     @ApiModelProperty(value="所以报警信息")
     private List<TAlarmRecord> alarmList;
+
     @ApiModelProperty(value="最新报警信息")
     private String alarmContent = "暂无数据";
 
     @ApiModelProperty(value = "短信接收者;")
     private String messageReceiver1;
+
     @ApiModelProperty(value = "短信接收者;")
     private String messageReceiver2;
+
     @ApiModelProperty(value = "短信接收者;")
     private String messageReceiver3;
+
     @ApiModelProperty(value="当天是否存在告警")
-    private boolean hasTodayAlarm= false;
+    private boolean hasTodayAlarm = false;
 
-    /**
-     *白糖
-     */
-    @ApiModelProperty(value = "白糖;")
+    @ApiModelProperty(value = "白糖")
     private String whiteSugar;
 
-    /**
-     *红糖
-     */
-    @ApiModelProperty(value = "红糖;")
+    @ApiModelProperty(value = "红糖")
     private String redSugar;
 
-    /**
-     黄糖
-     blueSugar：蓝糖
-     stick：棍
-     water：水
-     wasteWater：废水
-     */
-    @ApiModelProperty(value = "黄糖;")
+    @ApiModelProperty(value = "黄糖")
     private String yellowSugar;
 
-    /**
-     * 蓝糖
-     */
-    @ApiModelProperty(value = "蓝糖;")
+    @ApiModelProperty(value = "蓝糖")
     private String blueSugar;
 
-    /**
-     * 棍
-     */
     @ApiModelProperty(value = "棍;")
     private String stick;
 
-    /**
-     * 水
-     */
-    @ApiModelProperty(value = "水;")
+    @ApiModelProperty(value = "水")
     private String water;
 
-    /**
-     * 废水
-     */
-    @ApiModelProperty(value = "废水;")
+    @ApiModelProperty(value = "")
     private String wasteWater;
 
     /**
      * 是否启用物料监控功能，0：不启用，1：启用
      */
-    @ApiModelProperty(value = "是否启用物料监控功能;")
+    @ApiModelProperty(value = "是否启用物料监控功能")
     private String isMaterialUse;
 
-    /**
-     * 睡眠描述
-     */
     @ApiModelProperty(value = "睡眠描述")
     private String sleepDesc;
 
-    /**
-     * 内门状态：0：关闭，1：开启
-     */
     @ApiModelProperty(value = "内门状态：0：关闭，1：开启")
     private String inDoor;
 
-    /**
-     * 外门状态：0：关闭，1：开启
-     */
     @ApiModelProperty(value = "外门状态：0：关闭，1：开启")
     private String outDoor;
 
@@ -125,151 +98,13 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "DIY花型功能开关，0：关闭，1：开启")
     private String diyFlowerStatus;
 
-    public Long getCupQuantity() {
-        return cupQuantity;
-    }
-
-    public void setCupQuantity(Long cupQuantity) {
-        this.cupQuantity = cupQuantity;
-    }
-
-    public String getStirTm() {
-        return stirTm;
-    }
-
-    public void setStirTm(String stirTm) {
-        this.stirTm = stirTm;
-    }
-
-    public String getCornGeneratorTm() {
-        return cornGeneratorTm;
-    }
-
-    public void setCornGeneratorTm(String cornGeneratorTm) {
-        this.cornGeneratorTm = cornGeneratorTm;
-    }
-
-    public String getInDoor() {
-        return inDoor;
-    }
-
-    public void setInDoor(String inDoor) {
-        this.inDoor = inDoor;
-    }
-
-    public String getOutDoor() {
-        return outDoor;
-    }
-
-    public void setOutDoor(String outDoor) {
-        this.outDoor = outDoor;
-    }
-
-    public String getSleepDesc() {
-        return sleepDesc;
-    }
-
-    public void setSleepDesc(String sleepDesc) {
-        this.sleepDesc = sleepDesc;
-    }
-
-    public String getWhiteSugar() {
-        return whiteSugar;
-    }
-
-    public void setWhiteSugar(String whiteSugar) {
-        this.whiteSugar = whiteSugar;
-    }
-
-    public String getRedSugar() {
-        return redSugar;
-    }
-
-    public void setRedSugar(String redSugar) {
-        this.redSugar = redSugar;
-    }
-
-    public String getYellowSugar() {
-        return yellowSugar;
-    }
-
-    public void setYellowSugar(String yellowSugar) {
-        this.yellowSugar = yellowSugar;
-    }
-
-    public String getBlueSugar() {
-        return blueSugar;
-    }
-
-    public void setBlueSugar(String blueSugar) {
-        this.blueSugar = blueSugar;
-    }
-
-    public String getStick() {
-        return stick;
-    }
-
-    public void setStick(String stick) {
-        this.stick = stick;
-    }
-
-    public String getWater() {
-        return water;
-    }
-
-    public void setWater(String water) {
-        this.water = water;
-    }
-
-    public String getWasteWater() {
-        return wasteWater;
-    }
-
-    public void setWasteWater(String wasteWater) {
-        this.wasteWater = wasteWater;
-    }
-
-    public String getIsMaterialUse() {
-        return isMaterialUse;
-    }
-
-    public void setIsMaterialUse(String isMaterialUse) {
-        this.isMaterialUse = isMaterialUse;
-    }
-
-    public List<TAlarmRecord> getAlarmList() {
-        return alarmList;
-    }
-
-    public void setAlarmList(List<TAlarmRecord> alarmList) {
-        this.alarmList = alarmList;
-    }
-
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value="报警发生时间")
-
     private Date occurrenceTime;
 
-    public String getAlarmContent() {
-        return alarmContent;
-    }
-
-    public void setAlarmContent(String alarmContent) {
-        this.alarmContent = alarmContent;
-    }
-
-    public boolean isHasTodayAlarm() {
-        return hasTodayAlarm;
-    }
-
-    public void setHasTodayAlarm(boolean hasTodayAlarm) {
-        this.hasTodayAlarm = hasTodayAlarm;
-    }
-
-    public Date getOccurrenceTime() {
-        return occurrenceTime;
-    }
+    @ApiModelProperty(value = "雪糕机的工作模式，0：制冷，1：搅拌，2：保鲜")
+    private Integer workingMode;
 
     public void setOccurrenceTime(Date occurrenceTime) {
         if(null != occurrenceTime){
@@ -277,68 +112,4 @@ public class TEquipmentDTO extends TEquipment {
             this.occurrenceTime = occurrenceTime;
         }
     }
-
-    public String getMessageReceiver1() {
-        return messageReceiver1;
-    }
-
-    public void setMessageReceiver1(String messageReceiver1) {
-        this.messageReceiver1 = messageReceiver1;
-    }
-
-    public String getMessageReceiver2() {
-        return messageReceiver2;
-    }
-
-    public void setMessageReceiver2(String messageReceiver2) {
-        this.messageReceiver2 = messageReceiver2;
-    }
-
-    public String getMessageReceiver3() {
-        return messageReceiver3;
-    }
-
-    public void setMessageReceiver3(String messageReceiver3) {
-        this.messageReceiver3 = messageReceiver3;
-    }
-
-    public String getNumberOne() {
-        return numberOne;
-    }
-
-    public void setNumberOne(String numberOne) {
-        this.numberOne = numberOne;
-    }
-
-    public String getCandyGeneratorTm() {
-        return candyGeneratorTm;
-    }
-
-    public void setCandyGeneratorTm(String candyGeneratorTm) {
-        this.candyGeneratorTm = candyGeneratorTm;
-    }
-
-    public String getOutsideTm() {
-        return outsideTm;
-    }
-
-    public void setOutsideTm(String outsideTm) {
-        this.outsideTm = outsideTm;
-    }
-
-    public String getOutsideHd() {
-        return outsideHd;
-    }
-
-    public void setOutsideHd(String outsideHd) {
-        this.outsideHd = outsideHd;
-    }
-
-    public String getDiyFlowerStatus() {
-        return diyFlowerStatus;
-    }
-
-    public void setDiyFlowerStatus(String diyFlowerStatus) {
-        this.diyFlowerStatus = diyFlowerStatus;
-    }
 }