添加远程开门功能，细分为内门和外门

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

@@ -1897,8 +1897,9 @@ public class IndexController { ;
 
         return "更新失败error";
     }
+
     /**
-     *上传机器状态之门的状态：
+     * 上传机器状态之门的状态：
      * type（类型，0：外门，1：内门）,
      * status（状态：0：关闭，1：开启）
      * @param clientId

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

@@ -201,6 +201,8 @@ public class TEquipmentController {
         TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
         if(equipmentDesc!=null){
             equipmentDTO.setCouponStatus(equipmentDesc.getCouponStatus());
+            equipmentDTO.setInDoor(equipmentDesc.getInDoor());
+            equipmentDTO.setOutDoor(equipmentDesc.getOutDoor());
         }
         String messageReceiver = equipment.getMessageReceiver();
         if(StringUtils.isNotEmpty(messageReceiver)){
@@ -770,21 +772,42 @@ public class TEquipmentController {
 
 
     //远程开门
+//    @ApiOperation(value = "远程开门")
+//    @PostMapping("/openDoor")
+//    public ResponseEntity<?> openDoor(@RequestBody StatisticsParam param) {
+//        String equipmentId = param.getEquipmentId();
+//        Long id = Long.valueOf(equipmentId);
+//        TEquipment equipment = tEquipmentService.getById(id);
+//        tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("openDoor", "0").toString());
+////        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("openDoor", "0").toString());
+//        return ResponseEntity
+//                .status(HttpStatus.OK)
+//                .body(new ResultMessage()
+//                        .setCode(true)
+//                        .setData("SUCCESS")
+//                        .setMessage("SUCCESS"));
+//    }
+
+    //修改机器状态  type（类型，0：外门，1：内门）,
+    //            status（状态：0：关闭，1：开启）
     @ApiOperation(value = "远程开门")
-    @PostMapping("/openDoor")
-    public ResponseEntity<?> openDoor(@RequestBody StatisticsParam param) {
-        String equipmentId = param.getEquipmentId();
-        Long id = Long.valueOf(equipmentId);
-        TEquipment equipment = tEquipmentService.getById(id);
-        tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("openDoor", "0").toString());
-//        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("openDoor", "0").toString());
-        return ResponseEntity
-                .status(HttpStatus.OK)
-                .body(new ResultMessage()
-                        .setCode(true)
-                        .setData("SUCCESS")
-                        .setMessage("SUCCESS"));
+    @GetMapping("/openDoor")
+    public ResponseModel<?> openDoor(String equipmentId,String type,String status) {
+        if(StringUtils.isEmpty(equipmentId)||StringUtils.isEmpty(type)||StringUtils.isEmpty(status)) {
+            return R.fail(ResponseCodesEnum.A0001,"参数有空");
+        }
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if(equipment==null || equipment.getId() == null){
+            return R.fail(ResponseCodesEnum.A0001,"找不到设备");
+        }
+        if(type.equals("0")){
+            tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("outdoor", status).toString());
+        }else if(type.equals("1")){
+            tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("indoor", status).toString());
+        }
+        return R.ok(null, "修改成功");
     }
+
     //查看是否远程来关机成功
     @ApiOperation(value = "查看是否远程来关机成功")
     @PostMapping("/checkStatus")

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

@@ -89,6 +89,34 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "睡眠描述")
     private String sleepDesc;
 
+    /**
+     * 内门状态：0：关闭，1：开启
+     */
+    @ApiModelProperty(value = "内门状态：0：关闭，1：开启")
+    private String inDoor;
+
+    /**
+     * 外门状态：0：关闭，1：开启
+     */
+    @ApiModelProperty(value = "外门状态：0：关闭，1：开启")
+    private String outDoor;
+
+    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;
     }