From 2dbb67cb69a5ff735a40fd1e09f76cef5786054f Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 11 Jul 2023 10:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8E=82=E8=AE=BE=E5=A4=87=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5-=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/CsEquipmentDeliveryAuditParm.java | 6 +++++ .../param/CsEquipmentDeliveryQueryParm.java | 5 +++- .../pojo/po/CsEquipmentDeliveryPO.java | 8 +++++- .../EquipmentDeliveryController.java | 2 +- .../equipment/MqttUserController.java | 27 ------------------- .../impl/CsEquipmentDeliveryServiceImpl.java | 9 +++++-- 6 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java index 6be0d4b..219ca83 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java @@ -111,4 +111,10 @@ public class CsEquipmentDeliveryAuditParm { @TableField(value = "status") private Integer status; + /** + * 运行状态 + */ + @TableField(value = "run_status") + private Integer runStatus; + } \ No newline at end of file diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java index 8a98ac0..7377369 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java @@ -28,7 +28,10 @@ public class CsEquipmentDeliveryQueryParm extends BaseParam { @ApiModelProperty("装置接入方式(mqtt、cloud)") private String devAccessMethod; - @ApiModelProperty("状态 1:未注册 2:注册 3:接入") + @ApiModelProperty("接入状态 1:未注册 2:注册 3:接入") private Integer status; + @ApiModelProperty("运行状态 1:离线 2:在线") + private Integer runStatus; + } \ No newline at end of file diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java index 55db02f..922cfd0 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java @@ -115,10 +115,16 @@ public class CsEquipmentDeliveryPO extends BaseEntity { private String salesManager; /** - * 状态(0:删除 1:未注册 2:注册 3:接入) + * 接入状态(1:未注册 2:注册 3:接入) */ @TableField(value = "status") private String status; + /** + * 设备状态(0:删除 1:离线 2:在线) + */ + @TableField(value = "run_status") + private Integer runStatus; + } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index 288f415..3c517a6 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -107,7 +107,7 @@ public class EquipmentDeliveryController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateStatusBynDid") - @ApiOperation("根据网关id调整设备状态") + @ApiOperation("根据网关id调整设备接入状态") @ApiImplicitParams({ @ApiImplicitParam(name = "nDId", value = "网关id", required = true), @ApiImplicitParam(name = "status", value = "状态", required = true) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java deleted file mode 100644 index 24f099f..0000000 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.csdevice.controller.equipment; - - -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author xuyang - * @since 2023-06-29 - */ -@RestController -@RequestMapping("/mqttUser") -@AllArgsConstructor -@Slf4j -@Api(tags = "MqttUser录入") -public class MqttUserController extends BaseController { - -} - diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 142ec26..ba7605f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -62,7 +62,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl wrapper = new UpdateWrapper(); wrapper.eq ("id", id); - wrapper.set ("status", "0"); + wrapper.set ("run_status", "0"); boolean update = this.update (wrapper); return update; } @@ -175,6 +175,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); }