Jelajahi Sumber

添加睡眠描述修改功能

soobin 2 tahun lalu
induk
melakukan
f0c8c8dcbb

+ 1 - 1
pom.xml

@@ -191,7 +191,7 @@
 		<dependency>
 			<groupId>cn.com.crbank.ommo</groupId>
 			<artifactId>EsBaseServer</artifactId>
-			<version>1.2.10</version>
+			<version>1.2.11</version>
 		</dependency>
 		<!--redis start-->
 		<dependency>

+ 1 - 0
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -181,6 +181,7 @@ public class TEquipmentController {
                 equipmentDTO.setIsMaterialUse(equipmentDesc.getIsMaterialUse());
                 equipmentDTO.setStick(equipmentDesc.getStick());
                 equipmentDTO.setWhiteSugar(equipmentDesc.getWhiteSugar());
+                equipmentDTO.setSleepDesc(equipmentDesc.getSleepDesc());
             }
 
         }

+ 29 - 0
src/main/java/com/szwl/controller/TEquipmentDescController.java

@@ -3,12 +3,16 @@ package com.szwl.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TEquipmentDesc;
+import com.szwl.model.utils.PushUtils;
 import com.szwl.service.TEquipmentDescService;
+import com.szwl.service.TEquipmentService;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,8 +33,12 @@ import java.util.List;
 @RestController
 @RequestMapping("/tEquipmentDesc")
 public class TEquipmentDescController {
+
     @Autowired
     TEquipmentDescService equipmentDescService;
+
+    @Autowired
+    TEquipmentService tEquipmentService;
     //查找设备
     @ApiOperation(value = "ClientId查找设备")
     @GetMapping("/findEquipmentById")
@@ -41,5 +49,26 @@ public class TEquipmentDescController {
         TEquipmentDesc equipment = list.get(0);
         return R.ok(equipment);
     }
+
+    @ApiOperation(value = "修改睡眠描述")
+    @GetMapping("/updateSleepDesc")
+    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,"找不到设备");
+        }
+        TEquipmentDesc tEquipmentDesc = equipmentDescService.getById(equipment.getId());
+        if (tEquipmentDesc!=null){
+            tEquipmentDesc.setSleepDesc(sleepDesc);
+            equipmentDescService.updateById(tEquipmentDesc);
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("sleepDesc", sleepDesc).toString());
+        }else {
+            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        }
+        return R.ok(null,"修改成功");
+    }
 }
 

+ 14 - 0
src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -83,6 +83,20 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "是否启用物料监控功能;")
     private String isMaterialUse;
 
+    /**
+     * 睡眠描述
+     */
+    @ApiModelProperty(value = "睡眠描述")
+    private String sleepDesc;
+
+    public String getSleepDesc() {
+        return sleepDesc;
+    }
+
+    public void setSleepDesc(String sleepDesc) {
+        this.sleepDesc = sleepDesc;
+    }
+
     public String getWhiteSugar() {
         return whiteSugar;
     }

+ 6 - 0
src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -107,4 +107,10 @@ public class TEquipmentDesc implements Serializable {
      */
     @ApiModelProperty(value = "外门状态:0:关闭,1:开启")
     private String outDoor;
+
+    /**
+     * 睡眠描述
+     */
+    @ApiModelProperty(value = "睡眠描述")
+    private String sleepDesc = "暂停营业";
 }