feat：“添加远程开关清洗功能“

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

@@ -2114,7 +2114,7 @@ public class IndexController {
      */
     @RequestMapping(value = "/updateShowGoods", method = RequestMethod.POST)
     @ResponseBody
-    public String updateShowGoods(@RequestParam String clientId, @RequestBody List<TProductBean> tProductBean) {
+    public String updateShowGoods(String clientId, @RequestBody List<TProductBean> tProductBean) {
         if (StringUtils.isEmpty(clientId) || tProductBean == null) {
             return "参数为空";
         }
@@ -2207,7 +2207,7 @@ public class IndexController {
      */
     @RequestMapping(value = "/updateDIYFlowerShow", method = RequestMethod.POST)
     @ResponseBody
-    public String updateDIYFlowerShow(@RequestParam String clientId, @RequestBody List<TProductBean> tProductBean) {
+    public String updateDIYFlowerShow(String clientId, @RequestBody List<TProductBean> tProductBean) {
         if (StringUtils.isEmpty(clientId) || tProductBean == null) {
             return "参数为空";
         }
@@ -2328,5 +2328,21 @@ public class IndexController {
         }
         return "fail";
     }
+
+    @ApiOperation(value = "修改清洗功能状态")
+    @GetMapping(value = "/updateCleanFunction", produces = "text/html;charset=utf-8")
+    public String updateCleanFunction(String clientId, Boolean cleanFunction) {
+        if (cleanFunction != null) {
+            LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+            query.eq(TEquipment::getClientId, clientId);
+            TEquipment equipment = equipmentService.getOne(query);
+            TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
+            equipmentDesc.setCleanFunction(false);
+            equipmentDescService.updateById(equipmentDesc);
+            return "success";
+        }
+        return "fail";
+    }
+
 }
 

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

@@ -302,6 +302,7 @@ public class TEquipmentController {
                 equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
                 equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
                 equipmentDTO.setWorkingMode(equipmentDesc.getWorkingMode());
+                equipmentDTO.setCleanFunction(equipmentDesc.getCleanFunction());
             }
 
         }
@@ -329,6 +330,7 @@ public class TEquipmentController {
             equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
             equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
             equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
+            equipmentDTO.setCleanFunction(equipmentDesc.getCleanFunction());
         }
         String messageReceiver = equipment.getMessageReceiver();
         if (StringUtils.isNotEmpty(messageReceiver)) {

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author wuhs
@@ -39,12 +39,13 @@ public class TEquipmentDescController {
 
     @Autowired
     TEquipmentService tEquipmentService;
+
     //查找设备
     @ApiOperation(value = "ClientId查找设备")
     @GetMapping("/findEquipmentById")
-    public ResponseModel<TEquipmentDesc> findEquipmentById(@RequestParam Long  id) {
+    public ResponseModel<TEquipmentDesc> findEquipmentById(@RequestParam Long id) {
         LambdaQueryWrapper<TEquipmentDesc> query = Wrappers.lambdaQuery();
-        query.eq(TEquipmentDesc::getEquipmentId,id);
+        query.eq(TEquipmentDesc::getEquipmentId, id);
         List<TEquipmentDesc> list = equipmentDescService.list(query);
         TEquipmentDesc equipment = list.get(0);
         return R.ok(equipment);
@@ -52,23 +53,37 @@ public class TEquipmentDescController {
 
     @ApiOperation(value = "修改睡眠描述")
     @GetMapping("/updateSleepDesc")
-    public ResponseModel<?> updateSleepDesc(String equipmentId,String sleepDesc) {
-        if(StringUtils.isEmpty(sleepDesc)||StringUtils.isEmpty(equipmentId)){
-            return R.fail(ResponseCodesEnum.A0001,"参数有空");
+    public ResponseModel<?> updateSleepDesc(String equipmentId, String sleepDesc) {
+        if (StringUtils.isEmpty(sleepDesc) || StringUtils.isEmpty(equipmentId)) {
+            return R.fail(ResponseCodesEnum.A0001, "参数有空");
         }
         TEquipment equipment = tEquipmentService.getById(equipmentId);
-        if(equipment==null||equipment.getId()==null){
-            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        if (equipment == null || equipment.getId() == null) {
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
         TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
-        if (tEquipmentDesc!=null){
+        if (tEquipmentDesc != null) {
             tEquipmentDesc.setSleepDesc(sleepDesc);
             equipmentDescService.updateById(tEquipmentDesc);
             tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("sleepDesc", sleepDesc).toString());
-        }else {
-            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        } else {
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
+        }
+        return R.ok("修改成功");
+    }
+
+    @ApiOperation("开启或关闭清洗功能")
+    @GetMapping("/updateCleanFunction")
+    public ResponseModel<?> updateCleanFunction(String equipmentId, String cleanFunction) {
+        if (StringUtils.isEmpty(cleanFunction) || StringUtils.isEmpty(equipmentId)) {
+            return R.fail(ResponseCodesEnum.A0001, "参数有空");
+        }
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if (equipment == null || equipment.getId() == null) {
+            return R.fail(ResponseCodesEnum.A0001, "找不到设备");
         }
-        return R.ok(null,"修改成功");
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("cleanFunction", cleanFunction).toString());
+        return R.ok("修改成功");
     }
 }
 

src/main/java/com/szwl/mapper/xml/TEquipmentDescMapper.xml

@@ -32,11 +32,12 @@
         <result column="language" property="language" />
         <result column="patch_id" property="patchId" />
         <result column="working_mode" property="workingMode" />
+        <result column="clean_function" property="cleanFunction" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status, language, patch_id, working_mode
+        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status, language, patch_id, working_mode, clean_function
     </sql>
 
 </mapper>

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

@@ -106,6 +106,9 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "雪糕机的工作模式，0：制冷，1：搅拌，2：保鲜")
     private Integer workingMode;
 
+    @ApiModelProperty(value = "清洗功能，0：关闭，1：开启，默认关闭")
+    private Boolean cleanFunction;
+
     public void setOccurrenceTime(Date occurrenceTime) {
         if(null != occurrenceTime){
             this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);

src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -2,12 +2,13 @@ package com.szwl.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -108,5 +109,8 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "雪糕机的工作模式，0：制冷，1：搅拌，2：保鲜")
     private Integer workingMode;
 
+    @ApiModelProperty(value = "清洗功能，0：关闭，1：开启，默认关闭")
+    private Boolean cleanFunction;
+
 
 }