From 59d9d0ab3ec07e2768c5ff7f43487c71660365b3 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Fri, 21 Jun 2024 14:46:42 +0800 Subject: [PATCH] optimize iot import --- .../admin/device/DeviceController.java | 59 +- .../admin/device/vo/DevicePageReqVO.java | 8 +- .../admin/device/vo/DeviceRespVO.java | 13 +- .../admin/device/vo/DeviceSaveReqVO.java | 4 +- .../admin/formula/FormulaController.java | 57 +- .../formula/FormulaRecordController.java | 39 +- .../admin/formula/vo/FormulaPageReqVO.java | 9 +- .../formula/vo/FormulaRecordPageReqVO.java | 9 +- .../admin/formula/vo/FormulaRecordRespVO.java | 15 +- .../formula/vo/FormulaRecordSaveReqVO.java | 2 +- .../admin/formula/vo/FormulaRespVO.java | 13 +- .../admin/formula/vo/FormulaSaveReqVO.java | 4 +- .../admin/frpc/FrpcProxyServerController.java | 39 +- .../frpc/vo/FrpcProxyServerPageReqVO.java | 8 +- .../admin/frpc/vo/FrpcProxyServerRespVO.java | 13 +- .../frpc/vo/FrpcProxyServerSaveReqVO.java | 2 +- .../admin/frps/FrpsServerController.java | 42 +- .../admin/frps/vo/FrpsServerPageReqVO.java | 8 +- .../admin/frps/vo/FrpsServerRespVO.java | 13 +- .../admin/frps/vo/FrpsServerSaveReqVO.java | 2 +- .../admin/gateway/GatewayController.java | 53 +- .../admin/gateway/vo/GatewayPageReqVO.java | 8 +- .../admin/gateway/vo/GatewayRespVO.java | 13 +- .../admin/gateway/vo/GatewaySaveReqVO.java | 4 +- .../IotOrganizationController.java | 39 +- .../vo/IotOrganizationListReqVO.java | 7 +- .../vo/IotOrganizationRespVO.java | 13 +- .../vo/IotOrganizationSaveReqVO.java | 4 +- .../admin/kanban/KanbanController.java | 41 +- .../admin/kanban/vo/KanbanPageReqVO.java | 8 +- .../admin/kanban/vo/KanbanRespVO.java | 13 +- .../admin/kanban/vo/KanbanSaveReqVO.java | 5 +- .../mqttrecord/MqttRecordController.java | 38 +- .../mqttrecord/MqttServerController.java | 11 - .../mqttrecord/vo/MqttRecordPageReqVO.java | 8 +- .../admin/mqttrecord/vo/MqttRecordRespVO.java | 9 +- .../mqttrecord/vo/MqttRecordSaveReqVO.java | 2 +- .../dataobject/device/DeviceAttributeDO.java | 15 +- .../iot/dal/dataobject/device/DeviceDO.java | 29 +- .../iot/dal/dataobject/formula/FormulaDO.java | 12 +- .../dataobject/formula/FormulaDetailDO.java | 13 +- .../dataobject/formula/FormulaRecordDO.java | 11 +- .../dataobject/frpc/FrpcProxyServerDO.java | 15 +- .../iot/dal/dataobject/frps/FrpsServerDO.java | 13 +- .../iot/dal/dataobject/gateway/GatewayDO.java | 11 +- .../iotorganization/IotOrganizationDO.java | 17 +- .../iot/dal/dataobject/kanban/KanbanDO.java | 11 +- .../dataobject/mqttrecord/MqttRecordDO.java | 10 +- .../mysql/device/DeviceAttributeMapper.java | 13 +- .../iot/dal/mysql/device/DeviceMapper.java | 7 +- .../mysql/formula/FormulaDetailMapper.java | 10 +- .../iot/dal/mysql/formula/FormulaMapper.java | 6 +- .../mysql/formula/FormulaRecordMapper.java | 6 +- .../dal/mysql/frpc/FrpcProxyServerMapper.java | 6 +- .../iot/dal/mysql/frps/FrpsServerMapper.java | 6 +- .../iot/dal/mysql/gateway/GatewayMapper.java | 10 +- .../IotOrganizationMapper.java | 15 +- .../iot/dal/mysql/kanban/KanbanMapper.java | 6 +- .../mysql/mqttrecord/MqttRecordMapper.java | 6 +- .../framework/constant/AddressDataType.java | 188 ++--- .../iot/framework/constant/Constants.java | 2 +- .../framework/constant/DeviceTypeEnum.java | 3 - .../framework/constant/IsEnableConstant.java | 16 +- .../framework/gateway/bo/ChangeStatus.java | 6 +- .../iot/framework/gateway/bo/HttpEntity.java | 383 ++++----- .../iot/framework/gateway/bo/ListEntity.java | 8 +- .../gateway/entity/DeviceModbusEntity.java | 200 ++--- .../gateway/entity/DeviceSiemensEntity.java | 141 ++-- .../gateway/entity/DeviceVideoEntity.java | 40 +- .../gateway/entity/ModbusPointEntity.java | 70 +- .../gateway/entity/MqttBrokerEntity.java | 22 +- .../framework/gateway/entity/PageEntity.java | 25 +- .../gateway/entity/PageEntityByDecice.java | 25 +- .../gateway/entity/SiemensPointEntity.java | 84 +- .../gateway/service/GatewayMqttService.java | 20 +- .../gateway/service/IModbusPointService.java | 46 +- .../gateway/service/ISiemensPointService.java | 59 +- .../gateway/service/IVideoService.java | 11 +- .../service/impl/GatewayMqttServiceImpl.java | 220 +++--- .../service/impl/ModbusPointServiceImpl.java | 605 +++++++------- .../service/impl/SiemensPointServiceImpl.java | 673 ++++++++-------- .../service/impl/TheGatewayServiceImpl.java | 748 +++++++++--------- .../service/impl/VideoServiceImpl.java | 195 ++--- .../iot/framework/gateway/util/HttpUtils.java | 361 ++++----- .../iot/framework/gateway/util/JsonUtils.java | 134 ++-- .../iot/framework/gateway/util/SslUtil.java | 88 +-- .../iot/framework/gateway/util/TestApp.java | 297 +++---- .../framework/gateway/util/UrlConstans.java | 158 ++-- .../iot/framework/mqtt/annotation/Topic.java | 5 + .../mqtt/common/MqttCallbackImpl.java | 2 +- .../iot/framework/mqtt/common/MsgDecoder.java | 1 + .../iot/framework/mqtt/common/MsgEncoder.java | 1 + .../framework/mqtt/common/SuperConsumer.java | 2 +- .../mqtt/config/DefaultEmqConfig.java | 12 +- .../mqtt/config/DefaultEmqProperties.java | 1 + .../mqtt/config/DefaultMqttStarter.java | 1 - .../framework/mqtt/consumer/IMqttservice.java | 28 +- .../mqtt/consumer/MqttDataHandler.java | 105 ++- .../mqtt/consumer/impl/AsyncService.java | 174 ++-- .../mqtt/consumer/impl/MqttserviceImpl.java | 140 ++-- .../iot/framework/mqtt/entity/Connect.java | 5 +- .../iot/framework/mqtt/entity/Disconnect.java | 1 + .../iot/framework/mqtt/entity/IoData.java | 4 +- .../iot/framework/mqtt/entity/MqttData.java | 6 +- .../iot/framework/mqtt/entity/Pattern.java | 1 + .../mqtt/utils/ApplicationContextUtil.java | 2 + .../iot/framework/mqtt/utils/DateUtils.java | 564 +++++++------ .../framework/mqtt/utils/MqttDataUtils.java | 21 +- .../framework/mqtt/utils/PubMessageUtils.java | 1 + .../framework/redis/RedisKeyConstants.java | 2 +- .../iot/service/device/DeviceService.java | 19 +- .../iot/service/device/DeviceServiceImpl.java | 47 +- .../service/formula/FormulaRecordService.java | 6 +- .../formula/FormulaRecordServiceImpl.java | 16 +- .../iot/service/formula/FormulaService.java | 20 +- .../service/formula/FormulaServiceImpl.java | 26 +- .../service/frpc/FrpcProxyServerService.java | 7 +- .../frpc/FrpcProxyServerServiceImpl.java | 16 +- .../iot/service/frps/FrpsServerService.java | 7 +- .../service/frps/FrpsServerServiceImpl.java | 16 +- .../iot/service/gateway/GatewayService.java | 20 +- .../service/gateway/GatewayServiceImpl.java | 31 +- .../IotOrganizationService.java | 10 +- .../IotOrganizationServiceImpl.java | 15 +- .../iot/service/kanban/KanbanService.java | 9 +- .../iot/service/kanban/KanbanServiceImpl.java | 17 +- .../service/mqttrecord/MqttRecordService.java | 6 +- .../mqttrecord/MqttRecordServiceImpl.java | 16 +- 128 files changed, 3503 insertions(+), 3591 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index 85f496b0f..591fdbad1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -1,37 +1,35 @@ package cn.iocoder.yudao.module.iot.controller.admin.device; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DevicePageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DeviceRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DeviceSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; -import cn.iocoder.yudao.module.iot.framework.gateway.service.impl.TheGatewayServiceImpl; +import cn.iocoder.yudao.module.iot.service.device.DeviceService; import cn.iocoder.yudao.module.iot.service.gateway.GatewayService; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; -import cn.iocoder.yudao.module.iot.service.device.DeviceService; - @Tag(name = "管理后台 - 物联设备") @RestController @RequestMapping("/iot/device") @@ -89,13 +87,14 @@ public class DeviceController { @PreAuthorize("@ss.hasPermission('iot:device:export')") @ApiAccessLog(operateType = EXPORT) public void exportDeviceExcel(@Valid DevicePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = deviceService.getDevicePage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "物联设备.xls", "数据", DeviceRespVO.class, - BeanUtils.toBean(list, DeviceRespVO.class)); + BeanUtils.toBean(list, DeviceRespVO.class)); } + @GetMapping("/pushDevice") @Operation(summary = "下发物联设备配置到网关") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -103,7 +102,7 @@ public class DeviceController { public CommonResult pushDevice(@RequestParam("id") Long id) { DeviceDO device = deviceService.getDevice(id); GatewayDO gatewayDO = gatewayService.getGateway(device.getGatewayId()); - return deviceService.pushDevice(device,gatewayDO); + return deviceService.pushDevice(device, gatewayDO); } // ==================== 子表（设备属性） ==================== @@ -112,7 +111,7 @@ public class DeviceController { @Parameter(name = "deviceId", description = "设备id") @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getDeviceAttributePage(PageParam pageReqVO, - @RequestParam("deviceId") Long deviceId) { + @RequestParam("deviceId") Long deviceId) { return success(deviceService.getDeviceAttributePage(pageReqVO, deviceId)); } @@ -142,12 +141,12 @@ public class DeviceController { return success(true); } - @GetMapping("/device-attribute/get") - @Operation(summary = "获得设备属性") - @Parameter(name = "id", description = "编号", required = true) + @GetMapping("/device-attribute/get") + @Operation(summary = "获得设备属性") + @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('iot:device:query')") - public CommonResult getDeviceAttribute(@RequestParam("id") Long id) { - return success(deviceService.getDeviceAttribute(id)); - } + public CommonResult getDeviceAttribute(@RequestParam("id") Long id) { + return success(deviceService.getDeviceAttribute(id)); + } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DevicePageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DevicePageReqVO.java index 76ad78d8d..d29b0d265 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DevicePageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DevicePageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.device.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java index 12793a6f0..0be695a6e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.device.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 物联设备 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java index 049c11d1f..7532b5159 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.iot.controller.admin.device.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import javax.validation.constraints.NotEmpty; +import lombok.Data; + import javax.validation.constraints.NotNull; @Schema(description = "管理后台 - 物联设备新增/修改 Request VO") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java index daf75f696..0c8dc7f51 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java @@ -1,34 +1,33 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; +import cn.iocoder.yudao.module.iot.service.formula.FormulaService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; -import cn.iocoder.yudao.module.iot.service.formula.FormulaService; - @Tag(name = "管理后台 - 计算公式") @RestController @RequestMapping("/iot/formula") @@ -84,12 +83,12 @@ public class FormulaController { @PreAuthorize("@ss.hasPermission('iot:formula:export')") @ApiAccessLog(operateType = EXPORT) public void exportFormulaExcel(@Valid FormulaPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = formulaService.getFormulaPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "计算公式.xls", "数据", FormulaRespVO.class, - BeanUtils.toBean(list, FormulaRespVO.class)); + BeanUtils.toBean(list, FormulaRespVO.class)); } // ==================== 子表（计算公式明细） ==================== @@ -99,7 +98,7 @@ public class FormulaController { @Parameter(name = "formulaId", description = "计算公式ID") @PreAuthorize("@ss.hasPermission('iot:formula:query')") public CommonResult> getFormulaDetailPage(PageParam pageReqVO, - @RequestParam("formulaId") Long formulaId) { + @RequestParam("formulaId") Long formulaId) { return success(formulaService.getFormulaDetailPage(pageReqVO, formulaId)); } @@ -127,12 +126,12 @@ public class FormulaController { return success(true); } - @GetMapping("/formula-detail/get") - @Operation(summary = "获得计算公式明细") - @Parameter(name = "id", description = "编号", required = true) + @GetMapping("/formula-detail/get") + @Operation(summary = "获得计算公式明细") + @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('iot:formula:query')") - public CommonResult getFormulaDetail(@RequestParam("id") Long id) { - return success(formulaService.getFormulaDetail(id)); - } + public CommonResult getFormulaDetail(@RequestParam("id") Long id) { + return success(formulaService.getFormulaDetail(id)); + } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java index b3eddb7ef..8f67a5cae 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java @@ -1,34 +1,31 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - - -import java.util.*; -import java.io.IOException; - +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import cn.iocoder.yudao.module.iot.service.formula.FormulaRecordService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 变量记录") @RestController @@ -85,12 +82,12 @@ public class FormulaRecordController { @PreAuthorize("@ss.hasPermission('iot:formula-record:export')") @ApiAccessLog(operateType = EXPORT) public void exportFormulaRecordExcel(@Valid FormulaRecordPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = formulaRecordService.getFormulaRecordPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "变量记录.xls", "数据", FormulaRecordRespVO.class, - BeanUtils.toBean(list, FormulaRecordRespVO.class)); + BeanUtils.toBean(list, FormulaRecordRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaPageReqVO.java index e4fce5edd..558b78fcc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaPageReqVO.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; -import com.alibaba.excel.annotation.ExcelProperty; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordPageReqVO.java index 9be58ffc8..606e0a572 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordPageReqVO.java @@ -1,11 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import java.math.BigDecimal; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordRespVO.java index eba167214..d3510d7ff 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordRespVO.java @@ -1,17 +1,14 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; -import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; @Schema(description = "管理后台 - 变量记录 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordSaveReqVO.java index 541c15163..006875653 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordSaveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRespVO.java index 0c2b8c5f4..09e6206bc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 计算公式 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaSaveReqVO.java index 84cbd553b..16f62935c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaSaveReqVO.java @@ -1,8 +1,8 @@ package cn.iocoder.yudao.module.iot.controller.admin.formula.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import javax.validation.constraints.NotEmpty; +import lombok.Data; + import javax.validation.constraints.NotNull; @Schema(description = "管理后台 - 计算公式新增/修改 Request VO") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java index 91048867b..137a2883d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java @@ -1,34 +1,31 @@ package cn.iocoder.yudao.module.iot.controller.admin.frpc; -import org.springframework.web.bind.annotation.*; - -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.util.*; -import java.io.IOException; - +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import cn.iocoder.yudao.module.iot.service.frpc.FrpcProxyServerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 代理服务") @RestController @@ -85,12 +82,12 @@ public class FrpcProxyServerController { @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:export')") @ApiAccessLog(operateType = EXPORT) public void exportFrpcProxyServerExcel(@Valid FrpcProxyServerPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = frpcProxyServerService.getFrpcProxyServerPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "代理服务.xls", "数据", FrpcProxyServerRespVO.class, - BeanUtils.toBean(list, FrpcProxyServerRespVO.class)); + BeanUtils.toBean(list, FrpcProxyServerRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java index 3a783b40e..70f253197 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java index 2a9a397ad..f4745b37a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 代理服务 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java index ff4065be5..472f89fbe 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java index cfeea1832..18b6655c1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java @@ -1,34 +1,32 @@ package cn.iocoder.yudao.module.iot.controller.admin.frps; -import org.springframework.web.bind.annotation.*; - -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import cn.iocoder.yudao.module.iot.service.frps.FrpsServerService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; -import cn.iocoder.yudao.module.iot.service.frps.FrpsServerService; - @Tag(name = "管理后台 - 代理服务器") @RestController @RequestMapping("/iot/frps-server") @@ -84,12 +82,12 @@ public class FrpsServerController { @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:export')") @ApiAccessLog(operateType = EXPORT) public void exportFrpsServerExcel(@Valid FrpsServerPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = frpsServerService.getFrpsServerPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "代理服务器.xls", "数据", FrpsServerRespVO.class, - BeanUtils.toBean(list, FrpsServerRespVO.class)); + BeanUtils.toBean(list, FrpsServerRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java index 6f8286b29..f96e43ad2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java index fb9511fbb..9bb6e6a2a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 代理服务器 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java index a3bc00bd0..534cd87af 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java index d8760bad4..b9f9d506c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java @@ -1,38 +1,37 @@ package cn.iocoder.yudao.module.iot.controller.admin.gateway; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewayPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewayRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewaySaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; +import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; import cn.iocoder.yudao.module.iot.framework.constant.IsEnableConstant; import cn.iocoder.yudao.module.iot.framework.mqtt.consumer.IMqttservice; +import cn.iocoder.yudao.module.iot.service.gateway.GatewayService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.MqttException; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; -import cn.iocoder.yudao.module.iot.service.gateway.GatewayService; - @Tag(name = "管理后台 - 网关") @RestController @RequestMapping("/iot/gateway") @@ -125,12 +124,12 @@ public class GatewayController { @PreAuthorize("@ss.hasPermission('iot:gateway:export')") @ApiAccessLog(operateType = EXPORT) public void exportGatewayExcel(@Valid GatewayPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = gatewayService.getGatewayPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "网关.xls", "数据", GatewayRespVO.class, - BeanUtils.toBean(list, GatewayRespVO.class)); + BeanUtils.toBean(list, GatewayRespVO.class)); } // ==================== 子表（物联设备） ==================== @@ -168,12 +167,12 @@ public class GatewayController { return success(true); } - @GetMapping("/device/get") - @Operation(summary = "获得物联设备") - @Parameter(name = "id", description = "编号", required = true) + @GetMapping("/device/get") + @Operation(summary = "获得物联设备") + @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('iot:gateway:query')") - public CommonResult getDevice(@RequestParam("id") Long id) { - return success(gatewayService.getDevice(id)); - } + public CommonResult getDevice(@RequestParam("id") Long id) { + return success(gatewayService.getDevice(id)); + } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayPageReqVO.java index 506d32eeb..68886aa9b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.gateway.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayRespVO.java index e6bdf5b77..970713165 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.gateway.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 网关 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewaySaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewaySaveReqVO.java index f298c4a93..a1b803a30 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewaySaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewaySaveReqVO.java @@ -1,9 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.gateway.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import lombok.Data; @Schema(description = "管理后台 - 网关新增/修改 Request VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java index 4bd7cbb9d..9192ad2e1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java @@ -1,33 +1,30 @@ package cn.iocoder.yudao.module.iot.controller.admin.iotorganization; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationListReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; +import cn.iocoder.yudao.module.iot.service.iotorganization.IotOrganizationService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; -import cn.iocoder.yudao.module.iot.service.iotorganization.IotOrganizationService; - @Tag(name = "管理后台 - IOT组织") @RestController @RequestMapping("/iot/organization") @@ -83,11 +80,11 @@ public class IotOrganizationController { @PreAuthorize("@ss.hasPermission('iot:organization:export')") @ApiAccessLog(operateType = EXPORT) public void exportOrganizationExcel(@Valid IotOrganizationListReqVO listReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { List list = organizationService.getOrganizationList(listReqVO); // 导出 Excel ExcelUtils.write(response, "IOT组织.xls", "数据", IotOrganizationRespVO.class, - BeanUtils.toBean(list, IotOrganizationRespVO.class)); + BeanUtils.toBean(list, IotOrganizationRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationListReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationListReqVO.java index 10ee5f7ff..334cd9ca0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationListReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationListReqVO.java @@ -1,12 +1,11 @@ package cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - IOT组织列表 Request VO") diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationRespVO.java index 379b4eb87..eb8a5aae2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - IOT组织 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationSaveReqVO.java index 8bcebeac3..972f85b38 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationSaveReqVO.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; + @Schema(description = "管理后台 - IOT组织新增/修改 Request VO") @Data public class IotOrganizationSaveReqVO { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java index 6deda1064..8e55c43e4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java @@ -1,33 +1,32 @@ package cn.iocoder.yudao.module.iot.controller.admin.kanban; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; +import cn.iocoder.yudao.module.iot.service.kanban.KanbanService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.util.*; import java.io.IOException; +import java.util.List; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; -import cn.iocoder.yudao.module.iot.service.kanban.KanbanService; - @Tag(name = "管理后台 - 物联看板") @RestController @RequestMapping("/iot/kanban") @@ -83,12 +82,12 @@ public class KanbanController { @PreAuthorize("@ss.hasPermission('iot:kanban:export')") @ApiAccessLog(operateType = EXPORT) public void exportKanbanExcel(@Valid KanbanPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = kanbanService.getKanbanPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "物联看板.xls", "数据", KanbanRespVO.class, - BeanUtils.toBean(list, KanbanRespVO.class)); + BeanUtils.toBean(list, KanbanRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanPageReqVO.java index 1bc4a8643..7e6c66226 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.kanban.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanRespVO.java index d92888ad2..b6026276c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanRespVO.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.controller.admin.kanban.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; @Schema(description = "管理后台 - 物联看板 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanSaveReqVO.java index 735ad4eb7..119e1bc6b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanSaveReqVO.java @@ -1,9 +1,10 @@ package cn.iocoder.yudao.module.iot.controller.admin.kanban.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; + import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; + @Schema(description = "管理后台 - 物联看板新增/修改 Request VO") @Data public class KanbanSaveReqVO { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java index 700f1182d..15157290c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java @@ -1,33 +1,31 @@ package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import java.util.*; -import java.io.IOException; - +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; - -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; - -import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.*; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordRespVO; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import cn.iocoder.yudao.module.iot.service.mqttrecord.MqttRecordService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.IOException; +import java.util.List; + +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 数采记录") @RestController @@ -84,12 +82,12 @@ public class MqttRecordController { @PreAuthorize("@ss.hasPermission('iot:mqtt-record:export')") @ApiAccessLog(operateType = EXPORT) public void exportMqttRecordExcel(@Valid MqttRecordPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = mqttRecordService.getMqttRecordPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "数采记录.xls", "数据", MqttRecordRespVO.class, - BeanUtils.toBean(list, MqttRecordRespVO.class)); + BeanUtils.toBean(list, MqttRecordRespVO.class)); } } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttServerController.java index 56f1bfb63..c50c7acf2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttServerController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttServerController.java @@ -1,12 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordPageReqVO; import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordRespVO; import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; @@ -14,17 +9,12 @@ import cn.iocoder.yudao.module.iot.service.mqttrecord.MqttRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.io.IOException; -import java.util.List; -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 数采记录") @@ -66,5 +56,4 @@ public class MqttServerController { } - } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordPageReqVO.java index d9f9ca65c..397312592 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordPageReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordRespVO.java index af737dc19..a6bf08845 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordRespVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordRespVO.java @@ -1,12 +1,11 @@ package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 数采记录 Response VO") @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordSaveReqVO.java index a90a314aa..05f8bf86d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordSaveReqVO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordSaveReqVO.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceAttributeDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceAttributeDO.java index 3a593a1b5..6c1352d17 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceAttributeDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceAttributeDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.device; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 设备属性 DO @@ -77,13 +76,13 @@ public class DeviceAttributeDO extends BaseDO { private String ioStatus; /** * 是否线性换算(0是，1否) - * + *

* 枚举 {@link TODO iot_1_or_0 对应的类} */ private String isLinearTransfer; /** * 数据类型 - * + *

* 枚举 {@link TODO iot_device_data_type 对应的类} */ private String dataType; @@ -145,7 +144,7 @@ public class DeviceAttributeDO extends BaseDO { private String sourceDataType; /** * 转化进制类型binary,octal,hexadecimal,decimal - * + *

* 枚举 {@link TODO iot_device_data_transfer_type 对应的类} */ private String transferDataType; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java index a92c77393..2f7358402 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.device; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 物联设备 DO @@ -45,7 +44,7 @@ public class DeviceDO extends BaseDO { private String deviceType; /** * Siemens系列(S7-300、S7-1500) - * + *

* 枚举 {@link TODO iot_siemens_type 对应的类} */ private String siemensSeries; @@ -55,7 +54,7 @@ public class DeviceDO extends BaseDO { private String siemensConnectParam; /** * 读取任务方式(0无，1有) - * + *

* 枚举 {@link TODO iot_1_or_0 对应的类} */ private String readCronType; @@ -65,7 +64,7 @@ public class DeviceDO extends BaseDO { private Integer readRepeatValue; /** * 读取任务时间间隔单位 - * + *

* 枚举 {@link TODO iot_device_data_unit 对应的类} */ private String readRepeatUnit; @@ -91,13 +90,13 @@ public class DeviceDO extends BaseDO { private String writeCron; /** * 是否持久化(0不持久化，1持久化) - * + *

* 枚举 {@link TODO iot_1_or_0 对应的类} */ private String localPersistent; /** * 上传方式(1实时，2自定义) - * + *

* 枚举 {@link TODO iot_device_uploading_type 对应的类} */ private String uploadRate; @@ -107,19 +106,19 @@ public class DeviceDO extends BaseDO { private Integer rateCount; /** * modbus协议类型(serial-rtu) - * + *

* 枚举 {@link TODO iot_modbus_type 对应的类} */ private String modbusProtocol; /** * modbus模式(client) - * + *

* 枚举 {@link TODO iot_modbus_mold 对应的类} */ private String modbusPattern; /** * modbus串口号 - * + *

* 枚举 {@link TODO iot_modbus_port 对应的类} */ private String portName; @@ -129,13 +128,13 @@ public class DeviceDO extends BaseDO { private String modbusConnectParam; /** * 读地址是否连续(0否，1是) - * + *

* 枚举 {@link TODO iot_1_or_0 对应的类} */ private String modbusReadAddrGap; /** * 是否已下发(0下,1没下) - * + *

* 枚举 {@link TODO iot_1_or_0 对应的类} */ private String isUpload; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDO.java index 486c6a1b8..bbb4a4d2f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDO.java @@ -1,12 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.formula; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 计算公式 DO @@ -42,7 +40,7 @@ public class FormulaDO extends BaseDO { private String formula; /** * 结果类型（产量，电耗，浆耗，水耗，气耗，参数） - * + *

* 枚举 {@link TODO mes_data_type 对应的类} */ private String resultType; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDetailDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDetailDO.java index 5cffae85a..51d95d2bb 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDetailDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDetailDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.formula; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 计算公式明细 DO @@ -61,13 +60,13 @@ public class FormulaDetailDO extends BaseDO { private String demoValue; /** * 累积量类型sum:累加，max-min:最大值-最小值 - * + *

* 枚举 {@link TODO iot_formula_var_type 对应的类} */ private String sumType; /** * 计算范围，为空则不计算day：当天,week：当周,month：当月 - * + *

* 枚举 {@link TODO iot_formula_cal_rang 对应的类} */ private String sumRange; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaRecordDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaRecordDO.java index 85a1f50e1..4e8720529 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaRecordDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaRecordDO.java @@ -1,12 +1,13 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.formula; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import java.util.*; + import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 变量记录 DO @@ -46,7 +47,7 @@ public class FormulaRecordDO extends BaseDO { private String workerName; /** * 类型 - * + *

* 枚举 {@link TODO mes_data_type 对应的类} */ private String resultType; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java index 55a5eb7a7..2d99166e0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.frpc; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 代理服务 DO @@ -45,7 +44,7 @@ public class FrpcProxyServerDO extends BaseDO { private String suffixPath; /** * 内网状态 - * + *

* 枚举 {@link TODO iot_proxy_server_status 对应的类} */ private String localStatus; @@ -63,7 +62,7 @@ public class FrpcProxyServerDO extends BaseDO { private String proxyAddress; /** * 代理状态 - * + *

* 枚举 {@link TODO iot_proxy_server_status 对应的类} */ private String proxyStatus; @@ -73,7 +72,7 @@ public class FrpcProxyServerDO extends BaseDO { private String remark; /** * 是否启用 - * + *

* 枚举 {@link TODO infra_boolean_string 对应的类} */ private Boolean isEnable; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java index 721fe0749..e2d0991db 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.frps; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 代理服务器 DO @@ -53,7 +52,7 @@ public class FrpsServerDO extends BaseDO { private String frpsPath; /** * 服务状态 - * + *

* 枚举 {@link TODO iot_proxy_server_status 对应的类} */ private String frpsState; @@ -63,7 +62,7 @@ public class FrpsServerDO extends BaseDO { private String remark; /** * 是否启用 - * + *

* 枚举 {@link TODO infra_boolean_string 对应的类} */ private Boolean isEnable; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/gateway/GatewayDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/gateway/GatewayDO.java index 9db9a3ad2..ca262e0bc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/gateway/GatewayDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/gateway/GatewayDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.gateway; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 网关 DO @@ -57,7 +56,7 @@ public class GatewayDO extends BaseDO { private String gatewayCode; /** * 网关状态 - * + *

* 枚举 {@link TODO iot_gateway_status 对应的类} */ private String gatewayStatus; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/iotorganization/IotOrganizationDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/iotorganization/IotOrganizationDO.java index 56abd6113..f419dc843 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/iotorganization/IotOrganizationDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/iotorganization/IotOrganizationDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * IOT组织 DO @@ -51,25 +50,25 @@ public class IotOrganizationDO extends BaseDO { private Long parentId; /** * 组织状态 - * + *

* 枚举 {@link TODO mes_machine_status 对应的类} */ private Integer status; /** * 设备类型 - * + *

* 枚举 {@link TODO iot_device_type 对应的类} */ private String deviceType; /** * 组织等级 - * + *

* 枚举 {@link TODO iot_org_class 对应的类} */ private String orgClass; /** * 机台类型 - * + *

* 枚举 {@link TODO mes_org_type 对应的类} */ private String machineType; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/kanban/KanbanDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/kanban/KanbanDO.java index 79900fb57..12dbb315c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/kanban/KanbanDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/kanban/KanbanDO.java @@ -1,11 +1,10 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.kanban; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; /** * 物联看板 DO @@ -53,7 +52,7 @@ public class KanbanDO extends BaseDO { private String remark; /** * 是否启用 - * + *

* 枚举 {@link TODO infra_boolean_string 对应的类} */ private Boolean isEnable; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttrecord/MqttRecordDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttrecord/MqttRecordDO.java index 9b23d1932..a9e80aa6c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttrecord/MqttRecordDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttrecord/MqttRecordDO.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 数采记录 DO diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceAttributeMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceAttributeMapper.java index 7eb4eaee7..2faf365f4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceAttributeMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceAttributeMapper.java @@ -1,14 +1,14 @@ package cn.iocoder.yudao.module.iot.dal.mysql.device; -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 设备属性 Mapper * @@ -19,13 +19,14 @@ public interface DeviceAttributeMapper extends BaseMapperX { default PageResult selectPage(PageParam reqVO, Long deviceId) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(DeviceAttributeDO::getDeviceId, deviceId) - .orderByDesc(DeviceAttributeDO::getId)); + .eq(DeviceAttributeDO::getDeviceId, deviceId) + .orderByDesc(DeviceAttributeDO::getId)); } default int deleteByDeviceId(Long deviceId) { return delete(DeviceAttributeDO::getDeviceId, deviceId); } + default List selectByDeviceId(Long deviceId) { return selectList(DeviceAttributeDO::getDeviceId, deviceId); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java index 96b8d6ee6..5cd5cbf2d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java @@ -2,12 +2,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.device; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DevicePageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*; import java.util.List; @@ -51,6 +50,7 @@ public interface DeviceMapper extends BaseMapperX { .betweenIfPresent(DeviceDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(DeviceDO::getId)); } + default PageResult selectPage(PageParam reqVO, Long gatewayId) { return selectPage(reqVO, new LambdaQueryWrapperX() .eq(DeviceDO::getGatewayId, gatewayId) @@ -60,6 +60,7 @@ public interface DeviceMapper extends BaseMapperX { default int deleteByGatewayId(Long gatewayId) { return delete(DeviceDO::getGatewayId, gatewayId); } + default List selectByGatewayId(Long gatewayId) { return selectList(DeviceDO::getGatewayId, gatewayId); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaDetailMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaDetailMapper.java index b6be8d092..2f470ad8b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaDetailMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaDetailMapper.java @@ -1,11 +1,9 @@ package cn.iocoder.yudao.module.iot.dal.mysql.formula; -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -19,8 +17,8 @@ public interface FormulaDetailMapper extends BaseMapperX { default PageResult selectPage(PageParam reqVO, Long formulaId) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(FormulaDetailDO::getFormulaId, formulaId) - .orderByDesc(FormulaDetailDO::getId)); + .eq(FormulaDetailDO::getFormulaId, formulaId) + .orderByDesc(FormulaDetailDO::getId)); } default int deleteByFormulaId(Long formulaId) { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaMapper.java index 967d27151..06a929780 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.formula; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; /** * 计算公式 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaRecordMapper.java index 6bcd9a97c..447cb2f10 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaRecordMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaRecordMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.formula; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; /** * 变量记录 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java index 5e656d5a5..1f384402d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.frpc; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; /** * 代理服务 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java index d4d6ced99..1d9ae9ea4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.frps; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; /** * 代理服务器 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/gateway/GatewayMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/gateway/GatewayMapper.java index 083e75976..c386416e8 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/gateway/GatewayMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/gateway/GatewayMapper.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.iot.dal.mysql.gateway; -import java.util.*; - -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewayPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.*; + +import java.util.List; /** * 网关 Mapper @@ -32,6 +31,7 @@ public interface GatewayMapper extends BaseMapperX { .eqIfPresent(GatewayDO::getTopic, reqVO.getTopic()) .orderByDesc(GatewayDO::getId)); } + default List selectListByIsEnable(boolean isEnable) { return selectList(GatewayDO::getIsEnable, isEnable); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/iotorganization/IotOrganizationMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/iotorganization/IotOrganizationMapper.java index ed78b4a49..eedf7ce49 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/iotorganization/IotOrganizationMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/iotorganization/IotOrganizationMapper.java @@ -1,13 +1,12 @@ package cn.iocoder.yudao.module.iot.dal.mysql.iotorganization; -import java.util.*; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationListReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.*; + +import java.util.List; /** * IOT组织 Mapper @@ -32,9 +31,9 @@ public interface IotOrganizationMapper extends BaseMapperX { .orderByDesc(IotOrganizationDO::getId)); } - default IotOrganizationDO selectByParentIdAndName(Long parentId, String name) { - return selectOne(IotOrganizationDO::getParentId, parentId, IotOrganizationDO::getName, name); - } + default IotOrganizationDO selectByParentIdAndName(Long parentId, String name) { + return selectOne(IotOrganizationDO::getParentId, parentId, IotOrganizationDO::getName, name); + } default Long selectCountByParentId(Long parentId) { return selectCount(IotOrganizationDO::getParentId, parentId); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/kanban/KanbanMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/kanban/KanbanMapper.java index aa7a8f2fc..7d1c58fe8 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/kanban/KanbanMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/kanban/KanbanMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.kanban; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.*; /** * 物联看板 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttrecord/MqttRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttrecord/MqttRecordMapper.java index 4688cbb66..383be244e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttrecord/MqttRecordMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttrecord/MqttRecordMapper.java @@ -1,13 +1,11 @@ package cn.iocoder.yudao.module.iot.dal.mysql.mqttrecord; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.*; /** * 数采记录 Mapper diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/AddressDataType.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/AddressDataType.java index 5922d7ba9..feb73c7f4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/AddressDataType.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/AddressDataType.java @@ -9,100 +9,106 @@ import java.util.Map; @Data @AllArgsConstructor public class AddressDataType { - private static Map tdDataTypeMap = new HashMap<>(); - private static Map mysqlDataTypeMap = new HashMap<>(); - private static Map gatewayDataTypeMap = new HashMap<>(); - static { - tdDataTypeMap.put("bool","BOOL"); - tdDataTypeMap.put("int8","INT"); - tdDataTypeMap.put("int16","INT"); - tdDataTypeMap.put("int32","INT"); - tdDataTypeMap.put("int64","BIGINT"); - tdDataTypeMap.put("uint8","INT"); - tdDataTypeMap.put("uint16","INT"); - tdDataTypeMap.put("uint32","BIGINT"); - tdDataTypeMap.put("uint64","BIGINT"); - tdDataTypeMap.put("float32","float"); - tdDataTypeMap.put("float64","float"); - tdDataTypeMap.put("string","NCHAR(255)"); - tdDataTypeMap.put("date","TIMESTAMP"); - tdDataTypeMap.put("bcd","BINARY(64)"); + private static Map tdDataTypeMap = new HashMap<>(); + private static Map mysqlDataTypeMap = new HashMap<>(); + private static Map gatewayDataTypeMap = new HashMap<>(); - gatewayDataTypeMap.put("bool",1); - gatewayDataTypeMap.put("int8",2); - gatewayDataTypeMap.put("uint8",3); - gatewayDataTypeMap.put("int16",4); - gatewayDataTypeMap.put("uint16",5); - gatewayDataTypeMap.put("int32",6); - gatewayDataTypeMap.put("uint32",7); - gatewayDataTypeMap.put("int64",8); - gatewayDataTypeMap.put("uint64",9); - gatewayDataTypeMap.put("float32",10); - gatewayDataTypeMap.put("float64",11); - gatewayDataTypeMap.put("string",12); - gatewayDataTypeMap.put("date",13); - gatewayDataTypeMap.put("bcd",14); + static { + tdDataTypeMap.put("bool", "BOOL"); + tdDataTypeMap.put("int8", "INT"); + tdDataTypeMap.put("int16", "INT"); + tdDataTypeMap.put("int32", "INT"); + tdDataTypeMap.put("int64", "BIGINT"); + tdDataTypeMap.put("uint8", "INT"); + tdDataTypeMap.put("uint16", "INT"); + tdDataTypeMap.put("uint32", "BIGINT"); + tdDataTypeMap.put("uint64", "BIGINT"); + tdDataTypeMap.put("float32", "float"); + tdDataTypeMap.put("float64", "float"); + tdDataTypeMap.put("string", "NCHAR(255)"); + tdDataTypeMap.put("date", "TIMESTAMP"); + tdDataTypeMap.put("bcd", "BINARY(64)"); - gatewayDataTypeMap.put("Bool",1); - gatewayDataTypeMap.put("Int8",2); - gatewayDataTypeMap.put("Uint8",3); - gatewayDataTypeMap.put("Int16",4); - gatewayDataTypeMap.put("Uint16",5); - gatewayDataTypeMap.put("Int32",6); - gatewayDataTypeMap.put("Uint32",7); - gatewayDataTypeMap.put("Int64",8); - gatewayDataTypeMap.put("Uint64",9); - gatewayDataTypeMap.put("Float32",10); - gatewayDataTypeMap.put("Float64",11); - gatewayDataTypeMap.put("String",12); - gatewayDataTypeMap.put("Date",13); - gatewayDataTypeMap.put("Bcd",14); + gatewayDataTypeMap.put("bool", 1); + gatewayDataTypeMap.put("int8", 2); + gatewayDataTypeMap.put("uint8", 3); + gatewayDataTypeMap.put("int16", 4); + gatewayDataTypeMap.put("uint16", 5); + gatewayDataTypeMap.put("int32", 6); + gatewayDataTypeMap.put("uint32", 7); + gatewayDataTypeMap.put("int64", 8); + gatewayDataTypeMap.put("uint64", 9); + gatewayDataTypeMap.put("float32", 10); + gatewayDataTypeMap.put("float64", 11); + gatewayDataTypeMap.put("string", 12); + gatewayDataTypeMap.put("date", 13); + gatewayDataTypeMap.put("bcd", 14); - gatewayDataTypeMap.put("BOOL",1); - gatewayDataTypeMap.put("INT8",2); - gatewayDataTypeMap.put("UINT8",3); - gatewayDataTypeMap.put("INT16",4); - gatewayDataTypeMap.put("UINT16",5); - gatewayDataTypeMap.put("INT32",6); - gatewayDataTypeMap.put("UINT32",7); - gatewayDataTypeMap.put("INT64",8); - gatewayDataTypeMap.put("UINT64",9); - gatewayDataTypeMap.put("FLOAT32",10); - gatewayDataTypeMap.put("FLOAT64",11); - gatewayDataTypeMap.put("STRING",12); - gatewayDataTypeMap.put("DATE",13); - gatewayDataTypeMap.put("BCD",14); + gatewayDataTypeMap.put("Bool", 1); + gatewayDataTypeMap.put("Int8", 2); + gatewayDataTypeMap.put("Uint8", 3); + gatewayDataTypeMap.put("Int16", 4); + gatewayDataTypeMap.put("Uint16", 5); + gatewayDataTypeMap.put("Int32", 6); + gatewayDataTypeMap.put("Uint32", 7); + gatewayDataTypeMap.put("Int64", 8); + gatewayDataTypeMap.put("Uint64", 9); + gatewayDataTypeMap.put("Float32", 10); + gatewayDataTypeMap.put("Float64", 11); + gatewayDataTypeMap.put("String", 12); + gatewayDataTypeMap.put("Date", 13); + gatewayDataTypeMap.put("Bcd", 14); - mysqlDataTypeMap.put("bool","BOOL"); - mysqlDataTypeMap.put("int8","INT"); - mysqlDataTypeMap.put("int16","INT"); - mysqlDataTypeMap.put("int32","INT"); - mysqlDataTypeMap.put("int64","BIGINT"); - mysqlDataTypeMap.put("uint8","INT"); - mysqlDataTypeMap.put("uint16","INT"); - mysqlDataTypeMap.put("uint32","BIGINT"); - mysqlDataTypeMap.put("uint64","BIGINT"); - mysqlDataTypeMap.put("float32","float"); - mysqlDataTypeMap.put("float64","float"); - mysqlDataTypeMap.put("string","varchar(255)"); - mysqlDataTypeMap.put("date","TIMESTAMP"); - mysqlDataTypeMap.put("bcd","double"); - } - public static Map getDataTypeMap(){ - return tdDataTypeMap; - } - public static String getTdDataType(String originDataType){ - return tdDataTypeMap.get(originDataType); - } - public static String getTMysqlDataType(String originDataType){ - //return mysqlDataTypeMap.get(originDataType); - return "double(8,4)"; - } - public static Map getGatewayDataTypeMap(){ - return gatewayDataTypeMap; - } - public static Integer getGatewayDataTypeMap(String originDataType){ - return gatewayDataTypeMap.get(originDataType); - } + gatewayDataTypeMap.put("BOOL", 1); + gatewayDataTypeMap.put("INT8", 2); + gatewayDataTypeMap.put("UINT8", 3); + gatewayDataTypeMap.put("INT16", 4); + gatewayDataTypeMap.put("UINT16", 5); + gatewayDataTypeMap.put("INT32", 6); + gatewayDataTypeMap.put("UINT32", 7); + gatewayDataTypeMap.put("INT64", 8); + gatewayDataTypeMap.put("UINT64", 9); + gatewayDataTypeMap.put("FLOAT32", 10); + gatewayDataTypeMap.put("FLOAT64", 11); + gatewayDataTypeMap.put("STRING", 12); + gatewayDataTypeMap.put("DATE", 13); + gatewayDataTypeMap.put("BCD", 14); + + mysqlDataTypeMap.put("bool", "BOOL"); + mysqlDataTypeMap.put("int8", "INT"); + mysqlDataTypeMap.put("int16", "INT"); + mysqlDataTypeMap.put("int32", "INT"); + mysqlDataTypeMap.put("int64", "BIGINT"); + mysqlDataTypeMap.put("uint8", "INT"); + mysqlDataTypeMap.put("uint16", "INT"); + mysqlDataTypeMap.put("uint32", "BIGINT"); + mysqlDataTypeMap.put("uint64", "BIGINT"); + mysqlDataTypeMap.put("float32", "float"); + mysqlDataTypeMap.put("float64", "float"); + mysqlDataTypeMap.put("string", "varchar(255)"); + mysqlDataTypeMap.put("date", "TIMESTAMP"); + mysqlDataTypeMap.put("bcd", "double"); + } + + public static Map getDataTypeMap() { + return tdDataTypeMap; + } + + public static String getTdDataType(String originDataType) { + return tdDataTypeMap.get(originDataType); + } + + public static String getTMysqlDataType(String originDataType) { + //return mysqlDataTypeMap.get(originDataType); + return "double(8,4)"; + } + + public static Map getGatewayDataTypeMap() { + return gatewayDataTypeMap; + } + + public static Integer getGatewayDataTypeMap(String originDataType) { + return gatewayDataTypeMap.get(originDataType); + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/Constants.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/Constants.java index fde11730c..890984c8c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/Constants.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/Constants.java @@ -1,6 +1,6 @@ package cn.iocoder.yudao.module.iot.framework.constant; public class Constants { - public final static String MQTT_timestamp_format = "yyyy-MM-dd HH:mm:ss.SSS"; + public final static String MQTT_timestamp_format = "yyyy-MM-dd HH:mm:ss.SSS"; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/DeviceTypeEnum.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/DeviceTypeEnum.java index ce68a5ca2..170efd1f4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/DeviceTypeEnum.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/DeviceTypeEnum.java @@ -1,12 +1,9 @@ package cn.iocoder.yudao.module.iot.framework.constant; import cn.hutool.core.util.ObjUtil; -import cn.iocoder.yudao.framework.common.core.IntArrayValuable; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.Arrays; - @Getter @AllArgsConstructor public enum DeviceTypeEnum { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/IsEnableConstant.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/IsEnableConstant.java index a656bfc20..46afc04b3 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/IsEnableConstant.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/IsEnableConstant.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.iot.framework.constant; public class IsEnableConstant { - /** - * 停用 - */ - public final static boolean IsEnableFalse = false; - /** - * 启用 - */ - public final static boolean IsEnableTrue = true; + /** + * 停用 + */ + public final static boolean IsEnableFalse = false; + /** + * 启用 + */ + public final static boolean IsEnableTrue = true; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ChangeStatus.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ChangeStatus.java index a9d67af71..7756d95ca 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ChangeStatus.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ChangeStatus.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class ChangeStatus { - private String changesStatusID; - private String newStatus; - private String oldStatus; + private String changesStatusID; + private String newStatus; + private String oldStatus; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/HttpEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/HttpEntity.java index 46bcd4722..5192e6e7a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/HttpEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/HttpEntity.java @@ -9,197 +9,198 @@ import java.util.List; public class HttpEntity { - public static List getRemoveParam(String ids) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("ids", ids)); - return params; - } - - - public static List getRemoveSiemens(Integer id) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("ids", id.toString())); - return params; - } - - public static List getPageParam(PageEntity pageEntity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("pageSize", pageEntity.getPageSize())); - params.add(new BasicNameValuePair("pageNum", pageEntity.getPageNum())); - params.add(new BasicNameValuePair("orderByColumn", pageEntity.getOrderByColumn())); - params.add(new BasicNameValuePair("isAsc", pageEntity.getIsAsc())); - return params; - } - public static List getPageParamVo(PageEntityByDecice pageEntity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("pageSize", pageEntity.getPageSize())); - params.add(new BasicNameValuePair("pageNum", pageEntity.getPageNum())); - params.add(new BasicNameValuePair("orderByColumn", pageEntity.getOrderByColumn())); - params.add(new BasicNameValuePair("isAsc", pageEntity.getIsAsc())); - params.add(new BasicNameValuePair("deviceID", pageEntity.getDeviceID())); - return params; - } - - public static List getParam(DeviceSiemensEntity entity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("deviceConfigID", entity.getDeviceConfigID())); - params.add(new BasicNameValuePair("deviceID", entity.getDeviceID())); - params.add(new BasicNameValuePair("deviceName", entity.getDeviceName())); - params.add(new BasicNameValuePair("localPersistent", entity.getLocalPersistent())); - params.add(new BasicNameValuePair("rateCount", entity.getRateCount().toString())); - params.add(new BasicNameValuePair("siemensConnectParam", entity.getSiemensConnectParam())); - params.add(new BasicNameValuePair("siemensSeries", entity.getSiemensSeries())); - params.add(new BasicNameValuePair("uploadRate", entity.getUploadRate())); - params.add(new BasicNameValuePair("pageSize", entity.getReadRepeatValue().toString())); - params.add(new BasicNameValuePair("pageNum", entity.getWriteRepeatValue().toString())); - params.add(new BasicNameValuePair("ReadCron", entity.getReadCron())); - params.add(new BasicNameValuePair("ReadCronType", entity.getReadCronType())); - params.add(new BasicNameValuePair("ReadRepeatUnit", entity.getReadRepeatUnit())); - params.add(new BasicNameValuePair("WriteCron", entity.getWriteCron())); - params.add(new BasicNameValuePair("WriteCronType", entity.getWriteCronType())); - params.add(new BasicNameValuePair("WriteRepeatUnit", entity.getWriteRepeatUnit())); - params.add(new BasicNameValuePair("ids", entity.getWriteRepeatUnit())); - return params; - } - - public static List getParam(DeviceModbusEntity entity) { - List params = new ArrayList<>(); - if (entity.getReadRepeatValue() != null) { - params.add(new BasicNameValuePair("pageSize", entity.getReadRepeatValue().toString())); - } - if (entity.getWriteRepeatValue() != null) { - params.add(new BasicNameValuePair("pageNum", entity.getWriteRepeatValue().toString())); - } - if (entity.getDeviceConfigID() != null) { - params.add(new BasicNameValuePair("orderByColumn", entity.getDeviceConfigID())); - } - if (entity.getDeviceId() != null) { - params.add(new BasicNameValuePair("deviceID", entity.getDeviceId())); - } - if (entity.getDeviceName() != null) { - params.add(new BasicNameValuePair("deviceName", entity.getDeviceName())); - } - if (entity.getModbusProtocol() != null) { - params.add(new BasicNameValuePair("modbusProtocol", entity.getModbusProtocol())); - } - if (entity.getModbusPattern() != null) { - params.add(new BasicNameValuePair("modbusPattern", entity.getModbusPattern())); - } - if (entity.getPortName() != null) { - params.add(new BasicNameValuePair("portName", entity.getPortName())); - } - if (entity.getModbusConnectParam() != null) { - params.add(new BasicNameValuePair("modbusConnectParam", entity.getModbusConnectParam())); - } - if (entity.getReadCronType() != null) { - params.add(new BasicNameValuePair("readCronType", entity.getReadCronType())); - } - if (entity.getReadRepeatValue() != null) { - params.add(new BasicNameValuePair("readRepeatValue", entity.getReadRepeatValue().toString())); - } - if (entity.getReadRepeatUnit() != null) { - params.add(new BasicNameValuePair("readRepeatUnit", entity.getReadRepeatUnit())); - } - if (entity.getReadCron() != null) { - params.add(new BasicNameValuePair("readCron", entity.getReadCron())); - } - if (entity.getWriteCronType() != null) { - params.add(new BasicNameValuePair("writeCronType", entity.getWriteCronType())); - } - if (entity.getWriteRepeatValue() != null) { - params.add(new BasicNameValuePair("writeRepeatValue", entity.getWriteRepeatValue().toString())); - } - if (entity.getWriteRepeatUnit() != null) { - params.add(new BasicNameValuePair("writeRepeatUnit", entity.getWriteRepeatUnit())); - } - if (entity.getReadRepeatValue() != null) { - params.add(new BasicNameValuePair("writeCron", entity.getWriteCron())); - } - if (entity.getLocalPersistent() != null) { - params.add(new BasicNameValuePair("localPersistent", entity.getLocalPersistent())); - } - if (entity.getUploadRate() != null) { - params.add(new BasicNameValuePair("uploadRate", entity.getUploadRate())); - } - if (entity.getRateCount() != null) { - params.add(new BasicNameValuePair("rateCount", entity.getRateCount().toString())); - } - if (entity.getModbusReadAddrGap() != null) { - params.add(new BasicNameValuePair("modbusReadAddrGap", entity.getModbusReadAddrGap())); - } - return params; - } - - public static List getParam(ModbusPointEntity entity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("deviceConfigContentID", entity.getDeviceConfigContentID())); - params.add(new BasicNameValuePair("modbusAddressType", entity.getModbusAddressType())); + public static List getRemoveParam(String ids) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("ids", ids)); + return params; + } + + + public static List getRemoveSiemens(Integer id) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("ids", id.toString())); + return params; + } + + public static List getPageParam(PageEntity pageEntity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("pageSize", pageEntity.getPageSize())); + params.add(new BasicNameValuePair("pageNum", pageEntity.getPageNum())); + params.add(new BasicNameValuePair("orderByColumn", pageEntity.getOrderByColumn())); + params.add(new BasicNameValuePair("isAsc", pageEntity.getIsAsc())); + return params; + } + + public static List getPageParamVo(PageEntityByDecice pageEntity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("pageSize", pageEntity.getPageSize())); + params.add(new BasicNameValuePair("pageNum", pageEntity.getPageNum())); + params.add(new BasicNameValuePair("orderByColumn", pageEntity.getOrderByColumn())); + params.add(new BasicNameValuePair("isAsc", pageEntity.getIsAsc())); + params.add(new BasicNameValuePair("deviceID", pageEntity.getDeviceID())); + return params; + } + + public static List getParam(DeviceSiemensEntity entity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("deviceConfigID", entity.getDeviceConfigID())); + params.add(new BasicNameValuePair("deviceID", entity.getDeviceID())); + params.add(new BasicNameValuePair("deviceName", entity.getDeviceName())); + params.add(new BasicNameValuePair("localPersistent", entity.getLocalPersistent())); + params.add(new BasicNameValuePair("rateCount", entity.getRateCount().toString())); + params.add(new BasicNameValuePair("siemensConnectParam", entity.getSiemensConnectParam())); + params.add(new BasicNameValuePair("siemensSeries", entity.getSiemensSeries())); + params.add(new BasicNameValuePair("uploadRate", entity.getUploadRate())); + params.add(new BasicNameValuePair("pageSize", entity.getReadRepeatValue().toString())); + params.add(new BasicNameValuePair("pageNum", entity.getWriteRepeatValue().toString())); + params.add(new BasicNameValuePair("ReadCron", entity.getReadCron())); + params.add(new BasicNameValuePair("ReadCronType", entity.getReadCronType())); + params.add(new BasicNameValuePair("ReadRepeatUnit", entity.getReadRepeatUnit())); + params.add(new BasicNameValuePair("WriteCron", entity.getWriteCron())); + params.add(new BasicNameValuePair("WriteCronType", entity.getWriteCronType())); + params.add(new BasicNameValuePair("WriteRepeatUnit", entity.getWriteRepeatUnit())); + params.add(new BasicNameValuePair("ids", entity.getWriteRepeatUnit())); + return params; + } + + public static List getParam(DeviceModbusEntity entity) { + List params = new ArrayList<>(); + if (entity.getReadRepeatValue() != null) { + params.add(new BasicNameValuePair("pageSize", entity.getReadRepeatValue().toString())); + } + if (entity.getWriteRepeatValue() != null) { + params.add(new BasicNameValuePair("pageNum", entity.getWriteRepeatValue().toString())); + } + if (entity.getDeviceConfigID() != null) { + params.add(new BasicNameValuePair("orderByColumn", entity.getDeviceConfigID())); + } + if (entity.getDeviceId() != null) { + params.add(new BasicNameValuePair("deviceID", entity.getDeviceId())); + } + if (entity.getDeviceName() != null) { + params.add(new BasicNameValuePair("deviceName", entity.getDeviceName())); + } + if (entity.getModbusProtocol() != null) { + params.add(new BasicNameValuePair("modbusProtocol", entity.getModbusProtocol())); + } + if (entity.getModbusPattern() != null) { + params.add(new BasicNameValuePair("modbusPattern", entity.getModbusPattern())); + } + if (entity.getPortName() != null) { + params.add(new BasicNameValuePair("portName", entity.getPortName())); + } + if (entity.getModbusConnectParam() != null) { + params.add(new BasicNameValuePair("modbusConnectParam", entity.getModbusConnectParam())); + } + if (entity.getReadCronType() != null) { + params.add(new BasicNameValuePair("readCronType", entity.getReadCronType())); + } + if (entity.getReadRepeatValue() != null) { + params.add(new BasicNameValuePair("readRepeatValue", entity.getReadRepeatValue().toString())); + } + if (entity.getReadRepeatUnit() != null) { + params.add(new BasicNameValuePair("readRepeatUnit", entity.getReadRepeatUnit())); + } + if (entity.getReadCron() != null) { + params.add(new BasicNameValuePair("readCron", entity.getReadCron())); + } + if (entity.getWriteCronType() != null) { + params.add(new BasicNameValuePair("writeCronType", entity.getWriteCronType())); + } + if (entity.getWriteRepeatValue() != null) { + params.add(new BasicNameValuePair("writeRepeatValue", entity.getWriteRepeatValue().toString())); + } + if (entity.getWriteRepeatUnit() != null) { + params.add(new BasicNameValuePair("writeRepeatUnit", entity.getWriteRepeatUnit())); + } + if (entity.getReadRepeatValue() != null) { + params.add(new BasicNameValuePair("writeCron", entity.getWriteCron())); + } + if (entity.getLocalPersistent() != null) { + params.add(new BasicNameValuePair("localPersistent", entity.getLocalPersistent())); + } + if (entity.getUploadRate() != null) { + params.add(new BasicNameValuePair("uploadRate", entity.getUploadRate())); + } + if (entity.getRateCount() != null) { + params.add(new BasicNameValuePair("rateCount", entity.getRateCount().toString())); + } + if (entity.getModbusReadAddrGap() != null) { + params.add(new BasicNameValuePair("modbusReadAddrGap", entity.getModbusReadAddrGap())); + } + return params; + } + + public static List getParam(ModbusPointEntity entity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("deviceConfigContentID", entity.getDeviceConfigContentID())); + params.add(new BasicNameValuePair("modbusAddressType", entity.getModbusAddressType())); // params.add(new BasicNameValuePair("modbusFieldAccess", entity.getModbusFieldAccess())); - params.add(new BasicNameValuePair("modbusFieldAddress", entity.getModbusFieldAddress())); - params.add(new BasicNameValuePair("modbusFieldDataType", entity.getModbusFieldDataType())); - params.add(new BasicNameValuePair("modbusFieldName", entity.getModbusFieldName())); - params.add(new BasicNameValuePair("modbusFieldOrder", entity.getModbusFieldOrder())); - params.add(new BasicNameValuePair("modbusFieldPrecision", entity.getModbusFieldPrecision())); - if (entity.getModbusFieldSize()!=null){ - params.add(new BasicNameValuePair("modbusFieldSize",entity.getModbusFieldSize().toString())); - } - params.add(new BasicNameValuePair("modbusFieldUnit", entity.getModbusFieldUnit())); - params.add(new BasicNameValuePair("modbusSlaveID", entity.getModbusSlaveID())); - return params; - } - - public static List getParam(SiemensPointEntity entity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("deviceConfigContentID", String.valueOf(entity.getDeviceConfigContentID()))); - params.add(new BasicNameValuePair("siemensFieldAddress", entity.getSiemensFieldAddress())); - params.add(new BasicNameValuePair("siemensFieldDataType", entity.getSiemensFieldDataType().toString())); - params.add(new BasicNameValuePair("siemensFieldName", entity.getSiemensFieldName())); - params.add(new BasicNameValuePair("siemensFieldPrecision",String.valueOf(entity.getSiemensFieldPrecision()))); - params.add(new BasicNameValuePair("siemensFieldUnit", entity.getSiemensFieldUnit())); - return params; - } - - public static List getParam(DeviceVideoEntity entity) { - List params = new ArrayList<>(); + params.add(new BasicNameValuePair("modbusFieldAddress", entity.getModbusFieldAddress())); + params.add(new BasicNameValuePair("modbusFieldDataType", entity.getModbusFieldDataType())); + params.add(new BasicNameValuePair("modbusFieldName", entity.getModbusFieldName())); + params.add(new BasicNameValuePair("modbusFieldOrder", entity.getModbusFieldOrder())); + params.add(new BasicNameValuePair("modbusFieldPrecision", entity.getModbusFieldPrecision())); + if (entity.getModbusFieldSize() != null) { + params.add(new BasicNameValuePair("modbusFieldSize", entity.getModbusFieldSize().toString())); + } + params.add(new BasicNameValuePair("modbusFieldUnit", entity.getModbusFieldUnit())); + params.add(new BasicNameValuePair("modbusSlaveID", entity.getModbusSlaveID())); + return params; + } + + public static List getParam(SiemensPointEntity entity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("deviceConfigContentID", String.valueOf(entity.getDeviceConfigContentID()))); + params.add(new BasicNameValuePair("siemensFieldAddress", entity.getSiemensFieldAddress())); + params.add(new BasicNameValuePair("siemensFieldDataType", entity.getSiemensFieldDataType().toString())); + params.add(new BasicNameValuePair("siemensFieldName", entity.getSiemensFieldName())); + params.add(new BasicNameValuePair("siemensFieldPrecision", String.valueOf(entity.getSiemensFieldPrecision()))); + params.add(new BasicNameValuePair("siemensFieldUnit", entity.getSiemensFieldUnit())); + return params; + } + + public static List getParam(DeviceVideoEntity entity) { + List params = new ArrayList<>(); // params.add(new BasicNameValuePair("deviceConfigID", String.valueOf(entity.getDeviceConfigID()))); - params.add(new BasicNameValuePair("deviceID", entity.getDeviceID())); - params.add(new BasicNameValuePair("videoAddress", entity.getVideoAddress())); - params.add(new BasicNameValuePair("serverAddress", entity.getServerAddress())); - params.add(new BasicNameValuePair("deviceName",String.valueOf(entity.getDeviceName()))); - return params; - } - - public static List getParam(MqttBrokerEntity entity) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("cloudConfigID", entity.getCloudConfigID())); - params.add(new BasicNameValuePair("cloudStatus", entity.getCloudStatus())); - params.add(new BasicNameValuePair("createTime", entity.getCreateTime())); - params.add(new BasicNameValuePair("updateTime", entity.getUpdateTime())); - params.add(new BasicNameValuePair("mqttAddress", entity.getMqttAddress())); - params.add(new BasicNameValuePair("mqttPassword", entity.getMqttPassword())); - params.add(new BasicNameValuePair("mqttUserName", entity.getMqttUserName())); - params.add(new BasicNameValuePair("mqttPort", entity.getMqttPort())); - params.add(new BasicNameValuePair("mqttPublishTopic", entity.getMqttPublishTopic())); - params.add(new BasicNameValuePair("mqttSslFlag", entity.getMqttSslFlag().toString())); - - return params; - } - - /*启用模型*/ - public static List getChangestatus(ChangeStatus changeStatus) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("changesStatusID", changeStatus.getChangesStatusID())); - params.add(new BasicNameValuePair("newStatus", changeStatus.getNewStatus())); - params.add(new BasicNameValuePair("oldStatus", changeStatus.getOldStatus())); - - - return params; - } - - public static List getLoginParam(String username,String password) { - List params = new ArrayList<>(); - params.add(new BasicNameValuePair("username", username)); - params.add(new BasicNameValuePair("password", password)); - return params; - } + params.add(new BasicNameValuePair("deviceID", entity.getDeviceID())); + params.add(new BasicNameValuePair("videoAddress", entity.getVideoAddress())); + params.add(new BasicNameValuePair("serverAddress", entity.getServerAddress())); + params.add(new BasicNameValuePair("deviceName", String.valueOf(entity.getDeviceName()))); + return params; + } + + public static List getParam(MqttBrokerEntity entity) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("cloudConfigID", entity.getCloudConfigID())); + params.add(new BasicNameValuePair("cloudStatus", entity.getCloudStatus())); + params.add(new BasicNameValuePair("createTime", entity.getCreateTime())); + params.add(new BasicNameValuePair("updateTime", entity.getUpdateTime())); + params.add(new BasicNameValuePair("mqttAddress", entity.getMqttAddress())); + params.add(new BasicNameValuePair("mqttPassword", entity.getMqttPassword())); + params.add(new BasicNameValuePair("mqttUserName", entity.getMqttUserName())); + params.add(new BasicNameValuePair("mqttPort", entity.getMqttPort())); + params.add(new BasicNameValuePair("mqttPublishTopic", entity.getMqttPublishTopic())); + params.add(new BasicNameValuePair("mqttSslFlag", entity.getMqttSslFlag().toString())); + + return params; + } + + /*启用模型*/ + public static List getChangestatus(ChangeStatus changeStatus) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("changesStatusID", changeStatus.getChangesStatusID())); + params.add(new BasicNameValuePair("newStatus", changeStatus.getNewStatus())); + params.add(new BasicNameValuePair("oldStatus", changeStatus.getOldStatus())); + + + return params; + } + + public static List getLoginParam(String username, String password) { + List params = new ArrayList<>(); + params.add(new BasicNameValuePair("username", username)); + params.add(new BasicNameValuePair("password", password)); + return params; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ListEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ListEntity.java index 77f7bd3e9..8ef9b583f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ListEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/ListEntity.java @@ -11,8 +11,8 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class ListEntity { - String code; - String msg; - String total; - List rows; + String code; + String msg; + String total; + List rows; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceModbusEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceModbusEntity.java index 716a4753c..8a824e89e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceModbusEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceModbusEntity.java @@ -8,104 +8,104 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class DeviceModbusEntity { - /** - * 网关管理后台的id - */ - private String deviceConfigID; - /** - * 机台ID - */ - private String equipmentsId; - - private String deviceConfigId; - - /** - * modbus设备编号 - */ - private String deviceId; - - /** - * modbus设备名称 - */ - private String deviceName; - - /** - * modbus协议类型(serial-rtu) - */ - private String modbusProtocol; - - /** - * modbus模式(client) - */ - private String modbusPattern; - - /** - * modbus串口号 - */ - private String portName; - - /** - * 连接参数(波特率，数据位，停止位，校验位 例如：9600，8，1，N） - */ - private String modbusConnectParam; - - /** - * 读取任务方式(0无，1有) - */ - private String readCronType; - - /** - * 读取任务时间间隔 - */ - private Integer readRepeatValue; - - /** - * 读取任务时间间隔单位 - */ - private String readRepeatUnit; - - /** - * 读取任务时间表达式 - */ - private String readCron; - - /** - * 写入任务时间间隔 - */ - private String writeCronType; - - /** - * 写入任务时间间隔 - */ - private Integer writeRepeatValue; - - /** - * 写入任务时间间隔单位 - */ - private String writeRepeatUnit; - - /** - * 写入任务时间表达式 - */ - private String writeCron; - - /** - * 是否持久化(0不持久化，1持久化) - */ - private String localPersistent; - - /** - * 上传方式(1实时，2自定义) - */ - private String uploadRate; - - /** - * 上传频率 - */ - private Integer rateCount; - - /** - * 读地址是否连续(0否，1是) - */ - private String modbusReadAddrGap; + /** + * 网关管理后台的id + */ + private String deviceConfigID; + /** + * 机台ID + */ + private String equipmentsId; + + private String deviceConfigId; + + /** + * modbus设备编号 + */ + private String deviceId; + + /** + * modbus设备名称 + */ + private String deviceName; + + /** + * modbus协议类型(serial-rtu) + */ + private String modbusProtocol; + + /** + * modbus模式(client) + */ + private String modbusPattern; + + /** + * modbus串口号 + */ + private String portName; + + /** + * 连接参数(波特率，数据位，停止位，校验位 例如：9600，8，1，N） + */ + private String modbusConnectParam; + + /** + * 读取任务方式(0无，1有) + */ + private String readCronType; + + /** + * 读取任务时间间隔 + */ + private Integer readRepeatValue; + + /** + * 读取任务时间间隔单位 + */ + private String readRepeatUnit; + + /** + * 读取任务时间表达式 + */ + private String readCron; + + /** + * 写入任务时间间隔 + */ + private String writeCronType; + + /** + * 写入任务时间间隔 + */ + private Integer writeRepeatValue; + + /** + * 写入任务时间间隔单位 + */ + private String writeRepeatUnit; + + /** + * 写入任务时间表达式 + */ + private String writeCron; + + /** + * 是否持久化(0不持久化，1持久化) + */ + private String localPersistent; + + /** + * 上传方式(1实时，2自定义) + */ + private String uploadRate; + + /** + * 上传频率 + */ + private Integer rateCount; + + /** + * 读地址是否连续(0否，1是) + */ + private String modbusReadAddrGap; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceSiemensEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceSiemensEntity.java index 69161c1a0..97cad6b93 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceSiemensEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceSiemensEntity.java @@ -9,63 +9,90 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class DeviceSiemensEntity { - /**数据库id*/ - String deviceConfigID; - /**设备编号*/ - String deviceID;//71220220500200001 - - /**设备名称*/ - String deviceName; - - /**Siemens系列*/ - String siemensSeries; - - /**连接参数*/ - String siemensConnectParam; - - /**读取任务*/ - String readCronType;//无、频率、定点 - - /**频率值*/ - Integer readRepeatValue;//正整数 - - /**读单位*/ - String readRepeatUnit;//秒、分、时、毫秒 - - /**读取任务时间表达式*/ - String readCron; - - //写入任务时间间隔 - String writeCronType; - - //写入任务时间间隔 - Integer writeRepeatValue; - - /**数据库id*/ - String writeRepeatUnit; - /** - * 写入任务时间表达式 - */ - String writeCron; - - /**是否持久化*/ - String localPersistent; - - /**上传*/ - String uploadRate; - - /**不变次数*/ - Integer rateCount; - - - - /**设备类型*/ - String deviceType; //siemens、modbus - String deviceComm; //1 - String deviceStatus;//0,notok; 1,ok - String createTime; - String updateTime; - String portName; + /** + * 数据库id + */ + String deviceConfigID; + /** + * 设备编号 + */ + String deviceID;//71220220500200001 + + /** + * 设备名称 + */ + String deviceName; + + /** + * Siemens系列 + */ + String siemensSeries; + + /** + * 连接参数 + */ + String siemensConnectParam; + + /** + * 读取任务 + */ + String readCronType;//无、频率、定点 + + /** + * 频率值 + */ + Integer readRepeatValue;//正整数 + + /** + * 读单位 + */ + String readRepeatUnit;//秒、分、时、毫秒 + + /** + * 读取任务时间表达式 + */ + String readCron; + + //写入任务时间间隔 + String writeCronType; + + //写入任务时间间隔 + Integer writeRepeatValue; + + /** + * 数据库id + */ + String writeRepeatUnit; + /** + * 写入任务时间表达式 + */ + String writeCron; + + /** + * 是否持久化 + */ + String localPersistent; + + /** + * 上传 + */ + String uploadRate; + + /** + * 不变次数 + */ + Integer rateCount; + + + /** + * 设备类型 + */ + String deviceType; //siemens、modbus + String deviceComm; //1 + String deviceStatus;//0,notok; 1,ok + String createTime; + String updateTime; + String portName; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceVideoEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceVideoEntity.java index 6ef4177f7..15c1b579f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceVideoEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceVideoEntity.java @@ -8,24 +8,24 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class DeviceVideoEntity { - /** - * 网关管理后台的id - */ - private String deviceConfigID; - /** - * 设备编号 - */ - private String deviceID; - /** - * 视频地址 - */ - private String videoAddress; - /** - * 服务地址 - */ - private String serverAddress; - /** - * 视频名称 - */ - private String deviceName; + /** + * 网关管理后台的id + */ + private String deviceConfigID; + /** + * 设备编号 + */ + private String deviceID; + /** + * 视频地址 + */ + private String videoAddress; + /** + * 服务地址 + */ + private String serverAddress; + /** + * 视频名称 + */ + private String deviceName; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/ModbusPointEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/ModbusPointEntity.java index 3484afd1e..f73880720 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/ModbusPointEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/ModbusPointEntity.java @@ -14,39 +14,39 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class ModbusPointEntity { - String deviceConfigContentID; - //站号 - //@Excel(name = "站号") - String modbusSlaveID; - //地址名称/编码(下发用) - //@Excel(name = "地址编码") - String modbusFieldName;// json_flag - //地址名称 真的名称 - //@Excel(name = "地址名称") - String modbusName;// json_flag - //寄存器地址 - //@Excel(name = "寄存器地址") - String modbusFieldAddress;// 111 - //寄存器地址类型 - //@Excel(name = "寄存器地址类型") - String modbusAddressType;// 1 - //个数 - //@Excel(name = "个数") - Integer modbusFieldSize;// 2 - //缩放因子 - //@Excel(name = "缩放因子") - String modbusFieldPrecision;// 1 - //数据类型 - //@Excel(name = "数据类型") - String modbusFieldDataType;// 1 - //字节顺序 - //@Excel(name = "字节顺序") - String modbusFieldOrder;//DCBA - //单位 - //@Excel(name = "单位") - String modbusFieldUnit;// s - //@Excel(name = "机台编码") - String equipmentCode; - //@Excel(name = "设备编码") - String deviceCode; + String deviceConfigContentID; + //站号 + //@Excel(name = "站号") + String modbusSlaveID; + //地址名称/编码(下发用) + //@Excel(name = "地址编码") + String modbusFieldName;// json_flag + //地址名称 真的名称 + //@Excel(name = "地址名称") + String modbusName;// json_flag + //寄存器地址 + //@Excel(name = "寄存器地址") + String modbusFieldAddress;// 111 + //寄存器地址类型 + //@Excel(name = "寄存器地址类型") + String modbusAddressType;// 1 + //个数 + //@Excel(name = "个数") + Integer modbusFieldSize;// 2 + //缩放因子 + //@Excel(name = "缩放因子") + String modbusFieldPrecision;// 1 + //数据类型 + //@Excel(name = "数据类型") + String modbusFieldDataType;// 1 + //字节顺序 + //@Excel(name = "字节顺序") + String modbusFieldOrder;//DCBA + //单位 + //@Excel(name = "单位") + String modbusFieldUnit;// s + //@Excel(name = "机台编码") + String equipmentCode; + //@Excel(name = "设备编码") + String deviceCode; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/MqttBrokerEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/MqttBrokerEntity.java index 894166306..ee3846c31 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/MqttBrokerEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/MqttBrokerEntity.java @@ -7,16 +7,16 @@ import lombok.Data; @AllArgsConstructor public class MqttBrokerEntity { - private String mqttAddress;//ip地址 - private String mqttPort;//端口 - private String mqttUserName;//授权账号 一定要授权的 - private String mqttPassword;//密码 - private String mqttPublishTopic;//发布主题 - private Boolean mqttSslFlag; //是否启用ssl + private String mqttAddress;//ip地址 + private String mqttPort;//端口 + private String mqttUserName;//授权账号 一定要授权的 + private String mqttPassword;//密码 + private String mqttPublishTopic;//发布主题 + private Boolean mqttSslFlag; //是否启用ssl - private String cloudConfigID; - private String cloudAddress; - private String cloudStatus; - private String createTime; - private String updateTime; + private String cloudConfigID; + private String cloudAddress; + private String cloudStatus; + private String createTime; + private String updateTime; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntity.java index 303c1a289..49743ca20 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntity.java @@ -7,16 +7,17 @@ import lombok.Data; @AllArgsConstructor public class PageEntity { - //String pageSize,String pageNum,String orderByColumn,String isAsc - String pageSize; // 10 - String pageNum; //: 1 - String orderByColumn; //: updateTime - String isAsc; //: asc -// String deviceID; //: 设备编码 - public PageEntity(){ - this.isAsc = "asc"; - this.orderByColumn = "updateTime"; - this.pageSize = "100"; - this.pageNum = "1"; - } + //String pageSize,String pageNum,String orderByColumn,String isAsc + String pageSize; // 10 + String pageNum; //: 1 + String orderByColumn; //: updateTime + String isAsc; //: asc + + // String deviceID; //: 设备编码 + public PageEntity() { + this.isAsc = "asc"; + this.orderByColumn = "updateTime"; + this.pageSize = "100"; + this.pageNum = "1"; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntityByDecice.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntityByDecice.java index 8d4b58410..e942f266f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntityByDecice.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntityByDecice.java @@ -7,16 +7,17 @@ import lombok.Data; @AllArgsConstructor public class PageEntityByDecice { - //String pageSize,String pageNum,String orderByColumn,String isAsc - String pageSize; // 10 - String pageNum; //: 1 - String orderByColumn; //: updateTime - String isAsc; //: asc - String deviceID; //: 设备编码 - public PageEntityByDecice(){ - this.isAsc = "asc"; - this.orderByColumn = "updateTime"; - this.pageSize = "100"; - this.pageNum = "1"; - } + //String pageSize,String pageNum,String orderByColumn,String isAsc + String pageSize; // 10 + String pageNum; //: 1 + String orderByColumn; //: updateTime + String isAsc; //: asc + String deviceID; //: 设备编码 + + public PageEntityByDecice() { + this.isAsc = "asc"; + this.orderByColumn = "updateTime"; + this.pageSize = "100"; + this.pageNum = "1"; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/SiemensPointEntity.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/SiemensPointEntity.java index a37ce3ac5..4ecf23d8e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/SiemensPointEntity.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/SiemensPointEntity.java @@ -12,46 +12,46 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class SiemensPointEntity { - /** - * 数据库id - */ - Integer deviceConfigContentID; - /** - * 地址编码 - */ - //@Excel(name = "地址编码") - String siemensFieldName; - /** - * 地址名称 - */ - //@Excel(name = "地址名称") - String siemensName; - /** - * 地址 - */ - //@Excel(name = "地址") - String siemensFieldAddress; - /** - * 数据类型(下发用value值) - */ - Integer siemensFieldDataType; - /** - * 数据类型名称 - */ - //@Excel(name = "数据类型名称") - String siemensFieldDataTypeName; - /** - * 数据精度 - */ - //@Excel(name = "数据精度") - Integer siemensFieldPrecision; - /** - * 数据单位 - */ - //@Excel(name = "数据单位") - String siemensFieldUnit; - //@Excel(name = "机台编码") - String equipmentCode; - //@Excel(name = "设备编码") - String deviceCode; + /** + * 数据库id + */ + Integer deviceConfigContentID; + /** + * 地址编码 + */ + //@Excel(name = "地址编码") + String siemensFieldName; + /** + * 地址名称 + */ + //@Excel(name = "地址名称") + String siemensName; + /** + * 地址 + */ + //@Excel(name = "地址") + String siemensFieldAddress; + /** + * 数据类型(下发用value值) + */ + Integer siemensFieldDataType; + /** + * 数据类型名称 + */ + //@Excel(name = "数据类型名称") + String siemensFieldDataTypeName; + /** + * 数据精度 + */ + //@Excel(name = "数据精度") + Integer siemensFieldPrecision; + /** + * 数据单位 + */ + //@Excel(name = "数据单位") + String siemensFieldUnit; + //@Excel(name = "机台编码") + String equipmentCode; + //@Excel(name = "设备编码") + String deviceCode; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/GatewayMqttService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/GatewayMqttService.java index 8b27c9d08..af1606534 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/GatewayMqttService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/GatewayMqttService.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.iot.framework.gateway.service; - import cn.iocoder.yudao.module.iot.framework.gateway.bo.ChangeStatus; import cn.iocoder.yudao.module.iot.framework.gateway.entity.MqttBrokerEntity; @@ -9,17 +8,18 @@ import java.util.List; public interface GatewayMqttService { - public void login(String url ,String username ,String password); - //获取mqtt主题 - public List getMqttBrokerEntity(String url, String username , String password); + public void login(String url, String username, String password); + + //获取mqtt主题 + public List getMqttBrokerEntity(String url, String username, String password); - //下发单个mqtt主题 - public int add(MqttBrokerEntity entity, String url); + //下发单个mqtt主题 + public int add(MqttBrokerEntity entity, String url); - //删除mqtt主题 - public int delete( String url, String ids); + //删除mqtt主题 + public int delete(String url, String ids); - //启用网关 - public int changeStatus(ChangeStatus changeStatus, String url); + //启用网关 + public int changeStatus(ChangeStatus changeStatus, String url); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IModbusPointService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IModbusPointService.java index 6f50515a9..689ed3ca1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IModbusPointService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IModbusPointService.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.iot.framework.gateway.service; - import cn.iocoder.yudao.module.iot.framework.gateway.bo.ChangeStatus; import cn.iocoder.yudao.module.iot.framework.gateway.entity.DeviceModbusEntity; import cn.iocoder.yudao.module.iot.framework.gateway.entity.ModbusPointEntity; @@ -11,38 +10,39 @@ import java.util.List; public interface IModbusPointService { - public void login(String url, String username, String password); + public void login(String url, String username, String password); + + /*modbus*/ + //获取设备列表 + public List getModbusList(String url, String username, String password); - /*modbus*/ - //获取设备列表 - public List getModbusList(String url, String username, String password); - //获取指定设备编码列表 - public List getModbusList(String url, String username, String password,String deviceId); + //获取指定设备编码列表 + public List getModbusList(String url, String username, String password, String deviceId); - //下发单个设备 - public int add(DeviceModbusEntity entity, String url); + //下发单个设备 + public int add(DeviceModbusEntity entity, String url); - public int add(List list, String url); + public int add(List list, String url); - //删除单个设备 - public int delete(String url, String ids); + //删除单个设备 + public int delete(String url, String ids); - //启用 - public int changeStatus(ChangeStatus changeStatus, String url); + //启用 + public int changeStatus(ChangeStatus changeStatus, String url); - //获取设备点位列表 - public List getPointList(String url, String username, String password, String deviceConfigID); //下发点位 + //获取设备点位列表 + public List getPointList(String url, String username, String password, String deviceConfigID); //下发点位 - //下发点位 - public int add(ModbusPointEntity point, String url, String id); + //下发点位 + public int add(ModbusPointEntity point, String url, String id); - public int add(List list, String address, String deviceConfigID); + public int add(List list, String address, String deviceConfigID); - //删除点位 - public int deletePoint(String url, String ids); + //删除点位 + public int deletePoint(String url, String ids); - Integer getPointListByCount(String url, String username, String password, String deviceConfigID); + Integer getPointListByCount(String url, String username, String password, String deviceConfigID); - List getPointListAll(String adminIp, String username, String password, String deviceConfigID); + List getPointListAll(String adminIp, String username, String password, String deviceConfigID); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/ISiemensPointService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/ISiemensPointService.java index 816c5957f..2248c5c29 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/ISiemensPointService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/ISiemensPointService.java @@ -10,43 +10,48 @@ import java.util.List; public interface ISiemensPointService { - //调用前统一登录，保存cookies - public String login(String url ,String username ,String password); - /*西门子*/ - //获取设备列表 - public List getSiemensList(String url, String username , String password); - //获取指定编码设备列表 - public List getSiemensList(String url, String username , String password,String deviceId); + //调用前统一登录，保存cookies + public String login(String url, String username, String password); - //下发单个设备 - public int add(DeviceSiemensEntity siemens,String url); - //下发单个设备 - public int add(List list,String url); - //删除单个设备 - public int delete(String url, String ids); + /*西门子*/ + //获取设备列表 + public List getSiemensList(String url, String username, String password); - //启用 - public int changeStatus(ChangeStatus changeStatus, String url); + //获取指定编码设备列表 + public List getSiemensList(String url, String username, String password, String deviceId); + //下发单个设备 + public int add(DeviceSiemensEntity siemens, String url); - //获取设备点位列表 - public List getPointList(String url, String deviceConfigID, String username , String password); + //下发单个设备 + public int add(List list, String url); - //下发点位 - public int add(SiemensPointEntity point, String url, String id); - public int add(List list, String url, String deviceConfigID); - //更改点位状态 - public int edit(SiemensPointEntity point,String url); + //删除单个设备 + public int delete(String url, String ids); - //删除点位 - public int deletePoint(String url, String ids); + //启用 + public int changeStatus(ChangeStatus changeStatus, String url); + //获取设备点位列表 + public List getPointList(String url, String deviceConfigID, String username, String password); - //启用设备 - public int changeStatusDevice(ListdeviceIds,ChangeStatus changeStatus, String url); + //下发点位 + public int add(SiemensPointEntity point, String url, String id); - Integer getPointListByCount(String url, String deviceConfigID, String username, String password); + public int add(List list, String url, String deviceConfigID); + + //更改点位状态 + public int edit(SiemensPointEntity point, String url); + + //删除点位 + public int deletePoint(String url, String ids); + + + //启用设备 + public int changeStatusDevice(List deviceIds, ChangeStatus changeStatus, String url); + + Integer getPointListByCount(String url, String deviceConfigID, String username, String password); List getPointListAll(String adminIp, String deviceConfigID, String username, String password); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IVideoService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IVideoService.java index de4fbb1d8..373f56ba6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IVideoService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IVideoService.java @@ -1,22 +1,21 @@ package cn.iocoder.yudao.module.iot.framework.gateway.service; - import cn.iocoder.yudao.module.iot.framework.gateway.entity.DeviceVideoEntity; import java.util.List; public interface IVideoService { - public void login(String url, String username, String password); + public void login(String url, String username, String password); - List getVideoId(String adminIp, String username, String password, String monitorCode); + List getVideoId(String adminIp, String username, String password, String monitorCode); - int deleteByIds(String adminIp, String ids); + int deleteByIds(String adminIp, String ids); - int add(DeviceVideoEntity list, String adminIp); + int add(DeviceVideoEntity list, String adminIp); - int openOrClose(String adminIp, String videoId); + int openOrClose(String adminIp, String videoId); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/GatewayMqttServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/GatewayMqttServiceImpl.java index 9ae15391d..23233435f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/GatewayMqttServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/GatewayMqttServiceImpl.java @@ -23,119 +23,121 @@ import java.util.List; @Service public class GatewayMqttServiceImpl implements GatewayMqttService { - private static final Logger log = LoggerFactory.getLogger(GatewayMqttServiceImpl.class); - private String cookie; - //先登录 - @Override - public void login(String url ,String username ,String password){ - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = HttpUtils.getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username,password)); - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - this.cookie = HttpUtils.getCookies(httpResponse); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - } - @Override - public List getMqttBrokerEntity(String url, String username , String password) { + private static final Logger log = LoggerFactory.getLogger(GatewayMqttServiceImpl.class); + private String cookie; - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = url + UrlConstans.mqtt_list; - HttpPost httpPost = HttpUtils.getHttpPost(getlistUrl, null);//检索条件 - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - if (httpResponse.getEntity() != null) { - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toMqttEntityList(entityStr); - } - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + //先登录 + @Override + public void login(String url, String username, String password) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = HttpUtils.getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password)); + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + this.cookie = HttpUtils.getCookies(httpResponse); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + } - @Override - public int add(MqttBrokerEntity entity, String address) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; + @Override + public List getMqttBrokerEntity(String url, String username, String password) { - try { - if (entity.getCloudConfigID() != null) { - httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_edit, HttpEntity.getParam(entity)); - } else { - httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_add, HttpEntity.getParam(entity)); - } - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println(EntityUtils.toString(httpResponse.getEntity())); - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = url + UrlConstans.mqtt_list; + HttpPost httpPost = HttpUtils.getHttpPost(getlistUrl, null);//检索条件 + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + if (httpResponse.getEntity() != null) { + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toMqttEntityList(entityStr); + } + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - @Override - public int delete( String address, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println("删除" + httpResponse.getEntity()); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(MqttBrokerEntity entity, String address) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; - @Override - public int changeStatus(ChangeStatus changeStatus, String address) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - httpPost.setHeader("Cookie", cookie); - try { - httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_changestatus, HttpEntity.getChangestatus(changeStatus)); + try { + if (entity.getCloudConfigID() != null) { + httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_edit, HttpEntity.getParam(entity)); + } else { + httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_add, HttpEntity.getParam(entity)); + } + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println(EntityUtils.toString(httpResponse.getEntity())); + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } + + @Override + public int delete(String address, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println("删除" + httpResponse.getEntity()); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (ClientProtocolException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } + + @Override + public int changeStatus(ChangeStatus changeStatus, String address) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + httpPost.setHeader("Cookie", cookie); + try { + httpPost = HttpUtils.getHttpPost(address + UrlConstans.mqtt_changestatus, HttpEntity.getChangestatus(changeStatus)); // httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println("启用" + httpResponse.getEntity()); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + httpResponse = httpClient.execute(httpPost); + System.err.println("启用" + httpResponse.getEntity()); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (ClientProtocolException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/ModbusPointServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/ModbusPointServiceImpl.java index e18d7da41..10d073a84 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/ModbusPointServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/ModbusPointServiceImpl.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.iot.framework.gateway.service.impl; - import cn.iocoder.yudao.module.iot.framework.gateway.bo.ChangeStatus; import cn.iocoder.yudao.module.iot.framework.gateway.bo.HttpEntity; import cn.iocoder.yudao.module.iot.framework.gateway.entity.DeviceModbusEntity; @@ -38,324 +37,324 @@ import static cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils.getHt */ @Service public class ModbusPointServiceImpl implements IModbusPointService { - private static final Logger log = LoggerFactory.getLogger(ModbusPointServiceImpl.class); - private String cookie; + private static final Logger log = LoggerFactory.getLogger(ModbusPointServiceImpl.class); + private String cookie; - //先登录 - @Override - public void login(String url, String username, String password) { - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password)); - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - this.cookie = HttpUtils.getCookies(httpResponse); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - } + //先登录 + @Override + public void login(String url, String username, String password) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password)); + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + this.cookie = HttpUtils.getCookies(httpResponse); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + } - /*获取西门子设备列表*/ - @Override - public List getModbusList(String address, String username, String password) { + /*获取西门子设备列表*/ + @Override + public List getModbusList(String address, String username, String password) { - PageEntity pageEntity = new PageEntity(); - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = address + UrlConstans.modbus_list; - HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParam(pageEntity));//检索条件 - login(getlistUrl, username, password); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toDeviceModbusEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + PageEntity pageEntity = new PageEntity(); + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = address + UrlConstans.modbus_list; + HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParam(pageEntity));//检索条件 + login(getlistUrl, username, password); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toDeviceModbusEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - /*获取指定设备编码Modbus设备*/ - @Override - public List getModbusList(String address, String username, String password, String deviceId) { - PageEntityByDecice pageEntity = new PageEntityByDecice(); - pageEntity.setDeviceID(deviceId); - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = address + UrlConstans.modbus_list; - HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 - login(address, username, password); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toDeviceModbusEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + /*获取指定设备编码Modbus设备*/ + @Override + public List getModbusList(String address, String username, String password, String deviceId) { + PageEntityByDecice pageEntity = new PageEntityByDecice(); + pageEntity.setDeviceID(deviceId); + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = address + UrlConstans.modbus_list; + HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 + login(address, username, password); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toDeviceModbusEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - @Override - public int add(DeviceModbusEntity deviceModbusEntity, String address) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - if (deviceModbusEntity.getDeviceConfigID() != null) { - httpPost = getHttpPost(address + UrlConstans.modbus_edit, HttpEntity.getParam(deviceModbusEntity)); - } else { - httpPost = getHttpPost(address + UrlConstans.modbus_add, HttpEntity.getParam(deviceModbusEntity)); - } - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println(EntityUtils.toString(httpResponse.getEntity())); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return 1; - } catch (ClientProtocolException e) { - e.printStackTrace(); - return 1; - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(DeviceModbusEntity deviceModbusEntity, String address) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + if (deviceModbusEntity.getDeviceConfigID() != null) { + httpPost = getHttpPost(address + UrlConstans.modbus_edit, HttpEntity.getParam(deviceModbusEntity)); + } else { + httpPost = getHttpPost(address + UrlConstans.modbus_add, HttpEntity.getParam(deviceModbusEntity)); + } + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println(EntityUtils.toString(httpResponse.getEntity())); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + return 1; + } catch (ClientProtocolException e) { + e.printStackTrace(); + return 1; + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int add(List list, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.modbus_add, null); - httpPost.setHeader("Cookie", cookie); - for (DeviceModbusEntity entity : list) { - List pairList = HttpEntity.getParam(entity); - if (pairList != null) { - List params = new ArrayList(pairList); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(List list, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.modbus_add, null); + httpPost.setHeader("Cookie", cookie); + for (DeviceModbusEntity entity : list) { + List pairList = HttpEntity.getParam(entity); + if (pairList != null) { + List params = new ArrayList(pairList); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int delete(String address, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(address + UrlConstans.siemens_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int delete(String address, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(address + UrlConstans.siemens_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int changeStatus(ChangeStatus changeStatus, String address) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(address + UrlConstans.siemens_changestatus, HttpEntity.getChangestatus(changeStatus)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println("启用" + httpResponse.getEntity()); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int changeStatus(ChangeStatus changeStatus, String address) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(address + UrlConstans.siemens_changestatus, HttpEntity.getChangestatus(changeStatus)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println("启用" + httpResponse.getEntity()); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (ClientProtocolException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public List getPointList(String address, String username, String password, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = new ArrayList<>(); - try { - /** - * TODO deviceSiemensEntity.getDeviceConfigID() - * */ - String getlistUrl = address + UrlConstans.modbus_iopoint_list + deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toModbusPointEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + @Override + public List getPointList(String address, String username, String password, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = new ArrayList<>(); + try { + /** + * TODO deviceSiemensEntity.getDeviceConfigID() + * */ + String getlistUrl = address + UrlConstans.modbus_iopoint_list + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toModbusPointEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - @Override - public int add(ModbusPointEntity point, String address, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 - httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_add_r + deviceConfigID, HttpEntity.getParam(point)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println(EntityUtils.toString(httpResponse.getEntity())); - } catch (Exception e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(ModbusPointEntity point, String address, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 + httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_add_r + deviceConfigID, HttpEntity.getParam(point)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println(EntityUtils.toString(httpResponse.getEntity())); + } catch (Exception e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int add(List list, String address, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 - httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_add_r + deviceConfigID, null); - httpPost.setHeader("Cookie", cookie); - for (ModbusPointEntity entity : list) { - List pairList = HttpEntity.getParam(entity); - if (pairList != null) { - List params = new ArrayList(pairList); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } + @Override + public int add(List list, String address, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 + httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_add_r + deviceConfigID, null); + httpPost.setHeader("Cookie", cookie); + for (ModbusPointEntity entity : list) { + List pairList = HttpEntity.getParam(entity); + if (pairList != null) { + List params = new ArrayList(pairList); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } - httpResponse = httpClient.execute(httpPost); - ////{"code":500,"msg":"缩放因子必须是有效的正小数"} - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + httpResponse = httpClient.execute(httpPost); + ////{"code":500,"msg":"缩放因子必须是有效的正小数"} + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int deletePoint(String address, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_remove, HttpEntity.getRemoveParam(ids)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int deletePoint(String address, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(address + UrlConstans.modbus_iopoint_remove, HttpEntity.getRemoveParam(ids)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public Integer getPointListByCount(String url, String username, String password, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - Integer count = 0; - try { - /** - * TODO deviceSiemensEntity.getDeviceConfigID() - * */ - String getlistUrl = url + UrlConstans.modbus_iopoint_list + deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); + @Override + public Integer getPointListByCount(String url, String username, String password, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + Integer count = 0; + try { + /** + * TODO deviceSiemensEntity.getDeviceConfigID() + * */ + String getlistUrl = url + UrlConstans.modbus_iopoint_list + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - count = Integer.parseInt(JsonUtils.toPointEntity(entityStr).getTotal()); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return count; - } + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + count = Integer.parseInt(JsonUtils.toPointEntity(entityStr).getTotal()); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return count; + } - @Override - public List getPointListAll(String address, String username, String password, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = new ArrayList<>(); - try { - /** - * TODO deviceSiemensEntity.getDeviceConfigID() - * */ - String getlistUrl = address + UrlConstans.modbus_iopoint_list + deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStrTotal = EntityUtils.toString(httpResponse.getEntity()); - String total = JsonUtils.toModbusPointEntityTotal(entityStrTotal); + @Override + public List getPointListAll(String address, String username, String password, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = new ArrayList<>(); + try { + /** + * TODO deviceSiemensEntity.getDeviceConfigID() + * */ + String getlistUrl = address + UrlConstans.modbus_iopoint_list + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + String entityStrTotal = EntityUtils.toString(httpResponse.getEntity()); + String total = JsonUtils.toModbusPointEntityTotal(entityStrTotal); - PageEntity pageEntity = new PageEntity(); - pageEntity.setPageNum("1"); - pageEntity.setPageSize(total); - List pageParam = HttpEntity.getPageParam(pageEntity); - httpPost.setEntity(new UrlEncodedFormEntity(pageParam, "UTF-8")); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toModbusPointEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + PageEntity pageEntity = new PageEntity(); + pageEntity.setPageNum("1"); + pageEntity.setPageSize(total); + List pageParam = HttpEntity.getPageParam(pageEntity); + httpPost.setEntity(new UrlEncodedFormEntity(pageParam, "UTF-8")); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toModbusPointEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/SiemensPointServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/SiemensPointServiceImpl.java index 811d1928b..2ca2f024f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/SiemensPointServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/SiemensPointServiceImpl.java @@ -37,362 +37,363 @@ import static cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils.getHt */ @Service public class SiemensPointServiceImpl implements ISiemensPointService { - private static final Logger log = LoggerFactory.getLogger(SiemensPointServiceImpl.class); - private String cookie; - //先登录 - @Override - public String login(String url ,String username ,String password){ - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username,password)); - httpResponse = httpClient.execute(httpPost); - this.cookie = HttpUtils.getCookies(httpResponse); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return cookie; - } + private static final Logger log = LoggerFactory.getLogger(SiemensPointServiceImpl.class); + private String cookie; + //先登录 + @Override + public String login(String url, String username, String password) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password)); + httpResponse = httpClient.execute(httpPost); + this.cookie = HttpUtils.getCookies(httpResponse); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return cookie; + } - public HashMap getDate(SiemensPointEntity point) { - HashMap map = new HashMap<>(); - map.put("siemensFieldName", point.getSiemensFieldName()); - map.put("siemensFieldAddress", point.getSiemensFieldAddress()); - map.put("siemensFieldDataType", point.getSiemensFieldDataType()); - map.put("siemensFieldPrecision", point.getSiemensFieldPrecision()); - map.put("siemensFieldUnit", point.getSiemensFieldUnit()); - return map; - } - /*获取西门子设备列表*/ - @Override - public List getSiemensList(String url , String username , String password) { - PageEntity pageEntity = new PageEntity(); - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = url + UrlConstans.siemens_list; - HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParam(pageEntity));//检索条件 - login(url, username, password); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - if (httpResponse.getEntity() != null) { - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toDeviceSiemensEntityList(entityStr); - } - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } - /*获取西门子设备列表*/ - @Override - public List getSiemensList(String url , String username , String password,String deviceId) { - PageEntityByDecice pageEntity = new PageEntityByDecice(); - pageEntity.setDeviceID(deviceId); - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = url + UrlConstans.siemens_list; - HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 - login(url, username, password); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - if (httpResponse.getEntity() != null) { - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toDeviceSiemensEntityList(entityStr); - } - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + public HashMap getDate(SiemensPointEntity point) { + HashMap map = new HashMap<>(); + map.put("siemensFieldName", point.getSiemensFieldName()); + map.put("siemensFieldAddress", point.getSiemensFieldAddress()); + map.put("siemensFieldDataType", point.getSiemensFieldDataType()); + map.put("siemensFieldPrecision", point.getSiemensFieldPrecision()); + map.put("siemensFieldUnit", point.getSiemensFieldUnit()); + return map; + } + /*获取西门子设备列表*/ + @Override + public List getSiemensList(String url, String username, String password) { + PageEntity pageEntity = new PageEntity(); + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = url + UrlConstans.siemens_list; + HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParam(pageEntity));//检索条件 + login(url, username, password); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + if (httpResponse.getEntity() != null) { + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toDeviceSiemensEntityList(entityStr); + } + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - @Override - public int add(DeviceSiemensEntity deviceSiemensEntity, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; + /*获取西门子设备列表*/ + @Override + public List getSiemensList(String url, String username, String password, String deviceId) { + PageEntityByDecice pageEntity = new PageEntityByDecice(); + pageEntity.setDeviceID(deviceId); + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = url + UrlConstans.siemens_list; + HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 + login(url, username, password); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + if (httpResponse.getEntity() != null) { + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toDeviceSiemensEntityList(entityStr); + } + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - try { - httpPost = getHttpPost(url + UrlConstans.siemens_add, HttpEntity.getParam(deviceSiemensEntity)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - System.err.println(EntityUtils.toString(httpResponse.getEntity())); - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } - @Override - public int add(List list, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; + @Override + public int add(DeviceSiemensEntity deviceSiemensEntity, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_add, null); - httpPost.setHeader("Cookie", cookie); - for (DeviceSiemensEntity entity: list) { - List pairList = HttpEntity.getParam(entity); - if (pairList != null) { - List params = new ArrayList(pairList); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + try { + httpPost = getHttpPost(url + UrlConstans.siemens_add, HttpEntity.getParam(deviceSiemensEntity)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + System.err.println(EntityUtils.toString(httpResponse.getEntity())); + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } + @Override + public int add(List list, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; - @Override - public int delete(String url, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + try { + httpPost = getHttpPost(url + UrlConstans.siemens_add, null); + httpPost.setHeader("Cookie", cookie); + for (DeviceSiemensEntity entity : list) { + List pairList = HttpEntity.getParam(entity); + if (pairList != null) { + List params = new ArrayList(pairList); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int changeStatus(ChangeStatus changeStatus, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_changestatus, HttpEntity.getChangestatus(changeStatus)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int delete(String url, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_remove, HttpEntity.getRemoveParam(ids));//网关上设备的id + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } + @Override + public int changeStatus(ChangeStatus changeStatus, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_changestatus, HttpEntity.getChangestatus(changeStatus)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public List getPointList(String url, String deviceConfigID,String username ,String password) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = new ArrayList<>(); - try { - String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + - deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toSiemensPointEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + @Override + public List getPointList(String url, String deviceConfigID, String username, String password) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = new ArrayList<>(); + try { + String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); - @Override - public int add(SiemensPointEntity point, String url, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_edit_r+deviceConfigID, HttpEntity.getParam(point)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (Exception e) { - e.printStackTrace(); - } - finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } - @Override - public int add(List list, String url, String deviceConfigID) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_add_r+deviceConfigID, null); - httpPost.setHeader("Cookie", cookie); - for (SiemensPointEntity entity: list) { - if(entity.getSiemensFieldDataType()==null)continue; - List pairList = HttpEntity.getParam(entity); - if (pairList != null) { - List params = new ArrayList(pairList); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } - } catch (Exception e) { - e.printStackTrace(); - } - finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toSiemensPointEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } - @Override - public int edit(SiemensPointEntity point, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_edit_r, HttpEntity.getParam(point)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(SiemensPointEntity point, String url, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_edit_r + deviceConfigID, HttpEntity.getParam(point)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (Exception e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int deletePoint( String url, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_remove_r, HttpEntity.getRemoveParam(ids)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(List list, String url, String deviceConfigID) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_add_r + deviceConfigID, null); + httpPost.setHeader("Cookie", cookie); + for (SiemensPointEntity entity : list) { + if (entity.getSiemensFieldDataType() == null) continue; + List pairList = HttpEntity.getParam(entity); + if (pairList != null) { + List params = new ArrayList(pairList); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int changeStatusDevice(ListdeviceIds,ChangeStatus changeStatus, String url) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(url + UrlConstans.siemens_changestatus, null); - httpPost.setHeader("Cookie", cookie); - for (String id: deviceIds) { - changeStatus.setChangesStatusID(id); - List pairList = HttpEntity.getChangestatus(changeStatus); - if (pairList != null) { - List params = new ArrayList(pairList); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int edit(SiemensPointEntity point, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_edit_r, HttpEntity.getParam(point)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public Integer getPointListByCount(String url, String deviceConfigID, String username, String password) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - Integer count = 0; - try { - String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + - deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - count = Integer.parseInt(JsonUtils.toPointEntity(entityStr).getTotal()); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return count; - } - @Override - public List getPointListAll(String url, String deviceConfigID,String username ,String password) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = new ArrayList<>(); - try { - String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + - deviceConfigID; - HttpPost httpPost = getHttpPost(getlistUrl, null); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); + @Override + public int deletePoint(String url, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_remove_r, HttpEntity.getRemoveParam(ids)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - String entityStrTotal = EntityUtils.toString(httpResponse.getEntity()); - String total = JsonUtils.toSiemensPointEntityTotal(entityStrTotal); + @Override + public int changeStatusDevice(List deviceIds, ChangeStatus changeStatus, String url) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(url + UrlConstans.siemens_changestatus, null); + httpPost.setHeader("Cookie", cookie); + for (String id : deviceIds) { + changeStatus.setChangesStatusID(id); + List pairList = HttpEntity.getChangestatus(changeStatus); + if (pairList != null) { + List params = new ArrayList(pairList); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - PageEntity pageEntity = new PageEntity(); - pageEntity.setPageNum("1"); - pageEntity.setPageSize(total); - List pageParam = HttpEntity.getPageParam(pageEntity); - httpPost.setEntity(new UrlEncodedFormEntity(pageParam, "UTF-8")); - httpResponse = httpClient.execute(httpPost); - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toSiemensPointEntityList(entityStr); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + @Override + public Integer getPointListByCount(String url, String deviceConfigID, String username, String password) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + Integer count = 0; + try { + String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + count = Integer.parseInt(JsonUtils.toPointEntity(entityStr).getTotal()); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return count; + } + + @Override + public List getPointListAll(String url, String deviceConfigID, String username, String password) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = new ArrayList<>(); + try { + String getlistUrl = url + UrlConstans.siemens_iopoint_list_r + + deviceConfigID; + HttpPost httpPost = getHttpPost(getlistUrl, null); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + + String entityStrTotal = EntityUtils.toString(httpResponse.getEntity()); + String total = JsonUtils.toSiemensPointEntityTotal(entityStrTotal); + + PageEntity pageEntity = new PageEntity(); + pageEntity.setPageNum("1"); + pageEntity.setPageSize(total); + List pageParam = HttpEntity.getPageParam(pageEntity); + httpPost.setEntity(new UrlEncodedFormEntity(pageParam, "UTF-8")); + httpResponse = httpClient.execute(httpPost); + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toSiemensPointEntityList(entityStr); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/TheGatewayServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/TheGatewayServiceImpl.java index ba9afaf5d..de111ebc1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/TheGatewayServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/TheGatewayServiceImpl.java @@ -17,7 +17,6 @@ import cn.iocoder.yudao.module.iot.framework.gateway.service.ISiemensPointServic import cn.iocoder.yudao.module.iot.framework.gateway.service.IVideoService; import cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils; import cn.iocoder.yudao.module.iot.framework.gateway.util.UrlConstans; -import cn.iocoder.yudao.module.iot.service.device.DeviceService; import cn.iocoder.yudao.module.iot.service.gateway.GatewayService; import com.alibaba.fastjson.JSON; import lombok.Data; @@ -26,7 +25,6 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -37,22 +35,22 @@ import java.util.List; @Service public class TheGatewayServiceImpl { - @Resource - private DeviceMapper deviceMapper; - @Resource - private DeviceAttributeMapper deviceAttributeMapper; - @Resource - private IVideoService videoService; - @Resource - private ISiemensPointService siemensPointService; - @Resource - private IModbusPointService modbusPointService; - @Resource - private GatewayMqttService gatewayMqttService; - @Resource - private GatewayService gatewayService; - - //清除原本的西门子设备和点位数据 + @Resource + private DeviceMapper deviceMapper; + @Resource + private DeviceAttributeMapper deviceAttributeMapper; + @Resource + private IVideoService videoService; + @Resource + private ISiemensPointService siemensPointService; + @Resource + private IModbusPointService modbusPointService; + @Resource + private GatewayMqttService gatewayMqttService; + @Resource + private GatewayService gatewayService; + + //清除原本的西门子设备和点位数据 // public void deleteSiemensEntity(BeEquipments equipments) { // siemensPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword()); // List list = siemensPointService.getSiemensList(equipments.getAdminIp(), @@ -79,35 +77,35 @@ public class TheGatewayServiceImpl { // } // } - //清除指定原本的西门子设备和点位数据 - public void deleteSiemensEntity(GatewayDO gatewayDO, DeviceDO deviceDO) { - - siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - List list = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); - if (null != list && list.size() > 0) { - //先清除点位数据 - String[] deviceIds = new String[list.size()]; - for (int i = 0; i < list.size(); i++) { - deviceIds[i] = list.get(i).getDeviceConfigID(); - //删除每个设备下的原有点位 - List pointList = siemensPointService.getPointListAll(gatewayDO.getAdminIp(), - list.get(i).getDeviceConfigID(), gatewayDO.getUsername(), gatewayDO.getPassword()); - if (pointList != null && pointList.size() > 0) { - String[] addressIds = new String[pointList.size()]; - for (int j = 0; j < pointList.size(); j++) { - addressIds[j] = pointList.get(j).getDeviceConfigContentID().toString(); - } - //删除点位 - siemensPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds)); - } - } - //再清除设备数据 - siemensPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds)); - } - } - - //查询西门子设备列表 并新增 + //清除指定原本的西门子设备和点位数据 + public void deleteSiemensEntity(GatewayDO gatewayDO, DeviceDO deviceDO) { + + siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + List list = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); + if (null != list && list.size() > 0) { + //先清除点位数据 + String[] deviceIds = new String[list.size()]; + for (int i = 0; i < list.size(); i++) { + deviceIds[i] = list.get(i).getDeviceConfigID(); + //删除每个设备下的原有点位 + List pointList = siemensPointService.getPointListAll(gatewayDO.getAdminIp(), + list.get(i).getDeviceConfigID(), gatewayDO.getUsername(), gatewayDO.getPassword()); + if (pointList != null && pointList.size() > 0) { + String[] addressIds = new String[pointList.size()]; + for (int j = 0; j < pointList.size(); j++) { + addressIds[j] = pointList.get(j).getDeviceConfigContentID().toString(); + } + //删除点位 + siemensPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds)); + } + } + //再清除设备数据 + siemensPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds)); + } + } + + //查询西门子设备列表 并新增 // public void addSiemensEntity(BeEquipments equipments) { // siemensPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword()); // //根据机台编号查询设备 @@ -138,57 +136,57 @@ public class TheGatewayServiceImpl { // } // } - //新增西门子设备 - public void addSiemensEntity(GatewayDO gatewayDO, DeviceDO siemens) { - siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - DeviceSiemensEntity deviceSiemensEntity = new DeviceSiemensEntity(); - deviceSiemensEntity.setDeviceID(siemens.getDeviceCode()); - deviceSiemensEntity.setDeviceName(siemens.getDeviceName()); - deviceSiemensEntity.setSiemensSeries(siemens.getSiemensSeries()); - deviceSiemensEntity.setSiemensConnectParam(siemens.getSiemensConnectParam()); - deviceSiemensEntity.setReadCronType(siemens.getReadCronType()); - deviceSiemensEntity.setReadRepeatValue(siemens.getReadRepeatValue()); - deviceSiemensEntity.setReadRepeatUnit(siemens.getReadRepeatUnit()); - deviceSiemensEntity.setReadCron(siemens.getReadCron()); - deviceSiemensEntity.setWriteCronType(siemens.getWriteCronType()); - deviceSiemensEntity.setWriteRepeatValue(siemens.getWriteRepeatValue()); - deviceSiemensEntity.setWriteCron(siemens.getWriteCron()); - deviceSiemensEntity.setLocalPersistent(siemens.getLocalPersistent()); - deviceSiemensEntity.setUploadRate(siemens.getUploadRate()); - deviceSiemensEntity.setRateCount(siemens.getRateCount()); - siemensPointService.add(deviceSiemensEntity, gatewayDO.getAdminIp()); - - } - - - //下发完成西门子设备后 下发对应设备的点位 - public void addDeviceSiemensEntity(GatewayDO gatewayDO,Long machineId, DeviceDO deviceDO) { - siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - /*下发好设备后获取设备列表找点位*/ - List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); - for (DeviceSiemensEntity deviceSiemensEntity : siemensList) { - //根据deviceId 和机台编码查询sql数据库点位信息 - List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); - List list = new ArrayList<>(); - for (DeviceAttributeDO point : points) { - Integer dataType = AddressDataType.getGatewayDataTypeMap(point.getDataType()); - //新增点位 - SiemensPointEntity siemensPointEntity = new SiemensPointEntity() - .setSiemensFieldName(point.getAttributeCode()) - .setSiemensFieldAddress(point.getAddress()) - .setSiemensFieldDataType(dataType) - .setSiemensFieldPrecision(point.getSiemensFieldPrecision()) - .setSiemensFieldUnit(point.getUnit()); - - list.add(siemensPointEntity); - } - if (list.size() > 0) - siemensPointService.add(list, gatewayDO.getAdminIp(), deviceSiemensEntity.getDeviceConfigID()); - } - } - - //清除原本的Modbus设备数据 + //新增西门子设备 + public void addSiemensEntity(GatewayDO gatewayDO, DeviceDO siemens) { + siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + DeviceSiemensEntity deviceSiemensEntity = new DeviceSiemensEntity(); + deviceSiemensEntity.setDeviceID(siemens.getDeviceCode()); + deviceSiemensEntity.setDeviceName(siemens.getDeviceName()); + deviceSiemensEntity.setSiemensSeries(siemens.getSiemensSeries()); + deviceSiemensEntity.setSiemensConnectParam(siemens.getSiemensConnectParam()); + deviceSiemensEntity.setReadCronType(siemens.getReadCronType()); + deviceSiemensEntity.setReadRepeatValue(siemens.getReadRepeatValue()); + deviceSiemensEntity.setReadRepeatUnit(siemens.getReadRepeatUnit()); + deviceSiemensEntity.setReadCron(siemens.getReadCron()); + deviceSiemensEntity.setWriteCronType(siemens.getWriteCronType()); + deviceSiemensEntity.setWriteRepeatValue(siemens.getWriteRepeatValue()); + deviceSiemensEntity.setWriteCron(siemens.getWriteCron()); + deviceSiemensEntity.setLocalPersistent(siemens.getLocalPersistent()); + deviceSiemensEntity.setUploadRate(siemens.getUploadRate()); + deviceSiemensEntity.setRateCount(siemens.getRateCount()); + siemensPointService.add(deviceSiemensEntity, gatewayDO.getAdminIp()); + + } + + + //下发完成西门子设备后 下发对应设备的点位 + public void addDeviceSiemensEntity(GatewayDO gatewayDO, Long machineId, DeviceDO deviceDO) { + siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + /*下发好设备后获取设备列表找点位*/ + List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); + for (DeviceSiemensEntity deviceSiemensEntity : siemensList) { + //根据deviceId 和机台编码查询sql数据库点位信息 + List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); + List list = new ArrayList<>(); + for (DeviceAttributeDO point : points) { + Integer dataType = AddressDataType.getGatewayDataTypeMap(point.getDataType()); + //新增点位 + SiemensPointEntity siemensPointEntity = new SiemensPointEntity() + .setSiemensFieldName(point.getAttributeCode()) + .setSiemensFieldAddress(point.getAddress()) + .setSiemensFieldDataType(dataType) + .setSiemensFieldPrecision(point.getSiemensFieldPrecision()) + .setSiemensFieldUnit(point.getUnit()); + + list.add(siemensPointEntity); + } + if (list.size() > 0) + siemensPointService.add(list, gatewayDO.getAdminIp(), deviceSiemensEntity.getDeviceConfigID()); + } + } + + //清除原本的Modbus设备数据 // public void deleteModbusEntity(BeEquipments equipments) { // modbusPointService.login(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword()); // List list = modbusPointService.getModbusList(equipments.getAdminIp(), equipments.getUsername(), equipments.getPassword()); @@ -214,282 +212,284 @@ public class TheGatewayServiceImpl { // } // } - //清除原本的Modbus设备数据 - public void deleteModbusEntity(GatewayDO gatewayDO, String deviceId) { - modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - List list = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceId); - if (null != list && list.size() > 0) { - //先清除点位数据 - String[] deviceIds = new String[list.size()]; - for (int i = 0; i < list.size(); i++) { - deviceIds[i] = list.get(i).getDeviceConfigID(); - //删除每个设备下的原有点位 - List pointList = modbusPointService.getPointListAll(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), list.get(i).getDeviceConfigID()); - if (pointList != null && pointList.size() > 0) { - String[] addressIds = new String[pointList.size()]; - for (int j = 0; j < pointList.size(); j++) { - addressIds[j] = pointList.get(j).getDeviceConfigContentID(); - } - //删除点位数据 - modbusPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds)); - } - } - //再清除设备数据 - modbusPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds)); - } - } - - public void addModbusEntity(GatewayDO gatewayDO) { - modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - List modbuses = deviceMapper.selectByGatewayId(gatewayDO.getId()); - List list = new ArrayList<>(); - if (modbuses != null && modbuses.size() > 0) { - for (DeviceDO modbus : modbuses) { - DeviceModbusEntity deviceModbusEntity = initEntity(modbus); - list.add(deviceModbusEntity); - //mob 下发失败 {"code":500,"msg":"该串口已经配置"} - } - modbusPointService.add(list, gatewayDO.getAdminIp()); - } - } - - private DeviceModbusEntity initEntity(DeviceDO modbus) { - DeviceModbusEntity deviceModbusEntity = new DeviceModbusEntity(); - deviceModbusEntity.setEquipmentsId(modbus.getOrgId().toString()); - deviceModbusEntity.setDeviceId(modbus.getDeviceCode()); - deviceModbusEntity.setDeviceName(modbus.getDeviceName()); - deviceModbusEntity.setModbusProtocol(modbus.getModbusProtocol()); - deviceModbusEntity.setModbusPattern(modbus.getModbusPattern()); - deviceModbusEntity.setPortName(modbus.getPortName()); - deviceModbusEntity.setModbusConnectParam(modbus.getModbusConnectParam()); - deviceModbusEntity.setReadCronType(modbus.getReadCronType()); - deviceModbusEntity.setReadRepeatValue(modbus.getReadRepeatValue()); - deviceModbusEntity.setReadRepeatUnit(modbus.getReadRepeatUnit()); - deviceModbusEntity.setReadCron(modbus.getReadCron()); - deviceModbusEntity.setWriteCronType(modbus.getWriteCronType()); - deviceModbusEntity.setWriteRepeatValue(modbus.getWriteRepeatValue()); - deviceModbusEntity.setWriteRepeatUnit(modbus.getWriteRepeatUnit()); - deviceModbusEntity.setWriteCron(modbus.getWriteCron()); - deviceModbusEntity.setLocalPersistent(modbus.getLocalPersistent()); - deviceModbusEntity.setUploadRate(modbus.getUploadRate()); - deviceModbusEntity.setRateCount(modbus.getRateCount()); - deviceModbusEntity.setModbusReadAddrGap(modbus.getModbusReadAddrGap()); - return deviceModbusEntity; - } - - public void addModbusEntity(GatewayDO gatewayDO, DeviceDO modbus) { - DeviceModbusEntity deviceModbusEntity = initEntity(modbus); - //mob 下发失败 {"code":500,"msg":"该串口已经配置"} - modbusPointService.add(deviceModbusEntity, gatewayDO.getAdminIp()); - } - - public void addDeviceModbusEntity(GatewayDO gatewayDO) { - modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - /*下发好设备后获取设备列表找点位*/ - List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword()); - - for (DeviceModbusEntity deviceModbusEntity : modbusPointList) { - //根据deviceId 和机台编码查询sql数据库点位信息 - List points = deviceAttributeMapper.selectByDeviceId(1L); - getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); - List list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); - //下发 - if (list.size() > 0) - modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID()); - } - } - - public void addDeviceModbusEntity(GatewayDO gatewayDO, DeviceDO deviceDO) { - modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); - /*下发好设备后获取设备列表找点位*/ - List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); - for (DeviceModbusEntity deviceModbusEntity : modbusPointList) { - //根据deviceId 和机台编码查询sql数据库点位信息 - - List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); - List list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); - if (list.size() > 0) - modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID()); - } - } - - private List getModbusPointEntityList(GatewayDO gatewayDO, - DeviceModbusEntity deviceModbusEntity, - List points) { - List list = new ArrayList<>(); - for (DeviceAttributeDO point : points) { - //新增点位 - ModbusPointEntity modbusPointEntity = new ModbusPointEntity(); - modbusPointEntity.setModbusSlaveID(point.getModbusSlaveId()); - modbusPointEntity.setModbusFieldName(point.getAttributeCode()); - modbusPointEntity.setModbusFieldAddress(point.getModbusFieldAddress()); - modbusPointEntity.setModbusAddressType(point.getModbusAddressType()); - modbusPointEntity.setModbusFieldSize(point.getModbusFieldSize()); - modbusPointEntity.setModbusFieldPrecision(point.getModbusFieldPrecision()); - modbusPointEntity.setModbusFieldDataType(point.getDataType()); - modbusPointEntity.setModbusFieldOrder(point.getModbusFieldOrder()); - modbusPointEntity.setModbusFieldUnit(point.getUnit()); - list.add(modbusPointEntity); - } - return list; - } - - /** - * 下发mqtt主题 - * 1拿到列表 - * 2停用 - * 3删除 - * 4新增 - * 5启用 - */ - public void deleteMqttEntity(GatewayDO gatewayDO) { - modbusPointService.login(gatewayDO.getAdminIp(),gatewayDO.getUsername(),gatewayDO.getPassword()); - List mqttBrokerEntity = gatewayMqttService.getMqttBrokerEntity(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword()); - for (MqttBrokerEntity brokerEntity : mqttBrokerEntity) { - gatewayMqttService.delete(gatewayDO.getAdminIp(), brokerEntity.getCloudConfigID()); - } - } - - /***启用设备 */ - public void changeStatus(GatewayDO gatewayDO, String deviceCode, String type) { - List deviceIds = new ArrayList<>(); - if (type.equals("modbus")) { - /*下发好设备后获取设备列表找点位*/ - List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode); - for (DeviceModbusEntity entity : modbusPointList) { - deviceIds.add(entity.getDeviceConfigID()); - } - } - if (type.equals("siemens")) { - /*下发好设备后获取设备列表找点位*/ - List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode); - - for (DeviceSiemensEntity entity : siemensList) { - deviceIds.add(entity.getDeviceConfigID()); - } - } - ChangeStatus changeStatus = new ChangeStatus(); - changeStatus.setNewStatus("2"); - changeStatus.setOldStatus("1"); - siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp()); - } - - /***启用设备 */ - public void changeStatus(GatewayDO gatewayDO) { - /*下发好设备后获取设备列表找点位*/ - List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword()); - /*下发好设备后获取设备列表找点位*/ - List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword()); - List deviceIds = new ArrayList<>(); - for (DeviceModbusEntity entity : modbusPointList) { - deviceIds.add(entity.getDeviceConfigID()); - } - for (DeviceSiemensEntity entity : siemensList) { - deviceIds.add(entity.getDeviceConfigID()); - } - ChangeStatus changeStatus = new ChangeStatus(); - changeStatus.setNewStatus("2"); - changeStatus.setOldStatus("1"); - siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp()); - } - - - - /*检测下发数据和实际下发数量是否匹配*/ - public CommonResult compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) { - String deviceConfigID = null; - Integer pointList = 0; - if ("modbus".equals(type)) { - List modbusList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); - if (modbusList != null && modbusList.size() > 0) { - deviceConfigID = modbusList.get(0).getDeviceConfigID(); - } - pointList = modbusPointService.getPointListByCount(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceConfigID); - } else { - List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), - gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); - if (siemensList != null && siemensList.size() > 0) { - deviceConfigID = siemensList.get(0).getDeviceConfigID(); - } - pointList = siemensPointService.getPointListByCount(gatewayDO.getAdminIp(), deviceConfigID, - gatewayDO.getUsername(), gatewayDO.getPassword()); - } - //根据deviceId 和机台编码查询sql数据库点位信息 - - List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); - int size = points.size(); - String str = "应下发" + points.size() + "个地址,实下发" + pointList + "个地址"; - return size!=pointList? CommonResult.error(500,"下发失败！"+str) - : CommonResult.success("下发成功！"+str); - } - - /**网关登录测试*/ - public CommonResult login(GatewayDO gateway){ - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = HttpUtils.getHttpPost( - gateway.getAdminIp() + UrlConstans.loginUrl, - HttpEntity.getLoginParam(gateway.getUsername(),gateway.getPassword())); - httpResponse = httpClient.execute(httpPost); - if (httpResponse.getEntity() != null) { - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - if(entityStr.contains("服务不可用") || entityStr.contains("")) - return CommonResult.success("网关服务不可用！"); - ResponseInfo info = JSON.parseObject(entityStr, ResponseInfo.class); - if(info.code==0)return CommonResult.success("网关登录测试成功！"); - } - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return CommonResult.error(500,"网关登录测试失败！"); - } - - public int openOrClose(String adminIp, String username, String password, String monitorCode) { - List videoId = videoService.getVideoId(adminIp, username, password, monitorCode); - if (videoId != null && videoId.size() > 0) { - String[] addressIds = new String[videoId.size()]; - for (int j = 0; j < videoId.size(); j++) { - addressIds[j] = videoId.get(j).getDeviceConfigID(); - } - return videoService.openOrClose(adminIp,String.join(",",addressIds)); - } - return 1; - } - - @Data - @NoArgsConstructor - public static class ResponseInfo { - int code; - String msg; - } - public void deleteVideo(String adminIp,String username,String password,String monitorCode) { - videoService.login(adminIp,username,password); - List videoId = videoService.getVideoId(adminIp, username, password, monitorCode); - if (videoId != null && videoId.size() > 0) { - String[] addressIds = new String[videoId.size()]; - for (int j = 0; j < videoId.size(); j++) { - addressIds[j] = videoId.get(j).getDeviceConfigID(); - } - videoService.deleteByIds(adminIp, String.join(",", addressIds)); - } - } + //清除原本的Modbus设备数据 + public void deleteModbusEntity(GatewayDO gatewayDO, String deviceId) { + modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + List list = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceId); + if (null != list && list.size() > 0) { + //先清除点位数据 + String[] deviceIds = new String[list.size()]; + for (int i = 0; i < list.size(); i++) { + deviceIds[i] = list.get(i).getDeviceConfigID(); + //删除每个设备下的原有点位 + List pointList = modbusPointService.getPointListAll(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), list.get(i).getDeviceConfigID()); + if (pointList != null && pointList.size() > 0) { + String[] addressIds = new String[pointList.size()]; + for (int j = 0; j < pointList.size(); j++) { + addressIds[j] = pointList.get(j).getDeviceConfigContentID(); + } + //删除点位数据 + modbusPointService.deletePoint(gatewayDO.getAdminIp(), String.join(",", addressIds)); + } + } + //再清除设备数据 + modbusPointService.delete(gatewayDO.getAdminIp(), String.join(",", deviceIds)); + } + } + + public void addModbusEntity(GatewayDO gatewayDO) { + modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + List modbuses = deviceMapper.selectByGatewayId(gatewayDO.getId()); + List list = new ArrayList<>(); + if (modbuses != null && modbuses.size() > 0) { + for (DeviceDO modbus : modbuses) { + DeviceModbusEntity deviceModbusEntity = initEntity(modbus); + list.add(deviceModbusEntity); + //mob 下发失败 {"code":500,"msg":"该串口已经配置"} + } + modbusPointService.add(list, gatewayDO.getAdminIp()); + } + } + + private DeviceModbusEntity initEntity(DeviceDO modbus) { + DeviceModbusEntity deviceModbusEntity = new DeviceModbusEntity(); + deviceModbusEntity.setEquipmentsId(modbus.getOrgId().toString()); + deviceModbusEntity.setDeviceId(modbus.getDeviceCode()); + deviceModbusEntity.setDeviceName(modbus.getDeviceName()); + deviceModbusEntity.setModbusProtocol(modbus.getModbusProtocol()); + deviceModbusEntity.setModbusPattern(modbus.getModbusPattern()); + deviceModbusEntity.setPortName(modbus.getPortName()); + deviceModbusEntity.setModbusConnectParam(modbus.getModbusConnectParam()); + deviceModbusEntity.setReadCronType(modbus.getReadCronType()); + deviceModbusEntity.setReadRepeatValue(modbus.getReadRepeatValue()); + deviceModbusEntity.setReadRepeatUnit(modbus.getReadRepeatUnit()); + deviceModbusEntity.setReadCron(modbus.getReadCron()); + deviceModbusEntity.setWriteCronType(modbus.getWriteCronType()); + deviceModbusEntity.setWriteRepeatValue(modbus.getWriteRepeatValue()); + deviceModbusEntity.setWriteRepeatUnit(modbus.getWriteRepeatUnit()); + deviceModbusEntity.setWriteCron(modbus.getWriteCron()); + deviceModbusEntity.setLocalPersistent(modbus.getLocalPersistent()); + deviceModbusEntity.setUploadRate(modbus.getUploadRate()); + deviceModbusEntity.setRateCount(modbus.getRateCount()); + deviceModbusEntity.setModbusReadAddrGap(modbus.getModbusReadAddrGap()); + return deviceModbusEntity; + } + + public void addModbusEntity(GatewayDO gatewayDO, DeviceDO modbus) { + DeviceModbusEntity deviceModbusEntity = initEntity(modbus); + //mob 下发失败 {"code":500,"msg":"该串口已经配置"} + modbusPointService.add(deviceModbusEntity, gatewayDO.getAdminIp()); + } + + public void addDeviceModbusEntity(GatewayDO gatewayDO) { + modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + /*下发好设备后获取设备列表找点位*/ + List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword()); + + for (DeviceModbusEntity deviceModbusEntity : modbusPointList) { + //根据deviceId 和机台编码查询sql数据库点位信息 + List points = deviceAttributeMapper.selectByDeviceId(1L); + getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); + List list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); + //下发 + if (list.size() > 0) + modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID()); + } + } + + public void addDeviceModbusEntity(GatewayDO gatewayDO, DeviceDO deviceDO) { + modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + /*下发好设备后获取设备列表找点位*/ + List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); + for (DeviceModbusEntity deviceModbusEntity : modbusPointList) { + //根据deviceId 和机台编码查询sql数据库点位信息 + + List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); + List list = getModbusPointEntityList(gatewayDO, deviceModbusEntity, points); + if (list.size() > 0) + modbusPointService.add(list, gatewayDO.getAdminIp(), deviceModbusEntity.getDeviceConfigID()); + } + } + + private List getModbusPointEntityList(GatewayDO gatewayDO, + DeviceModbusEntity deviceModbusEntity, + List points) { + List list = new ArrayList<>(); + for (DeviceAttributeDO point : points) { + //新增点位 + ModbusPointEntity modbusPointEntity = new ModbusPointEntity(); + modbusPointEntity.setModbusSlaveID(point.getModbusSlaveId()); + modbusPointEntity.setModbusFieldName(point.getAttributeCode()); + modbusPointEntity.setModbusFieldAddress(point.getModbusFieldAddress()); + modbusPointEntity.setModbusAddressType(point.getModbusAddressType()); + modbusPointEntity.setModbusFieldSize(point.getModbusFieldSize()); + modbusPointEntity.setModbusFieldPrecision(point.getModbusFieldPrecision()); + modbusPointEntity.setModbusFieldDataType(point.getDataType()); + modbusPointEntity.setModbusFieldOrder(point.getModbusFieldOrder()); + modbusPointEntity.setModbusFieldUnit(point.getUnit()); + list.add(modbusPointEntity); + } + return list; + } + + /** + * 下发mqtt主题 + * 1拿到列表 + * 2停用 + * 3删除 + * 4新增 + * 5启用 + */ + public void deleteMqttEntity(GatewayDO gatewayDO) { + modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword()); + List mqttBrokerEntity = gatewayMqttService.getMqttBrokerEntity(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword()); + for (MqttBrokerEntity brokerEntity : mqttBrokerEntity) { + gatewayMqttService.delete(gatewayDO.getAdminIp(), brokerEntity.getCloudConfigID()); + } + } + + /***启用设备 */ + public void changeStatus(GatewayDO gatewayDO, String deviceCode, String type) { + List deviceIds = new ArrayList<>(); + if (type.equals("modbus")) { + /*下发好设备后获取设备列表找点位*/ + List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode); + for (DeviceModbusEntity entity : modbusPointList) { + deviceIds.add(entity.getDeviceConfigID()); + } + } + if (type.equals("siemens")) { + /*下发好设备后获取设备列表找点位*/ + List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceCode); + + for (DeviceSiemensEntity entity : siemensList) { + deviceIds.add(entity.getDeviceConfigID()); + } + } + ChangeStatus changeStatus = new ChangeStatus(); + changeStatus.setNewStatus("2"); + changeStatus.setOldStatus("1"); + siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp()); + } + + /***启用设备 */ + public void changeStatus(GatewayDO gatewayDO) { + /*下发好设备后获取设备列表找点位*/ + List modbusPointList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword()); + /*下发好设备后获取设备列表找点位*/ + List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword()); + List deviceIds = new ArrayList<>(); + for (DeviceModbusEntity entity : modbusPointList) { + deviceIds.add(entity.getDeviceConfigID()); + } + for (DeviceSiemensEntity entity : siemensList) { + deviceIds.add(entity.getDeviceConfigID()); + } + ChangeStatus changeStatus = new ChangeStatus(); + changeStatus.setNewStatus("2"); + changeStatus.setOldStatus("1"); + siemensPointService.changeStatusDevice(deviceIds, changeStatus, gatewayDO.getAdminIp()); + } + + + /*检测下发数据和实际下发数量是否匹配*/ + public CommonResult compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) { + String deviceConfigID = null; + Integer pointList = 0; + if ("modbus".equals(type)) { + List modbusList = modbusPointService.getModbusList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); + if (modbusList != null && modbusList.size() > 0) { + deviceConfigID = modbusList.get(0).getDeviceConfigID(); + } + pointList = modbusPointService.getPointListByCount(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceConfigID); + } else { + List siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(), + gatewayDO.getUsername(), gatewayDO.getPassword(), deviceDO.getDeviceCode()); + if (siemensList != null && siemensList.size() > 0) { + deviceConfigID = siemensList.get(0).getDeviceConfigID(); + } + pointList = siemensPointService.getPointListByCount(gatewayDO.getAdminIp(), deviceConfigID, + gatewayDO.getUsername(), gatewayDO.getPassword()); + } + //根据deviceId 和机台编码查询sql数据库点位信息 + + List points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId()); + int size = points.size(); + String str = "应下发" + points.size() + "个地址,实下发" + pointList + "个地址"; + return size != pointList ? CommonResult.error(500, "下发失败！" + str) + : CommonResult.success("下发成功！" + str); + } + + /** + * 网关登录测试 + */ + public CommonResult login(GatewayDO gateway) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = HttpUtils.getHttpPost( + gateway.getAdminIp() + UrlConstans.loginUrl, + HttpEntity.getLoginParam(gateway.getUsername(), gateway.getPassword())); + httpResponse = httpClient.execute(httpPost); + if (httpResponse.getEntity() != null) { + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + if (entityStr.contains("服务不可用") || entityStr.contains("")) + return CommonResult.success("网关服务不可用！"); + ResponseInfo info = JSON.parseObject(entityStr, ResponseInfo.class); + if (info.code == 0) return CommonResult.success("网关登录测试成功！"); + } + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return CommonResult.error(500, "网关登录测试失败！"); + } + + public int openOrClose(String adminIp, String username, String password, String monitorCode) { + List videoId = videoService.getVideoId(adminIp, username, password, monitorCode); + if (videoId != null && videoId.size() > 0) { + String[] addressIds = new String[videoId.size()]; + for (int j = 0; j < videoId.size(); j++) { + addressIds[j] = videoId.get(j).getDeviceConfigID(); + } + return videoService.openOrClose(adminIp, String.join(",", addressIds)); + } + return 1; + } + + @Data + @NoArgsConstructor + public static class ResponseInfo { + int code; + String msg; + } + + public void deleteVideo(String adminIp, String username, String password, String monitorCode) { + videoService.login(adminIp, username, password); + List videoId = videoService.getVideoId(adminIp, username, password, monitorCode); + if (videoId != null && videoId.size() > 0) { + String[] addressIds = new String[videoId.size()]; + for (int j = 0; j < videoId.size(); j++) { + addressIds[j] = videoId.get(j).getDeviceConfigID(); + } + videoService.deleteByIds(adminIp, String.join(",", addressIds)); + } + } // public void addVideo(String adminIp,String username,String password, Monitor monitor) { // videoService.login(adminIp,username,password); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/VideoServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/VideoServiceImpl.java index bb660ffe3..e8e1fe10b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/VideoServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/VideoServiceImpl.java @@ -23,106 +23,107 @@ import static cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils.getHt @Service public class VideoServiceImpl implements IVideoService { - private static final Logger log = LoggerFactory.getLogger(VideoServiceImpl.class); - private String cookie; - //先登录 - @Override - public void login(String url ,String username ,String password){ - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username,password)); - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - this.cookie = HttpUtils.getCookies(httpResponse); - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - } + private static final Logger log = LoggerFactory.getLogger(VideoServiceImpl.class); + private String cookie; - @Override - public List getVideoId(String adminIp, String username, String password, String monitorCode) { - PageEntityByDecice pageEntity = new PageEntityByDecice(); - pageEntity.setDeviceID(monitorCode); - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - List list = null; - try { - String getlistUrl = adminIp + UrlConstans.video_list; - HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 - login(adminIp, username, password); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - if (httpResponse.getEntity() != null) { - String entityStr = EntityUtils.toString(httpResponse.getEntity()); - list = JsonUtils.toVideoEntityList(entityStr); - } - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return list; - } + //先登录 + @Override + public void login(String url, String username, String password) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password)); + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + this.cookie = HttpUtils.getCookies(httpResponse); + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + } - @Override - public int deleteByIds(String adminIp, String ids) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(adminIp + UrlConstans.video_remove, HttpEntity.getRemoveParam(ids)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public List getVideoId(String adminIp, String username, String password, String monitorCode) { + PageEntityByDecice pageEntity = new PageEntityByDecice(); + pageEntity.setDeviceID(monitorCode); + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + List list = null; + try { + String getlistUrl = adminIp + UrlConstans.video_list; + HttpPost httpPost = getHttpPost(getlistUrl, HttpEntity.getPageParamVo(pageEntity));//检索条件 + login(adminIp, username, password); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + if (httpResponse.getEntity() != null) { + String entityStr = EntityUtils.toString(httpResponse.getEntity()); + list = JsonUtils.toVideoEntityList(entityStr); + } + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return list; + } + @Override + public int deleteByIds(String adminIp, String ids) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(adminIp + UrlConstans.video_remove, HttpEntity.getRemoveParam(ids)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } - @Override - public int add(DeviceVideoEntity list, String adminIp) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - HttpPost httpPost = null; - try { - httpPost = getHttpPost(adminIp + UrlConstans.video_add, HttpEntity.getParam(list)); - httpPost.setHeader("Cookie", cookie); - // 设置 HttpPost 参数 - httpResponse = httpClient.execute(httpPost); - log.debug(EntityUtils.toString(httpResponse.getEntity())); - } catch (IOException e) { - e.printStackTrace(); - return 1; - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } - @Override - public int openOrClose(String adminIp, String videoId) { - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpPost httpPost = getHttpPost(adminIp + UrlConstans.video_push_stream, HttpEntity.getRemoveParam(videoId)); - httpPost.setHeader("Cookie", cookie); - httpResponse = httpClient.execute(httpPost); - } catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return 0; - } + @Override + public int add(DeviceVideoEntity list, String adminIp) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + HttpPost httpPost = null; + try { + httpPost = getHttpPost(adminIp + UrlConstans.video_add, HttpEntity.getParam(list)); + httpPost.setHeader("Cookie", cookie); + // 设置 HttpPost 参数 + httpResponse = httpClient.execute(httpPost); + log.debug(EntityUtils.toString(httpResponse.getEntity())); + } catch (IOException e) { + e.printStackTrace(); + return 1; + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } + + @Override + public int openOrClose(String adminIp, String videoId) { + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpPost httpPost = getHttpPost(adminIp + UrlConstans.video_push_stream, HttpEntity.getRemoveParam(videoId)); + httpPost.setHeader("Cookie", cookie); + httpResponse = httpClient.execute(httpPost); + } catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return 0; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/HttpUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/HttpUtils.java index 7e5dd05c3..93ded553d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/HttpUtils.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/HttpUtils.java @@ -36,36 +36,32 @@ import java.util.List; * * @author ruoyi */ -public class HttpUtils -{ +public class HttpUtils { private static final Logger log = LoggerFactory.getLogger(HttpUtils.class); /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL + * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ - public static String sendGet(String url, String param) - { + public static String sendGet(String url, String param) { return sendGet(url, param, "UTF-8"); } /** * 向指定 URL 发送GET方法的请求 * - * @param url 发送请求的 URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @param url 发送请求的 URL + * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @param contentType 编码类型 * @return 所代表远程资源的响应结果 */ - public static String sendGet(String url, String param, String contentType) - { + public static String sendGet(String url, String param, String contentType) { StringBuilder result = new StringBuilder(); BufferedReader in = null; - try - { + try { String urlNameString = url + "?" + param; log.info("sendGet - {}", urlNameString); URL realUrl = new URL(urlNameString); @@ -76,39 +72,24 @@ public class HttpUtils connection.connect(); in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType)); String line; - while ((line = in.readLine()) != null) - { + while ((line = in.readLine()) != null) { result.append(line); } log.info("recv - {}", result); - } - catch (ConnectException e) - { + } catch (ConnectException e) { log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { + } catch (SocketTimeoutException e) { log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { + } catch (IOException e) { log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { + } catch (Exception e) { log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e); - } - finally - { - try - { - if (in != null) - { + } finally { + try { + if (in != null) { in.close(); } - } - catch (Exception ex) - { + } catch (Exception ex) { log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); } } @@ -118,17 +99,15 @@ public class HttpUtils /** * 向指定 URL 发送POST方法的请求 * - * @param url 发送请求的 URL + * @param url 发送请求的 URL * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 * @return 所代表远程资源的响应结果 */ - public static String sendPost(String url, String param) - { + public static String sendPost(String url, String param) { PrintWriter out = null; BufferedReader in = null; StringBuilder result = new StringBuilder(); - try - { + try { String urlNameString = url; log.info("sendPost - {}", urlNameString); URL realUrl = new URL(urlNameString); @@ -145,58 +124,40 @@ public class HttpUtils out.flush(); in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8")); String line; - while ((line = in.readLine()) != null) - { + while ((line = in.readLine()) != null) { result.append(line); } log.info("recv - {}", result); - } - catch (ConnectException e) - { + } catch (ConnectException e) { log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { + } catch (SocketTimeoutException e) { log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { + } catch (IOException e) { log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { + } catch (Exception e) { log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e); - } - finally - { - try - { - if (out != null) - { + } finally { + try { + if (out != null) { out.close(); } - if (in != null) - { + if (in != null) { in.close(); } - } - catch (IOException ex) - { + } catch (IOException ex) { log.error("调用in.close Exception, url=" + url + ",param=" + param, ex); } } return result.toString(); } - public static String sendSSLPost(String url, String param) - { + public static String sendSSLPost(String url, String param) { StringBuilder result = new StringBuilder(); String urlNameString = url + "?" + param; - try - { + try { log.info("sendSSLPost - {}", urlNameString); SSLContext sc = SSLContext.getInstance("SSL"); - sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom()); + sc.init(null, new TrustManager[]{new TrustAnyTrustManager()}, new java.security.SecureRandom()); URL console = new URL(urlNameString); HttpsURLConnection conn = (HttpsURLConnection) console.openConnection(); conn.setRequestProperty("accept", "*/*"); @@ -213,173 +174,161 @@ public class HttpUtils InputStream is = conn.getInputStream(); BufferedReader br = new BufferedReader(new InputStreamReader(is)); String ret = ""; - while ((ret = br.readLine()) != null) - { - if (ret != null && !"".equals(ret.trim())) - { + while ((ret = br.readLine()) != null) { + if (ret != null && !"".equals(ret.trim())) { result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8")); } } log.info("recv - {}", result); conn.disconnect(); br.close(); - } - catch (ConnectException e) - { + } catch (ConnectException e) { log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e); - } - catch (SocketTimeoutException e) - { + } catch (SocketTimeoutException e) { log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e); - } - catch (IOException e) - { + } catch (IOException e) { log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e); - } - catch (Exception e) - { + } catch (Exception e) { log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e); } return result.toString(); } - private static class TrustAnyTrustManager implements X509TrustManager - { + private static class TrustAnyTrustManager implements X509TrustManager { @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) - { + public void checkClientTrusted(X509Certificate[] chain, String authType) { } @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) - { + public void checkServerTrusted(X509Certificate[] chain, String authType) { } @Override - public X509Certificate[] getAcceptedIssuers() - { - return new X509Certificate[] {}; + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[]{}; } } - private static class TrustAnyHostnameVerifier implements HostnameVerifier - { + private static class TrustAnyHostnameVerifier implements HostnameVerifier { @Override - public boolean verify(String hostname, SSLSession session) - { + public boolean verify(String hostname, SSLSession session) { return true; } } - public static CloseableHttpClient createSSLClientDefault() { - try { - //使用 loadTrustMaterial() 方法实现一个信任策略，信任所有证书 - SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() { - // 信任所有 - public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { - return true; - } - }).build(); - //NoopHostnameVerifier类: 作为主机名验证工具，实质上关闭了主机名验证，它接受任何 - //有效的SSL会话并匹配到目标主机。 - HostnameVerifier hostnameVerifier = NoopHostnameVerifier.INSTANCE; - SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, hostnameVerifier); - return HttpClients.custom().setSSLSocketFactory(sslsf).build(); - } catch (KeyManagementException e) { - e.printStackTrace(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } catch (KeyStoreException e) { - e.printStackTrace(); - } - return HttpClients.createDefault(); - } + public static CloseableHttpClient createSSLClientDefault() { + try { + //使用 loadTrustMaterial() 方法实现一个信任策略，信任所有证书 + SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() { + // 信任所有 + public boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException { + return true; + } + }).build(); + //NoopHostnameVerifier类: 作为主机名验证工具，实质上关闭了主机名验证，它接受任何 + //有效的SSL会话并匹配到目标主机。 + HostnameVerifier hostnameVerifier = NoopHostnameVerifier.INSTANCE; + SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, hostnameVerifier); + return HttpClients.custom().setSSLSocketFactory(sslsf).build(); + } catch (KeyManagementException e) { + e.printStackTrace(); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } catch (KeyStoreException e) { + e.printStackTrace(); + } + return HttpClients.createDefault(); - public static HttpPost getHttpPost(String url, List list) throws UnsupportedEncodingException { - // 创建 HttpPost 请求 - HttpPost httpPost = new HttpPost(url); - // 设置长连接 - httpPost.setHeader("Connection", "keep-alive"); - // 设置代理（模拟浏览器版本） - httpPost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); - httpPost.setHeader("Accept", "application/json, text/javascript, */*; q=0.01"); - httpPost.setHeader("Accept-Encoding", "gzip, deflate, br"); - httpPost.setHeader("Accept-Language", "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7"); - httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); + } - // 设置 Cookie - //httpPost.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); - // 创建 HttpPost 参数 - if (list != null) { - List params = new ArrayList(list); - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - } - return httpPost; - } - public static HttpGet getHttpGet(String url, List list) throws UnsupportedEncodingException { - // 创建 HttpGet 请求 - HttpGet httpGet = new HttpGet(url); - // 设置长连接 - httpGet.setHeader("Connection", "keep-alive"); - // 设置代理（模拟浏览器版本） - httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); - httpGet.setHeader("Accept", "application/json, text/javascript, */*; q=0.01"); - httpGet.setHeader("Accept-Encoding", "gzip, deflate, br"); - httpGet.setHeader("Accept-Language", "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7"); - httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); - // 创建 httpGet 参数 - if (list != null) { - for (BasicNameValuePair pair : list) { - // 设置 httpGet 参数 - httpGet.setHeader(pair.getName(),pair.getValue()); - } - } - return httpGet; - } - public static boolean testNetworkConnected(String url){ - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); - CloseableHttpResponse httpResponse = null; - try { - HttpGet httpGet = HttpUtils.getHttpGet(url,new ArrayList<>()); - httpResponse = httpClient.execute(httpGet); - StatusLine statusLine = httpResponse.getStatusLine(); - if(statusLine.getStatusCode() == 200)return true; - } - // 无论如何必须关闭连接 - catch (IOException e) { - e.printStackTrace(); - } finally { - HttpUtils.closeHttp(httpClient, httpResponse); - } - return false; - } - public static String getCookies(CloseableHttpResponse httpResponse) { - Header str = httpResponse.getHeaders("Set-Cookie")[0]; - return str.getValue().split(";")[0]; - } + public static HttpPost getHttpPost(String url, List list) throws UnsupportedEncodingException { + // 创建 HttpPost 请求 + HttpPost httpPost = new HttpPost(url); + // 设置长连接 + httpPost.setHeader("Connection", "keep-alive"); + // 设置代理（模拟浏览器版本） + httpPost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + httpPost.setHeader("Accept", "application/json, text/javascript, */*; q=0.01"); + httpPost.setHeader("Accept-Encoding", "gzip, deflate, br"); + httpPost.setHeader("Accept-Language", "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7"); + httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); - public static void closeHttp(CloseableHttpClient httpClient, CloseableHttpResponse httpResponse) { - try { - if (httpClient != null) { - httpClient.close(); - } - if (httpResponse != null) { - httpResponse.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } + // 设置 Cookie + //httpPost.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); + // 创建 HttpPost 参数 + if (list != null) { + List params = new ArrayList(list); + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + } + return httpPost; + } + + public static HttpGet getHttpGet(String url, List list) throws UnsupportedEncodingException { + // 创建 HttpGet 请求 + HttpGet httpGet = new HttpGet(url); + // 设置长连接 + httpGet.setHeader("Connection", "keep-alive"); + // 设置代理（模拟浏览器版本） + httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + httpGet.setHeader("Accept", "application/json, text/javascript, */*; q=0.01"); + httpGet.setHeader("Accept-Encoding", "gzip, deflate, br"); + httpGet.setHeader("Accept-Language", "zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7"); + httpGet.setHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8"); + // 创建 httpGet 参数 + if (list != null) { + for (BasicNameValuePair pair : list) { + // 设置 httpGet 参数 + httpGet.setHeader(pair.getName(), pair.getValue()); + } + } + return httpGet; + } + + public static boolean testNetworkConnected(String url) { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault(); + CloseableHttpResponse httpResponse = null; + try { + HttpGet httpGet = HttpUtils.getHttpGet(url, new ArrayList<>()); + httpResponse = httpClient.execute(httpGet); + StatusLine statusLine = httpResponse.getStatusLine(); + if (statusLine.getStatusCode() == 200) return true; + } + // 无论如何必须关闭连接 + catch (IOException e) { + e.printStackTrace(); + } finally { + HttpUtils.closeHttp(httpClient, httpResponse); + } + return false; + } - /*post操作是否成功*/ - public static Boolean isOk(CloseableHttpResponse httpResponse) { - try { - return "200".equals(EntityUtils.toString(httpResponse.getEntity())); - } catch (IOException e) { - } - return false; - } + public static String getCookies(CloseableHttpResponse httpResponse) { + Header str = httpResponse.getHeaders("Set-Cookie")[0]; + return str.getValue().split(";")[0]; + } + + public static void closeHttp(CloseableHttpClient httpClient, CloseableHttpResponse httpResponse) { + try { + if (httpClient != null) { + httpClient.close(); + } + if (httpResponse != null) { + httpResponse.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + /*post操作是否成功*/ + public static Boolean isOk(CloseableHttpResponse httpResponse) { + try { + return "200".equals(EntityUtils.toString(httpResponse.getEntity())); + } catch (IOException e) { + } + return false; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/JsonUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/JsonUtils.java index 862f3fbed..de6edf4f6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/JsonUtils.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/JsonUtils.java @@ -11,79 +11,79 @@ import java.util.List; public class JsonUtils { - public static List toSiemensPointEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, SiemensPointEntity.class)); - } - return list; - } + public static List toSiemensPointEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, SiemensPointEntity.class)); + } + return list; + } - public static String toSiemensPointEntityTotal(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - return entity.getTotal(); - } + public static String toSiemensPointEntityTotal(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + return entity.getTotal(); + } - public static List toModbusPointEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, ModbusPointEntity.class)); - } - return list; - } + public static List toModbusPointEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, ModbusPointEntity.class)); + } + return list; + } - public static String toModbusPointEntityTotal(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - return entity.getTotal(); - } + public static String toModbusPointEntityTotal(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + return entity.getTotal(); + } - public static ListEntity toPointEntity(String jsonStr) { - return JSON.parseObject(jsonStr, ListEntity.class); - } + public static ListEntity toPointEntity(String jsonStr) { + return JSON.parseObject(jsonStr, ListEntity.class); + } - public static List toDeviceSiemensEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, DeviceSiemensEntity.class)); - } - return list; - } + public static List toDeviceSiemensEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, DeviceSiemensEntity.class)); + } + return list; + } - public static List toDeviceModbusEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, DeviceModbusEntity.class)); - } - return list; - } + public static List toDeviceModbusEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, DeviceModbusEntity.class)); + } + return list; + } - public static List toMqttEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, MqttBrokerEntity.class)); - } - return list; - } + public static List toMqttEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, MqttBrokerEntity.class)); + } + return list; + } - public static List toVideoEntityList(String jsonStr) { - List list = new ArrayList<>(); - ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); - for (JSONObject json : entity.getRows()) { - String obj = json.toJSONString(); - list.add(JSON.parseObject(obj, DeviceVideoEntity.class)); - } - return list; - } + public static List toVideoEntityList(String jsonStr) { + List list = new ArrayList<>(); + ListEntity entity = JSON.parseObject(jsonStr, ListEntity.class); + for (JSONObject json : entity.getRows()) { + String obj = json.toJSONString(); + list.add(JSON.parseObject(obj, DeviceVideoEntity.class)); + } + return list; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/SslUtil.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/SslUtil.java index c6ef2fd95..0109a3c9e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/SslUtil.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/SslUtil.java @@ -6,49 +6,49 @@ import java.security.cert.X509Certificate; public class SslUtil { - private static void trustAllHttpsCertificates() throws Exception { - TrustManager[] trustAllCerts = new TrustManager[1]; - TrustManager tm = new miTM(); - trustAllCerts[0] = tm; - SSLContext sc = SSLContext.getInstance("SSL"); - sc.init(null, trustAllCerts, null); - HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); - } - - static class miTM implements TrustManager, X509TrustManager { - - @Override - public X509Certificate[] getAcceptedIssuers() { - return null; - } - - public boolean isServerTrusted(X509Certificate[] certs) { - return true; - } - - public boolean isClientTrusted(X509Certificate[] certs) { - return true; - } - - @Override - public void checkServerTrusted(X509Certificate[] certs, String authType) { - return; - } - - @Override - public void checkClientTrusted(X509Certificate[] certs, String authType) - throws CertificateException { - return; - } - } - - /** - * 忽略HTTPS请求的SSL证书，必须在openConnection之前调用 - */ - public static void ignoreSsl() throws Exception{ - HostnameVerifier hv = (urlHostName, session) -> true; - trustAllHttpsCertificates(); - HttpsURLConnection.setDefaultHostnameVerifier(hv); - } + private static void trustAllHttpsCertificates() throws Exception { + TrustManager[] trustAllCerts = new TrustManager[1]; + TrustManager tm = new miTM(); + trustAllCerts[0] = tm; + SSLContext sc = SSLContext.getInstance("SSL"); + sc.init(null, trustAllCerts, null); + HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); + } + + static class miTM implements TrustManager, X509TrustManager { + + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } + + public boolean isServerTrusted(X509Certificate[] certs) { + return true; + } + + public boolean isClientTrusted(X509Certificate[] certs) { + return true; + } + + @Override + public void checkServerTrusted(X509Certificate[] certs, String authType) { + return; + } + + @Override + public void checkClientTrusted(X509Certificate[] certs, String authType) + throws CertificateException { + return; + } + } + + /** + * 忽略HTTPS请求的SSL证书，必须在openConnection之前调用 + */ + public static void ignoreSsl() throws Exception { + HostnameVerifier hv = (urlHostName, session) -> true; + trustAllHttpsCertificates(); + HttpsURLConnection.setDefaultHostnameVerifier(hv); + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/TestApp.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/TestApp.java index 6dd4ffdb5..e582146e1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/TestApp.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/TestApp.java @@ -1,4 +1,3 @@ - package cn.iocoder.yudao.module.iot.framework.gateway.util; import cn.iocoder.yudao.module.iot.framework.gateway.bo.ListEntity; @@ -8,7 +7,6 @@ import cn.iocoder.yudao.module.iot.framework.mqtt.utils.DateUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.client.ClientProtocolException; @@ -35,150 +33,153 @@ import java.util.Map; @Service @EnableScheduling public class TestApp { - @Autowired - private ISiemensPointService iopointUploadService; - - public static void main(String[] args){ - - BigDecimal b1 = new BigDecimal("123.564"); - BigDecimal b2 = new BigDecimal("3.3"); - BigDecimal divide = b1.divide(b2, 3, RoundingMode.HALF_UP); - System.out.println(divide); - - System.out.println(DateUtils.getMillsLong());//1657075430559 1657461174420 - //get(); - - //post(); - - //test(); - } - - //@Scheduled(fixedRate = 5000) - public void testHttp(){ - //iopointUploadService.getList(); - } - private static void get() { - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpClients.createDefault(); - - // 创建 HttpGet 请求 - HttpGet httpGet = new HttpGet("https://71220220500200002.ng.xjzyun.com/"); - // 设置长连接 - httpGet.setHeader("Connection", "keep-alive"); - // 设置代理（模拟浏览器版本） - httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); - // 设置 Cookie - //httpGet.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); - - CloseableHttpResponse httpResponse = null; - try { - // 请求并获得响应结果 - httpResponse = httpClient.execute(httpGet); - HttpEntity httpEntity = httpResponse.getEntity(); - // 输出请求结果 - System.out.println(EntityUtils.toString(httpEntity)); - } catch (IOException e) { - e.printStackTrace(); - } - - // 无论如何必须关闭连接 - finally { - if (httpResponse != null) { - try { - httpResponse.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - if (httpClient != null) { - try { - httpClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - } - private static void post() { - // 创建 HttpClient 客户端 - CloseableHttpClient httpClient = HttpClients.createDefault(); - // 创建 HttpPost 请求 - HttpPost httpPost = new HttpPost("https://71220220500200002.ng.xjzyun.com/login"); - // 设置长连接 - httpPost.setHeader("Connection", "keep-alive"); - // 设置代理（模拟浏览器版本） - httpPost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); - // 设置 Cookie - //httpPost.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); - // 创建 HttpPost 参数 - List params = new ArrayList(); - params.add(new BasicNameValuePair("username", "admini")); - params.add(new BasicNameValuePair("password", "adminx@052002")); - - CloseableHttpResponse httpResponse = null; - try { - // 设置 HttpPost 参数 - httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); - httpResponse = httpClient.execute(httpPost); - HttpEntity httpEntity = httpResponse.getEntity(); - // 输出请求结果 - System.out.println(EntityUtils.toString(httpEntity)); - - for (Header str : - httpResponse.getHeaders("Set-Cookie")) { - System.out.println("name:"+str.getName()+",value:"+str.getValue()); - } - System.out.println();; - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } catch (ClientProtocolException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - // 无论如何必须关闭连接 - finally { - try { - if (httpResponse != null) { - httpResponse.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - - try { - if (httpClient != null) { - httpClient.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - - public static void test(){ - String str = "{\"code\":0,\"total\":14,\"msg\":\"\",\"rows\":[{\"deviceConfigContentID\":\"6\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.0\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统手动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"7\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.1\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统自动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"8\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.2\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统启动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"9\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.3\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统停止\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"10\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.4\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"找原点\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"11\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.5\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统复位\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"12\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.2\",\"siemensFieldDataType\":\"2\",\"siemensFieldName\":\"sys_test1\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"13\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.5\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test2\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"14\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.6\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test3\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"15\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.0\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test4\",\"siemensFieldPrecision\":\"0\"}]}"; - - Map map = JSON.parseObject(str); - - for (Object obj : map.keySet()){ - Object value = map.get(obj); - System.out.println("key为："+obj+"值为："+value); - } - String key ="rows"; - - List jsonArrays = (List) map.get(key); - - ListEntity entity = JSON.parseObject(str, ListEntity.class); - - for (JSONObject json : - entity.getRows()) { - String obj = json.toJSONString(); - SiemensPointEntity pointEntity = JSON.parseObject(obj, SiemensPointEntity.class); - System.out.println(pointEntity.toString()); - } - } + @Autowired + private ISiemensPointService iopointUploadService; + + public static void main(String[] args) { + + BigDecimal b1 = new BigDecimal("123.564"); + BigDecimal b2 = new BigDecimal("3.3"); + BigDecimal divide = b1.divide(b2, 3, RoundingMode.HALF_UP); + System.out.println(divide); + + System.out.println(DateUtils.getMillsLong());//1657075430559 1657461174420 + //get(); + + //post(); + + //test(); + } + + //@Scheduled(fixedRate = 5000) + public void testHttp() { + //iopointUploadService.getList(); + } + + private static void get() { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpClients.createDefault(); + + // 创建 HttpGet 请求 + HttpGet httpGet = new HttpGet("https://71220220500200002.ng.xjzyun.com/"); + // 设置长连接 + httpGet.setHeader("Connection", "keep-alive"); + // 设置代理（模拟浏览器版本） + httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + // 设置 Cookie + //httpGet.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); + + CloseableHttpResponse httpResponse = null; + try { + // 请求并获得响应结果 + httpResponse = httpClient.execute(httpGet); + HttpEntity httpEntity = httpResponse.getEntity(); + // 输出请求结果 + System.out.println(EntityUtils.toString(httpEntity)); + } catch (IOException e) { + e.printStackTrace(); + } + + // 无论如何必须关闭连接 + finally { + if (httpResponse != null) { + try { + httpResponse.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + if (httpClient != null) { + try { + httpClient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + private static void post() { + // 创建 HttpClient 客户端 + CloseableHttpClient httpClient = HttpClients.createDefault(); + // 创建 HttpPost 请求 + HttpPost httpPost = new HttpPost("https://71220220500200002.ng.xjzyun.com/login"); + // 设置长连接 + httpPost.setHeader("Connection", "keep-alive"); + // 设置代理（模拟浏览器版本） + httpPost.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"); + // 设置 Cookie + //httpPost.setHeader("Cookie", "UM_distinctid=16442706a09352-0376059833914f-3c604504-1fa400-16442706a0b345; CNZZDATA1262458286=1603637673-1530123020-%7C1530123020; JSESSIONID=805587506F1594AE02DC45845A7216A4"); + // 创建 HttpPost 参数 + List params = new ArrayList(); + params.add(new BasicNameValuePair("username", "admini")); + params.add(new BasicNameValuePair("password", "adminx@052002")); + + CloseableHttpResponse httpResponse = null; + try { + // 设置 HttpPost 参数 + httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8")); + httpResponse = httpClient.execute(httpPost); + HttpEntity httpEntity = httpResponse.getEntity(); + // 输出请求结果 + System.out.println(EntityUtils.toString(httpEntity)); + + for (Header str : + httpResponse.getHeaders("Set-Cookie")) { + System.out.println("name:" + str.getName() + ",value:" + str.getValue()); + } + System.out.println(); + ; + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } catch (ClientProtocolException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + // 无论如何必须关闭连接 + finally { + try { + if (httpResponse != null) { + httpResponse.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + + try { + if (httpClient != null) { + httpClient.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + + public static void test() { + String str = "{\"code\":0,\"total\":14,\"msg\":\"\",\"rows\":[{\"deviceConfigContentID\":\"6\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.0\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统手动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"7\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.1\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统自动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"8\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.2\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统启动\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"9\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.3\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统停止\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"10\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.4\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"找原点\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"11\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.5\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"系统复位\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"12\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.2\",\"siemensFieldDataType\":\"2\",\"siemensFieldName\":\"sys_test1\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"13\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.5\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test2\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"14\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.6\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test3\",\"siemensFieldPrecision\":\"0\"},{\"deviceConfigContentID\":\"15\",\"siemensFieldAccess\":\"r\",\"siemensFieldAddress\":\"I0.0\",\"siemensFieldDataType\":\"1\",\"siemensFieldName\":\"sys_test4\",\"siemensFieldPrecision\":\"0\"}]}"; + + Map map = JSON.parseObject(str); + + for (Object obj : map.keySet()) { + Object value = map.get(obj); + System.out.println("key为：" + obj + "值为：" + value); + } + String key = "rows"; + + List jsonArrays = (List) map.get(key); + + ListEntity entity = JSON.parseObject(str, ListEntity.class); + + for (JSONObject json : + entity.getRows()) { + String obj = json.toJSONString(); + SiemensPointEntity pointEntity = JSON.parseObject(obj, SiemensPointEntity.class); + System.out.println(pointEntity.toString()); + } + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/UrlConstans.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/UrlConstans.java index 31a85718a..180f2b5f9 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/UrlConstans.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/UrlConstans.java @@ -2,90 +2,90 @@ package cn.iocoder.yudao.module.iot.framework.gateway.util; public class UrlConstans { - public static final String loginUrl = "/login"; + public static final String loginUrl = "/login"; - /** - * mqtt - */ - public static final String mqtt_add = "/cloud/config/mqtt/add"; - public static final String mqtt_list = "/cloud/config/mqtt/list"; - public static final String mqtt_edit = "/cloud/config/mqtt/add"; - public static final String mqtt_remove = "/cloud/config/remove"; - public static final String mqtt_changestatus = "/cloud/config/changestatus";//启用 + /** + * mqtt + */ + public static final String mqtt_add = "/cloud/config/mqtt/add"; + public static final String mqtt_list = "/cloud/config/mqtt/list"; + public static final String mqtt_edit = "/cloud/config/mqtt/add"; + public static final String mqtt_remove = "/cloud/config/remove"; + public static final String mqtt_changestatus = "/cloud/config/changestatus";//启用 - /***/ - public static final String siemens_list = "/device/config/siemens/list"; - public static final String siemens_add = "/device/config/siemens/add"; - public static final String siemens_edit = "/device/config/siemens/add"; - public static final String siemens_remove = "/device/config/remove"; - public static final String siemens_changestatus = "/device/config/changeStatus";//启用 + /***/ + public static final String siemens_list = "/device/config/siemens/list"; + public static final String siemens_add = "/device/config/siemens/add"; + public static final String siemens_edit = "/device/config/siemens/add"; + public static final String siemens_remove = "/device/config/remove"; + public static final String siemens_changestatus = "/device/config/changeStatus";//启用 - /** - * Video - */ - public static final String video_list = "/device/config/video/list"; - public static final String video_add = "/device/config/video/add"; -// public static final String video_edit = "/device/config/video/add"; - public static final String video_remove = "/device/config/video/remove"; - //device/config/video/push/stream/399/?_=1665714825994 - public static final String video_push_stream = "/device/config/video/push/stream";//推流 + /** + * Video + */ + public static final String video_list = "/device/config/video/list"; + public static final String video_add = "/device/config/video/add"; + // public static final String video_edit = "/device/config/video/add"; + public static final String video_remove = "/device/config/video/remove"; + //device/config/video/push/stream/399/?_=1665714825994 + public static final String video_push_stream = "/device/config/video/push/stream";//推流 // public static final String Video_changestatus = "/device/config/changeStatus";//启用 - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_list_r = "/device/config/siemens/contentlist/r/"; - /** - * siemens iopoint add - */ - //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 - public static final String siemens_iopoint_add_r = "/device/config/siemens/content/add/r/0/"; - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_edit_r = "/device/config/siemens/content/add/r/"; - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_remove_r = "/device/configcontent/remove"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_list_r = "/device/config/siemens/contentlist/r/"; + /** + * siemens iopoint add + */ + //https://71220220500200002.ng.xjzyun.com/device/config/siemens/content/add/r/0/82 + public static final String siemens_iopoint_add_r = "/device/config/siemens/content/add/r/0/"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_edit_r = "/device/config/siemens/content/add/r/"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_remove_r = "/device/configcontent/remove"; - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_list_w = "/device/config/siemens/contentlist/r/"; - /** - * siemens iopoint add - */ - public static final String siemens_iopoint_add_w = "/device/config/siemens/content/add/w/0/"; - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_edit_w = "/device/config/siemens/content/add/w/"; - /** - * siemens iopoint list - */ - public static final String siemens_iopoint_remove_w = "/device/configcontent/remove"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_list_w = "/device/config/siemens/contentlist/r/"; + /** + * siemens iopoint add + */ + public static final String siemens_iopoint_add_w = "/device/config/siemens/content/add/w/0/"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_edit_w = "/device/config/siemens/content/add/w/"; + /** + * siemens iopoint list + */ + public static final String siemens_iopoint_remove_w = "/device/configcontent/remove"; - /***/ - public static final String modbus_list = "/device/config/modbus/list"; - public static final String modbus_add = "/device/config/modbus/add"; - public static final String modbus_edit = "/device/config/modbus/edit"; - public static final String modbus_remove = "/device/config/modbus/remove"; - public static final String modbus_changestatus = "/device/config/changestatus";//启用 - /** - * modbus iopoint list - */ - public static final String modbus_iopoint_list = "/device/config/modbus/contentlist/r/"; - /** - * modbus iopoint add - */ - public static final String modbus_iopoint_add_r = "/device/config/modbus/content/add/r/0/"; - /** - * modbus iopoint list - */ - public static final String modbus_iopoint_edit = "/device/config/modbus/content/add/r/"; - /** - * siemens iopoint list - */ - public static final String modbus_iopoint_remove = "/device/configcontent/remove"; + /***/ + public static final String modbus_list = "/device/config/modbus/list"; + public static final String modbus_add = "/device/config/modbus/add"; + public static final String modbus_edit = "/device/config/modbus/edit"; + public static final String modbus_remove = "/device/config/modbus/remove"; + public static final String modbus_changestatus = "/device/config/changestatus";//启用 + /** + * modbus iopoint list + */ + public static final String modbus_iopoint_list = "/device/config/modbus/contentlist/r/"; + /** + * modbus iopoint add + */ + public static final String modbus_iopoint_add_r = "/device/config/modbus/content/add/r/0/"; + /** + * modbus iopoint list + */ + public static final String modbus_iopoint_edit = "/device/config/modbus/content/add/r/"; + /** + * siemens iopoint list + */ + public static final String modbus_iopoint_remove = "/device/configcontent/remove"; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/annotation/Topic.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/annotation/Topic.java index 17cb970b8..43ab11d82 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/annotation/Topic.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/annotation/Topic.java @@ -7,6 +7,7 @@ import java.lang.annotation.*; /** * 自定义标记注解 + * * @author jie */ @Component @@ -17,24 +18,28 @@ public @interface Topic { /** * topic + * * @return */ String topic() default ""; /** * qos + * * @return */ int qos() default 0; /** * 订阅模式 + * * @return */ Pattern patten() default Pattern.NONE; /** * 共享订阅组 + * * @return */ String group() default "group1"; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MqttCallbackImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MqttCallbackImpl.java index 921345b9f..c121fbb55 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MqttCallbackImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MqttCallbackImpl.java @@ -47,7 +47,7 @@ public class MqttCallbackImpl implements MqttCallbackExtended { public void messageArrived(String topic, MqttMessage message) throws Exception { for (SubscriptTopic subscriptTopic : topicMap) { if (subscriptTopic.getPattern() != Pattern.NONE && isMatched(subscriptTopic.getTopic(), topic)) { - log.info("MqttCallbackImpl,messageArrived:topic="+topic+",message="+message); + log.info("MqttCallbackImpl,messageArrived:topic=" + topic + ",message=" + message); subscriptTopic.getMessageListener().messageArrived(topic, message); break; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgDecoder.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgDecoder.java index 8b4b032cf..814160e4a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgDecoder.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgDecoder.java @@ -9,6 +9,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; public interface MsgDecoder { /** * 下位机消息解码器 + * * @param msg * @return */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgEncoder.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgEncoder.java index 9f7bd2ac4..3f1431b5d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgEncoder.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgEncoder.java @@ -6,6 +6,7 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.common; public interface MsgEncoder { /** * 数据库消息编码为string + * * @param t * @return */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/SuperConsumer.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/SuperConsumer.java index ddff0d3f3..a6a40e807 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/SuperConsumer.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/SuperConsumer.java @@ -21,7 +21,7 @@ public abstract class SuperConsumer implements IMqttMessageListener, MsgDecod msgHandler(topic, decoder); } catch (Exception ex) { //解决业务处理错误导致断线问题 - log.error(topic+":解决业务处理错误导致断线问题"); + log.error(topic + ":解决业务处理错误导致断线问题"); log.error(ex.toString()); } }); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqConfig.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqConfig.java index 015831dca..e134ed7b6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqConfig.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqConfig.java @@ -38,8 +38,8 @@ public class DefaultEmqConfig { @Bean public MqttConnectOptions getOption(DefaultEmqProperties emqProperties) { MqttConnectOptions options = new MqttConnectOptions(); - emqProperties.setClientId("clientId"+String.valueOf(DateUtils.getMillsLong())); - log.info("------mqtt clientid ="+ emqProperties.getClientId()); + emqProperties.setClientId("clientId" + String.valueOf(DateUtils.getMillsLong())); + log.info("------mqtt clientid =" + emqProperties.getClientId()); options.setUserName(emqProperties.getUserName()); options.setPassword(emqProperties.getPassword().toCharArray()); // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录，这里设置为true表示每次连接到服务器都以新的身份连接 @@ -54,7 +54,7 @@ public class DefaultEmqConfig { } @Bean - public DefaultBizTopicSet defaultBizTopicSet(ApplicationContext applicationContext){ + public DefaultBizTopicSet defaultBizTopicSet(ApplicationContext applicationContext) { List topicMap = new ArrayList<>(); //得到所有使用@Topic注解的类 Map beansWithAnnotation = applicationContext.getBeansWithAnnotation(Topic.class); @@ -81,8 +81,8 @@ public class DefaultEmqConfig { /** * 系统默认的MQTT连接 * - * @param options MQTT连接参数选项 - * @param emqProperties MQTT连接配置 + * @param options MQTT连接参数选项 + * @param emqProperties MQTT连接配置 * @param applicationContext 系统上下文 * @return * @throws Exception 异常 @@ -90,7 +90,7 @@ public class DefaultEmqConfig { @Bean public MqttClient mqttClient(MqttConnectOptions options, DefaultEmqProperties emqProperties, DefaultBizTopicSet defaultBizTopicSet, ApplicationContext applicationContext) throws Exception { MqttClient mqttClient = new MqttClient(emqProperties.getBroker(), emqProperties.getClientId(), new MemoryPersistence()); - mqttClient.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), mqttClient, options)); + mqttClient.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), mqttClient, options)); return mqttClient; } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqProperties.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqProperties.java index 3b281966c..a80f59e1a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqProperties.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqProperties.java @@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * 配置类 + * * @author jie */ @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java index b44c97236..415a3b519 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java @@ -5,7 +5,6 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.stereotype.Component; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/IMqttservice.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/IMqttservice.java index 9d25b9fc8..9e7266d83 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/IMqttservice.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/IMqttservice.java @@ -4,18 +4,20 @@ import org.eclipse.paho.client.mqttv3.MqttException; public interface IMqttservice { - /** - *一次性定时器 - * 程序启动后去数据库找到所有需要订阅的topic 添加进client订阅 - * */ - public void subscribeMysqlTopic() throws Exception; - /** - * 需要订阅的topic 添加进client订阅 - * */ - public int subscribeTopic(String topic) throws MqttException; - /** - * 关闭订阅topic 从client中关闭topic - * */ - public int unsubscribeTopic(String topic) throws MqttException; + /** + * 一次性定时器 + * 程序启动后去数据库找到所有需要订阅的topic 添加进client订阅 + */ + public void subscribeMysqlTopic() throws Exception; + + /** + * 需要订阅的topic 添加进client订阅 + */ + public int subscribeTopic(String topic) throws MqttException; + + /** + * 关闭订阅topic 从client中关闭topic + */ + public int unsubscribeTopic(String topic) throws MqttException; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/MqttDataHandler.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/MqttDataHandler.java index c845ecf30..23f32fa6f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/MqttDataHandler.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/MqttDataHandler.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.consumer; -import cn.hutool.core.date.LocalDateTimeUtil; import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import cn.iocoder.yudao.module.iot.dal.mysql.mqttrecord.MqttRecordMapper; @@ -15,49 +14,43 @@ import cn.iocoder.yudao.module.iot.service.device.DeviceService; import cn.iocoder.yudao.module.iot.service.iotorganization.IotOrganizationService; import cn.iocoder.yudao.module.iot.service.mqttrecord.MqttRecordService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.MqttMessage; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.cache.RedisCache; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.text.ParseException; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; -import java.util.concurrent.TimeUnit; @Slf4j @Component public class MqttDataHandler extends SuperConsumer { - @Resource - private IotOrganizationService organizationService; - @Resource - private DeviceService deviceService; - @Resource - private AsyncService asyncService; + @Resource + private IotOrganizationService organizationService; + @Resource + private DeviceService deviceService; + @Resource + private AsyncService asyncService; - @Resource - private MqttRecordService mqttRecordService; - @Resource - private MqttRecordMapper mqttRecordMapper; - @Override - public String decoder(MqttMessage msg) { - return new String(msg.getPayload()); - } + @Resource + private MqttRecordService mqttRecordService; + @Resource + private MqttRecordMapper mqttRecordMapper; - @Override - protected void msgHandler(String topic, String entity) { - log.debug("msgHandler"+":topic="+topic); - log.debug("entity:"+entity); + @Override + public String decoder(MqttMessage msg) { + return new String(msg.getPayload()); + } - MqttData data = MqttDataUtils.parse(entity); - IotOrganizationDO machine = new IotOrganizationDO(); - machine.setId(1L); - if (data!=null) { - //根据设定转化 + @Override + protected void msgHandler(String topic, String entity) { + log.debug("msgHandler" + ":topic=" + topic); + log.debug("entity:" + entity); + + MqttData data = MqttDataUtils.parse(entity); + IotOrganizationDO machine = new IotOrganizationDO(); + machine.setId(1L); + if (data != null) { + //根据设定转化 // try { // String transfer = asyncService.transferBase(data,equipments.getEquipmentsId()); // if(StringUtils.isNotBlank(transfer)) @@ -66,32 +59,32 @@ public class MqttDataHandler extends SuperConsumer { // log.error("asyncService.transferBase error:"+entity); // } - save(machine, entity, data); - } - } + save(machine, entity, data); + } + } - public void save(IotOrganizationDO machine, String entity, MqttData data) { - try { - long timestamp = DateUtils.strToTimeStamp(data.getDeviceDataTime(), Constants.MQTT_timestamp_format); - //timestamp = DateUtils.getMillsLong(); - LocalDateTime date = DateUtils.strToLocalDateTime(data.getDeviceDataTime()); + public void save(IotOrganizationDO machine, String entity, MqttData data) { + try { + long timestamp = DateUtils.strToTimeStamp(data.getDeviceDataTime(), Constants.MQTT_timestamp_format); + //timestamp = DateUtils.getMillsLong(); + LocalDateTime date = DateUtils.strToLocalDateTime(data.getDeviceDataTime()); - MqttRecordDO recordDO = new MqttRecordDO(); - recordDO.setDeviceCode(data.getDeviceID()); - recordDO.setGatewayCode(data.getGatewayID()); - recordDO.setDeviceData(entity); - recordDO.setDeviceDataTime(date); - recordDO.setDeviceDataTimeLong(timestamp); - /**直接保存原始mqtt*/ - mqttRecordMapper.insert(recordDO); + MqttRecordDO recordDO = new MqttRecordDO(); + recordDO.setDeviceCode(data.getDeviceID()); + recordDO.setGatewayCode(data.getGatewayID()); + recordDO.setDeviceData(entity); + recordDO.setDeviceDataTime(date); + recordDO.setDeviceDataTimeLong(timestamp); + /**直接保存原始mqtt*/ + mqttRecordMapper.insert(recordDO); - /** - * 保存解析后的mqtt数据 - * */ - //tsMqttService.insertDataAddress(data, taskId, timestamp, equipment); - } catch (Exception e) { - log.error("-----mqttTableName:"); - e.printStackTrace(); - } - } + /** + * 保存解析后的mqtt数据 + * */ + //tsMqttService.insertDataAddress(data, taskId, timestamp, equipment); + } catch (Exception e) { + log.error("-----mqttTableName:"); + e.printStackTrace(); + } + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/AsyncService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/AsyncService.java index 374b31e6d..0ff9e2f39 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/AsyncService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/AsyncService.java @@ -1,33 +1,30 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.consumer.impl; -import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.iot.framework.mqtt.entity.MqttData; import cn.iocoder.yudao.module.iot.service.device.DeviceService; -import com.alibaba.fastjson.JSON; - import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; import javax.annotation.Resource; -import javax.script.ScriptException; -import java.util.*; -import java.util.concurrent.TimeUnit; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; @Configuration @EnableAsync @Slf4j @EnableScheduling public class AsyncService { - @Resource - private DeviceService deviceService; + @Resource + private DeviceService deviceService; - /**地址转换进制*/ - //@Async + /**地址转换进制*/ + //@Async // public String transferBase(MqttData data, String equipmentId) { // //data数据改变标记 // boolean isTransfer = false; @@ -73,78 +70,85 @@ public class AsyncService { // else // return null; // } - /**系数**/ - private String factor(String value, String factor){ - if(StringUtils.isNotBlank(factor)){ - return String.format("%.2f",Double.parseDouble(value)*Double.parseDouble(factor)); - } - return value; - } - private Map getValueMap(MqttData data){ - Map valueMap = new HashMap<>(); - for (String key: data.getDeviceData().keySet()){ - valueMap.put(key,data.getDeviceData().get(key).getV()); - } - return valueMap; - } - /** - * java 代码将给定的值value，从一个进制转换到另一个进制，进制取值可能为binary,octal,hexadecimal,decimal等 - * */ - private String transferBase(String value,String originBase, String transferBase){ - switch (transferBase){ - case "decimal":{ - switch (originBase){ - case "binary": - value = convertBase(value,2,10); - break; - case "octal": - value = convertBase(value,8,10); - break; - case "hexadecimal": - value = convertBase(value,16,10); - case "hexfloat": - value = hexToDecimal(value); - } - } - break; - default:log.debug("数据未进行转换！：(value,originBase,transferBase)("+value+","+originBase+","+transferBase+")"); - } - return value; - } - private static String hexToDecimal(String value){ - return String.valueOf(Integer.parseInt(value, 16)); - } - - - public static String convertBase(String value, int fromBase, int toBase) { - return String.valueOf(Integer.parseInt(value, fromBase)); - } - - public static void main(String[] args) { - String value = "479624"; // 要转换的值 - int fromBase = 16; // 起始进制 - int toBase = 10; // 目标进制 - - String convertedValue = convertBase(value, fromBase, toBase); - System.out.println("Converted value: " + convertedValue); - - - int intValue = Integer.parseInt(value, 16); // 将十六进制字符串解析为十进制整数 - System.out.println(intValue); - - intValue = Integer.parseInt("476c", 16); // 将十六进制字符串解析为十进制整数 - System.out.println(intValue); - - // 获取当前日期 - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.HOUR_OF_DAY, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - - Date date = calendar.getTime(); - long timestamp = date.getTime() / 1000; // 将时间戳转换为秒 - - System.out.println("当天 00:00:00 的时间戳：" + timestamp); - } + + /** + * 系数 + **/ + private String factor(String value, String factor) { + if (StringUtils.isNotBlank(factor)) { + return String.format("%.2f", Double.parseDouble(value) * Double.parseDouble(factor)); + } + return value; + } + + private Map getValueMap(MqttData data) { + Map valueMap = new HashMap<>(); + for (String key : data.getDeviceData().keySet()) { + valueMap.put(key, data.getDeviceData().get(key).getV()); + } + return valueMap; + } + + /** + * java 代码将给定的值value，从一个进制转换到另一个进制，进制取值可能为binary,octal,hexadecimal,decimal等 + */ + private String transferBase(String value, String originBase, String transferBase) { + switch (transferBase) { + case "decimal": { + switch (originBase) { + case "binary": + value = convertBase(value, 2, 10); + break; + case "octal": + value = convertBase(value, 8, 10); + break; + case "hexadecimal": + value = convertBase(value, 16, 10); + case "hexfloat": + value = hexToDecimal(value); + } + } + break; + default: + log.debug("数据未进行转换！：(value,originBase,transferBase)(" + value + "," + originBase + "," + transferBase + ")"); + } + return value; + } + + private static String hexToDecimal(String value) { + return String.valueOf(Integer.parseInt(value, 16)); + } + + + public static String convertBase(String value, int fromBase, int toBase) { + return String.valueOf(Integer.parseInt(value, fromBase)); + } + + public static void main(String[] args) { + String value = "479624"; // 要转换的值 + int fromBase = 16; // 起始进制 + int toBase = 10; // 目标进制 + + String convertedValue = convertBase(value, fromBase, toBase); + System.out.println("Converted value: " + convertedValue); + + + int intValue = Integer.parseInt(value, 16); // 将十六进制字符串解析为十进制整数 + System.out.println(intValue); + + intValue = Integer.parseInt("476c", 16); // 将十六进制字符串解析为十进制整数 + System.out.println(intValue); + + // 获取当前日期 + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + + Date date = calendar.getTime(); + long timestamp = date.getTime() / 1000; // 将时间戳转换为秒 + + System.out.println("当天 00:00:00 的时间戳：" + timestamp); + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java index 01db78cfc..52a7cb0de 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java @@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.DependsOn; @@ -30,82 +29,83 @@ import java.util.List; @Slf4j public class MqttserviceImpl implements IMqttservice, ApplicationListener { - @Resource - private GatewayService gatewayService; + @Resource + private GatewayService gatewayService; - @Resource - private MqttClient client; - @Resource - private DefaultBizTopicSet defaultBizTopicSet; - @Resource - private MqttConnectOptions options; + @Resource + private MqttClient client; + @Resource + private DefaultBizTopicSet defaultBizTopicSet; + @Resource + private MqttConnectOptions options; - @Resource - private MqttDataHandler dataHandler; + @Resource + private MqttDataHandler dataHandler; - @Override - public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { - new Thread(() -> { - subscribeMysqlTopic(); - }).start(); - } - /** - *一次性定时器 - * 程序启动后去数据库找到所有需要订阅的topic 添加进client订阅 - * */ - @Override - public void subscribeMysqlTopic(){ - if(client.isConnected()){ + @Override + public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { + new Thread(() -> { + subscribeMysqlTopic(); + }).start(); + } - List gatewayList = gatewayService.selectListByIsEnable(IsEnableConstant.IsEnableTrue); - for (GatewayDO gateway : gatewayList) { - if(StringUtils.isNotBlank(gateway.getTopic())){ - SubscriptTopic topic = new SubscriptTopic(gateway.getTopic(), - gateway.getTopic(), Pattern.QUEUE, 0, dataHandler ); - defaultBizTopicSet.getTopicMap().add(topic); - try { - client.subscribe(topic.getSubTopic(),0, dataHandler); - } catch (MqttException e) { - e.printStackTrace(); - } - } - } - client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(),client,options)); - log.info("共订阅: " + defaultBizTopicSet.getTopicMap().size() + " 个主题!"); - } - else{ - log.error("Mqtt is not connected !"); - } + /** + * 一次性定时器 + * 程序启动后去数据库找到所有需要订阅的topic 添加进client订阅 + */ + @Override + public void subscribeMysqlTopic() { + if (client.isConnected()) { - } + List gatewayList = gatewayService.selectListByIsEnable(IsEnableConstant.IsEnableTrue); + for (GatewayDO gateway : gatewayList) { + if (StringUtils.isNotBlank(gateway.getTopic())) { + SubscriptTopic topic = new SubscriptTopic(gateway.getTopic(), + gateway.getTopic(), Pattern.QUEUE, 0, dataHandler); + defaultBizTopicSet.getTopicMap().add(topic); + try { + client.subscribe(topic.getSubTopic(), 0, dataHandler); + } catch (MqttException e) { + e.printStackTrace(); + } + } + } + client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options)); + log.info("共订阅: " + defaultBizTopicSet.getTopicMap().size() + " 个主题!"); + } else { + log.error("Mqtt is not connected !"); + } - /** - * 需要订阅的topic 添加进client订阅 - * */ - @Override - public int subscribeTopic(String topic)throws MqttException{ - SubscriptTopic subscriptTopic = new SubscriptTopic(topic, topic,Pattern.QUEUE, 0, dataHandler ); - defaultBizTopicSet.getTopicMap().add(subscriptTopic); - client.subscribe(topic,0, dataHandler); - client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(),client,options)); - return 0; - } - /** - * 关闭订阅topic 从client中关闭topic - * */ - @Override - public int unsubscribeTopic(String topic)throws MqttException{ - for (int i = 0; i < defaultBizTopicSet.getTopicMap().size(); i++) { - if(topic.equals(defaultBizTopicSet.getTopicMap().get(i).getSubTopic())){ - defaultBizTopicSet.getTopicMap().remove(defaultBizTopicSet.getTopicMap().get(i)); - break; - } - } - client.unsubscribe(topic); - client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(),client,options)); - return 0; - } + } + + /** + * 需要订阅的topic 添加进client订阅 + */ + @Override + public int subscribeTopic(String topic) throws MqttException { + SubscriptTopic subscriptTopic = new SubscriptTopic(topic, topic, Pattern.QUEUE, 0, dataHandler); + defaultBizTopicSet.getTopicMap().add(subscriptTopic); + client.subscribe(topic, 0, dataHandler); + client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options)); + return 0; + } + + /** + * 关闭订阅topic 从client中关闭topic + */ + @Override + public int unsubscribeTopic(String topic) throws MqttException { + for (int i = 0; i < defaultBizTopicSet.getTopicMap().size(); i++) { + if (topic.equals(defaultBizTopicSet.getTopicMap().get(i).getSubTopic())) { + defaultBizTopicSet.getTopicMap().remove(defaultBizTopicSet.getTopicMap().get(i)); + break; + } + } + client.unsubscribe(topic); + client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options)); + return 0; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Connect.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Connect.java index 7eaa327d6..a9a994f9e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Connect.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Connect.java @@ -9,6 +9,7 @@ import lombok.ToString; *

设备上线 * 邮箱:275236367@qq.com * 创建时间: 2020/1/4 + * * @author jie */ @Data @@ -29,7 +30,7 @@ public class Connect { */ private String ipaddress; /** - *连接回执 + * 连接回执 */ private int connack; /** @@ -49,7 +50,7 @@ public class Connect { */ private boolean clean_start; /** - *保持连接 + * 保持连接 */ private int keepalive; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Disconnect.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Disconnect.java index 1165a2906..918a28ada 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Disconnect.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Disconnect.java @@ -7,6 +7,7 @@ import lombok.ToString; /** *

设备下线 + * * @author jie */ @Data diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/IoData.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/IoData.java index 9eeee356c..c683189d5 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/IoData.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/IoData.java @@ -8,6 +8,6 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor public class IoData { - String u; - String v; + String u; + String v; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/MqttData.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/MqttData.java index fd6ca7345..3ff172cd2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/MqttData.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/MqttData.java @@ -12,8 +12,8 @@ import java.util.Map; @NoArgsConstructor public class MqttData { protected String deviceID; - protected String gatewayID; - protected Map deviceData; - protected String deviceDataTime; + protected String gatewayID; + protected Map deviceData; + protected String deviceDataTime; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Pattern.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Pattern.java index 51302e5df..ed385bed6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Pattern.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Pattern.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.entity; /** * 订阅模式 + * * @author jie */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/ApplicationContextUtil.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/ApplicationContextUtil.java index ee245b02d..02f99d739 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/ApplicationContextUtil.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/ApplicationContextUtil.java @@ -27,6 +27,7 @@ public class ApplicationContextUtil { /** * 根据字节码获取bean + * * @param clazz * @param * @return @@ -37,6 +38,7 @@ public class ApplicationContextUtil { /** * 根据名字获取bean + * * @param name * @param * @return diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/DateUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/DateUtils.java index 1981d0fd5..ef1ed0ee0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/DateUtils.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/DateUtils.java @@ -11,294 +11,280 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -public class DateUtils extends org.apache.commons.lang3.time.DateUtils{ - /** - * 将本地时间, 转换成目标时区的时间 - * @param sourceDate - * @return - */ - public static Date convertTimezone(Date sourceDate, String targetZoneId){ - return convertTimezone(sourceDate, TimeZone.getTimeZone(targetZoneId)); - } - - public static Date convertTimezone(Date sourceDate, String sourceZoneId, String targetZoneId){ - TimeZone sourceTimeZone=TimeZone.getTimeZone(sourceZoneId); - TimeZone targetTimeZone=TimeZone.getTimeZone(targetZoneId); - - return convertTimezone(sourceDate, sourceTimeZone, targetTimeZone); - } - - /** - * 将本地时间,转换成对应时区的时间 - * @param localDate - * @param targetTimezone 转换成目标时区所在的时间 - * @return - */ - public static Date convertTimezone(Date localDate, TimeZone targetTimezone){ - return convertTimezone(localDate, TimeZone.getDefault(), targetTimezone); - } - - - /** - * 将sourceDate转换成指定时区的时间 - * @param sourceDate - * @param sourceTimezone sourceDate所在的时区 - * @param targetTimezone 转化成目标时间所在的时区 - * @return - */ - public static Date convertTimezone(Date sourceDate, TimeZone sourceTimezone, TimeZone targetTimezone){ - - - // targetDate - sourceDate=targetTimezone-sourceTimezone - // ---> - // targetDate=sourceDate + (targetTimezone-sourceTimezone) - - - Calendar calendar=Calendar.getInstance(); - // date.getTime() 为时间戳, 为格林尼治到系统现在的时间差,世界各个地方获取的时间戳是一样的, - // 格式化输出时,因为设置了不同的时区,所以输出不一样 - long sourceTime=sourceDate.getTime(); - - - calendar.setTimeZone(sourceTimezone); - calendar.setTimeInMillis(sourceTime);// 设置之后,calendar会计算各种filed对应的值,并保存 - - //获取源时区的到UTC的时区差 - int sourceZoneOffset=calendar.get(Calendar.ZONE_OFFSET); - - - calendar.setTimeZone(targetTimezone); - calendar.setTimeInMillis(sourceTime); - - int targetZoneOffset=calendar.get(Calendar.ZONE_OFFSET); - int targetDaylightOffset=calendar.get(Calendar.DST_OFFSET); // 夏令时 - - - long targetTime=sourceTime+ (targetZoneOffset+targetDaylightOffset) -sourceZoneOffset; - - return new Date(targetTime); - - } - - public static String addDateMinut(String day, int hour){ - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = null; - try { - date = format.parse(day); - } catch (Exception ex) { - ex.printStackTrace(); - } - if (date == null) - return ""; - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.HOUR, -hour);// 24小时制 - date = cal.getTime(); - cal = null; - return format.format(date); - } - - public static String addDateDay(String time, int day){ - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = null; - try { - date = format.parse(time); - } catch (Exception ex) { - ex.printStackTrace(); - } - if (date == null) - return ""; - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.DAY_OF_MONTH, -day);// 日 - date = cal.getTime(); - cal = null; - return format.format(date); - } - - - public static String addDateMonth(String day, int hour){ - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = null; - try { - date = format.parse(day); - } catch (Exception ex) { - ex.printStackTrace(); - } - if (date == null) - return ""; - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.add(Calendar.MONTH, hour);// 月 - date = cal.getTime(); - cal = null; - return format.format(date); - } - public static String YYYY = "yyyy"; - - public static String YYYY_MM = "yyyy-MM"; - - public static String YYYY_MM_DD = "yyyy-MM-dd"; - - public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; - - public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - public static String YYYY_MM_DD_HH_MM_SS_SSS = "yyyy-MM-dd HH:mm:ss.SSS"; - private static String[] parsePatterns = { - "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", - "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", - "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; - - /** - * 获取当前Date型日期 - * - * @return Date() 当前日期 - */ - public static Date getNowDate() - { - return new Date(); - } - - /** - * 获取当前日期, 默认格式为yyyy-MM-dd - * - * @return String - */ - public static String getDate() - { - return dateTimeNow(YYYY_MM_DD); - } - public static String getMills() - { - return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS); - } - public static String getMills(Date date) - { - return parseDateToStr(YYYY_MM_DD_HH_MM_SS_SSS, date); - } - public static Long getMillsLong() - { - return new Date().getTime(); - } - public static Long getMillsLong(Date date) - { - return date.getTime(); - } - public static final String getTime() - { - return dateTimeNow(YYYY_MM_DD_HH_MM_SS); - } - - public static final String dateTimeNow() - { - return dateTimeNow(YYYYMMDDHHMMSS); - } - - public static final String dateTimeNow(final String format) - { - return parseDateToStr(format, new Date()); - } - - public static final String dateTime(final Date date) - { - return parseDateToStr(YYYY_MM_DD, date); - } - - public static final String parseDateToStr(final String format, final Date date) - { - return new SimpleDateFormat(format).format(date); - } - - public static final Date dateTime(final String format, final String ts) - { - try - { - return new SimpleDateFormat(format).parse(ts); - } - catch (ParseException e) - { - throw new RuntimeException(e); - } - } - - /** - * 日期路径 即年/月/日 如2018/08/08 - */ - public static final String datePath() - { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyy/MM/dd"); - } - - /** - * 日期路径 即年/月/日 如20180808 - */ - public static final String dateTime() - { - Date now = new Date(); - return DateFormatUtils.format(now, "yyyyMMdd"); - } - - /** - * 日期型字符串转化为日期 格式 - */ - public static Date parseDate(Object str) - { - if (str == null) - { - return null; - } - try - { - return parseDate(str.toString(), parsePatterns); - } - catch (ParseException e) - { - return null; - } - } - - /** - * 获取服务器启动时间 - */ - public static Date getServerStartDate() - { - long time = ManagementFactory.getRuntimeMXBean().getStartTime(); - return new Date(time); - } - - /** - * 计算两个时间差 - */ - public static String getDatePoor(Date endDate, Date nowDate) - { - long nd = 1000 * 24 * 60 * 60; - long nh = 1000 * 60 * 60; - long nm = 1000 * 60; - // long ns = 1000; - // 获得两个时间的毫秒时间差异 - long diff = endDate.getTime() - nowDate.getTime(); - // 计算差多少天 - long day = diff / nd; - // 计算差多少小时 - long hour = diff % nd / nh; - // 计算差多少分钟 - long min = diff % nd % nh / nm; - // 计算差多少秒//输出结果 - // long sec = diff % nd % nh % nm / ns; - return day + "天" + hour + "小时" + min + "分钟"; - } - - public static Long strToTimeStamp(String dateTime,String format) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); - return simpleDateFormat.parse(dateTime).getTime(); - } - public static LocalDateTime strToLocalDateTime(String dateTimeString) throws ParseException { - // 定义日期时间格式 - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); - // 使用DateTimeFormatter解析字符串为LocalDateTime - LocalDateTime dateTime = LocalDateTime.parse(dateTimeString, formatter); - return dateTime; - } +public class DateUtils extends org.apache.commons.lang3.time.DateUtils { + /** + * 将本地时间, 转换成目标时区的时间 + * + * @param sourceDate + * @return + */ + public static Date convertTimezone(Date sourceDate, String targetZoneId) { + return convertTimezone(sourceDate, TimeZone.getTimeZone(targetZoneId)); + } + + public static Date convertTimezone(Date sourceDate, String sourceZoneId, String targetZoneId) { + TimeZone sourceTimeZone = TimeZone.getTimeZone(sourceZoneId); + TimeZone targetTimeZone = TimeZone.getTimeZone(targetZoneId); + + return convertTimezone(sourceDate, sourceTimeZone, targetTimeZone); + } + + /** + * 将本地时间,转换成对应时区的时间 + * + * @param localDate + * @param targetTimezone 转换成目标时区所在的时间 + * @return + */ + public static Date convertTimezone(Date localDate, TimeZone targetTimezone) { + return convertTimezone(localDate, TimeZone.getDefault(), targetTimezone); + } + + + /** + * 将sourceDate转换成指定时区的时间 + * + * @param sourceDate + * @param sourceTimezone sourceDate所在的时区 + * @param targetTimezone 转化成目标时间所在的时区 + * @return + */ + public static Date convertTimezone(Date sourceDate, TimeZone sourceTimezone, TimeZone targetTimezone) { + + + // targetDate - sourceDate=targetTimezone-sourceTimezone + // ---> + // targetDate=sourceDate + (targetTimezone-sourceTimezone) + + + Calendar calendar = Calendar.getInstance(); + // date.getTime() 为时间戳, 为格林尼治到系统现在的时间差,世界各个地方获取的时间戳是一样的, + // 格式化输出时,因为设置了不同的时区,所以输出不一样 + long sourceTime = sourceDate.getTime(); + + + calendar.setTimeZone(sourceTimezone); + calendar.setTimeInMillis(sourceTime);// 设置之后,calendar会计算各种filed对应的值,并保存 + + //获取源时区的到UTC的时区差 + int sourceZoneOffset = calendar.get(Calendar.ZONE_OFFSET); + + + calendar.setTimeZone(targetTimezone); + calendar.setTimeInMillis(sourceTime); + + int targetZoneOffset = calendar.get(Calendar.ZONE_OFFSET); + int targetDaylightOffset = calendar.get(Calendar.DST_OFFSET); // 夏令时 + + + long targetTime = sourceTime + (targetZoneOffset + targetDaylightOffset) - sourceZoneOffset; + + return new Date(targetTime); + + } + + public static String addDateMinut(String day, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = null; + try { + date = format.parse(day); + } catch (Exception ex) { + ex.printStackTrace(); + } + if (date == null) + return ""; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, -hour);// 24小时制 + date = cal.getTime(); + cal = null; + return format.format(date); + } + + public static String addDateDay(String time, int day) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = null; + try { + date = format.parse(time); + } catch (Exception ex) { + ex.printStackTrace(); + } + if (date == null) + return ""; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.DAY_OF_MONTH, -day);// 日 + date = cal.getTime(); + cal = null; + return format.format(date); + } + + + public static String addDateMonth(String day, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = null; + try { + date = format.parse(day); + } catch (Exception ex) { + ex.printStackTrace(); + } + if (date == null) + return ""; + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.MONTH, hour);// 月 + date = cal.getTime(); + cal = null; + return format.format(date); + } + + public static String YYYY = "yyyy"; + + public static String YYYY_MM = "yyyy-MM"; + + public static String YYYY_MM_DD = "yyyy-MM-dd"; + + public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + + public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + public static String YYYY_MM_DD_HH_MM_SS_SSS = "yyyy-MM-dd HH:mm:ss.SSS"; + private static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; + + /** + * 获取当前Date型日期 + * + * @return Date() 当前日期 + */ + public static Date getNowDate() { + return new Date(); + } + + /** + * 获取当前日期, 默认格式为yyyy-MM-dd + * + * @return String + */ + public static String getDate() { + return dateTimeNow(YYYY_MM_DD); + } + + public static String getMills() { + return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS); + } + + public static String getMills(Date date) { + return parseDateToStr(YYYY_MM_DD_HH_MM_SS_SSS, date); + } + + public static Long getMillsLong() { + return new Date().getTime(); + } + + public static Long getMillsLong(Date date) { + return date.getTime(); + } + + public static final String getTime() { + return dateTimeNow(YYYY_MM_DD_HH_MM_SS); + } + + public static final String dateTimeNow() { + return dateTimeNow(YYYYMMDDHHMMSS); + } + + public static final String dateTimeNow(final String format) { + return parseDateToStr(format, new Date()); + } + + public static final String dateTime(final Date date) { + return parseDateToStr(YYYY_MM_DD, date); + } + + public static final String parseDateToStr(final String format, final Date date) { + return new SimpleDateFormat(format).format(date); + } + + public static final Date dateTime(final String format, final String ts) { + try { + return new SimpleDateFormat(format).parse(ts); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * 日期路径 即年/月/日 如2018/08/08 + */ + public static final String datePath() { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyy/MM/dd"); + } + + /** + * 日期路径 即年/月/日 如20180808 + */ + public static final String dateTime() { + Date now = new Date(); + return DateFormatUtils.format(now, "yyyyMMdd"); + } + + /** + * 日期型字符串转化为日期 格式 + */ + public static Date parseDate(Object str) { + if (str == null) { + return null; + } + try { + return parseDate(str.toString(), parsePatterns); + } catch (ParseException e) { + return null; + } + } + + /** + * 获取服务器启动时间 + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + /** + * 计算两个时间差 + */ + public static String getDatePoor(Date endDate, Date nowDate) { + long nd = 1000 * 24 * 60 * 60; + long nh = 1000 * 60 * 60; + long nm = 1000 * 60; + // long ns = 1000; + // 获得两个时间的毫秒时间差异 + long diff = endDate.getTime() - nowDate.getTime(); + // 计算差多少天 + long day = diff / nd; + // 计算差多少小时 + long hour = diff % nd / nh; + // 计算差多少分钟 + long min = diff % nd % nh / nm; + // 计算差多少秒//输出结果 + // long sec = diff % nd % nh % nm / ns; + return day + "天" + hour + "小时" + min + "分钟"; + } + + public static Long strToTimeStamp(String dateTime, String format) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format); + return simpleDateFormat.parse(dateTime).getTime(); + } + + public static LocalDateTime strToLocalDateTime(String dateTimeString) throws ParseException { + // 定义日期时间格式 + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); + // 使用DateTimeFormatter解析字符串为LocalDateTime + LocalDateTime dateTime = LocalDateTime.parse(dateTimeString, formatter); + return dateTime; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/MqttDataUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/MqttDataUtils.java index d17d20a36..1113a0834 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/MqttDataUtils.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/MqttDataUtils.java @@ -3,19 +3,18 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.utils; import cn.iocoder.yudao.module.iot.framework.mqtt.entity.MqttData; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; @Slf4j public class MqttDataUtils { - public static MqttData parse(String entity){ - try { - MqttData data = JSON.parseObject(entity, MqttData.class); - return data; - }catch (Exception e){ - e.printStackTrace(); - log.error("MqttDataHandler.JSON.parseObject error:"); - } - return null; - } + public static MqttData parse(String entity) { + try { + MqttData data = JSON.parseObject(entity, MqttData.class); + return data; + } catch (Exception e) { + e.printStackTrace(); + log.error("MqttDataHandler.JSON.parseObject error:"); + } + return null; + } } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/PubMessageUtils.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/PubMessageUtils.java index 955677760..a07874c56 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/PubMessageUtils.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/PubMessageUtils.java @@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets; /** * 发布消息工具类 * 注意，直接注入client pub会报错 报错原因我也不知道 如果有大佬知道就请留言告知一下 + * * @author jie */ @Slf4j diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/redis/RedisKeyConstants.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/redis/RedisKeyConstants.java index 393ee6007..7f9c50c83 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/redis/RedisKeyConstants.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/redis/RedisKeyConstants.java @@ -9,7 +9,7 @@ public interface RedisKeyConstants { /** * 序号的缓存 - * + *

* KEY 格式：trade_no:{prefix} * VALUE 数据格式：编号自增 */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java index 9edfea9e7..024cdb78e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java @@ -2,10 +2,11 @@ package cn.iocoder.yudao.module.iot.service.device; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DevicePageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DeviceSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; @@ -63,7 +64,7 @@ public interface DeviceService { * 获得设备属性分页 * * @param pageReqVO 分页查询 - * @param deviceId 设备id + * @param deviceId 设备id * @return 设备属性分页 */ PageResult getDeviceAttributePage(PageParam pageReqVO, Long deviceId); @@ -90,12 +91,12 @@ public interface DeviceService { */ void deleteDeviceAttribute(Long id); - /** - * 获得设备属性 - * - * @param id 编号 + /** + * 获得设备属性 + * + * @param id 编号 * @return 设备属性 - */ + */ DeviceAttributeDO getDeviceAttribute(Long id); } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java index 96f089241..d3bf5e83e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java @@ -1,34 +1,27 @@ package cn.iocoder.yudao.module.iot.service.device; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DevicePageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DeviceSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; +import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceAttributeMapper; import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceMapper; import cn.iocoder.yudao.module.iot.framework.constant.DeviceTypeEnum; import cn.iocoder.yudao.module.iot.framework.gateway.service.impl.TheGatewayServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; - -import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; - -import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - -import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceAttributeMapper; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.List; - import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DEVICE_ATTRIBUTE_NOT_EXISTS; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DEVICE_NOT_EXISTS; /** * 物联设备 Service 实现类 @@ -92,16 +85,16 @@ public class DeviceServiceImpl implements DeviceService { public PageResult getDevicePage(DevicePageReqVO pageReqVO) { return deviceMapper.selectPage(pageReqVO); } + @Override - public CommonResult pushDevice(DeviceDO deviceDO, GatewayDO gatewayDO){ - if(DeviceTypeEnum.isSiemens(deviceDO.getDeviceType())){ - return siemensAdd(deviceDO,gatewayDO); - } - else if(DeviceTypeEnum.isModbus(deviceDO.getDeviceType())){ - return modbusAdd(deviceDO,gatewayDO); - } - else return CommonResult.error(500,"未知类型设备！"); + public CommonResult pushDevice(DeviceDO deviceDO, GatewayDO gatewayDO) { + if (DeviceTypeEnum.isSiemens(deviceDO.getDeviceType())) { + return siemensAdd(deviceDO, gatewayDO); + } else if (DeviceTypeEnum.isModbus(deviceDO.getDeviceType())) { + return modbusAdd(deviceDO, gatewayDO); + } else return CommonResult.error(500, "未知类型设备！"); } + public CommonResult siemensAdd(DeviceDO deviceDO, GatewayDO gatewayDO) { if (gatewayDO != null && deviceDO != null && deviceDO.getDeviceCode() != null && gatewayDO.getGatewayCode() != null) { @@ -123,7 +116,7 @@ public class DeviceServiceImpl implements DeviceService { e.getLocalizedMessage(); } } - return CommonResult.error(500,"设备或网关不存在！"); + return CommonResult.error(500, "设备或网关不存在！"); } /*modbus设备下发*/ @@ -147,7 +140,7 @@ public class DeviceServiceImpl implements DeviceService { e.getLocalizedMessage(); } } - return CommonResult.error(500,"设备或网关不存在！"); + return CommonResult.error(500, "设备或网关不存在！"); } // ==================== 子表（设备属性） ==================== diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordService.java index fe3a3f2aa..f8b590f5c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.iot.service.formula; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import javax.validation.Valid; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordServiceImpl.java index 50a20bdd0..6ad12d38b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaRecordServiceImpl.java @@ -1,22 +1,18 @@ package cn.iocoder.yudao.module.iot.service.formula; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO; import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaRecordMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_RECORD_NOT_EXISTS; /** * 变量记录 Service 实现类 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaService.java index 833e1ef87..672d926cc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaService.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.iot.service.formula; -import javax.validation.Valid; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; + +import javax.validation.Valid; /** @@ -86,12 +88,12 @@ public interface FormulaService { */ void deleteFormulaDetail(Long id); - /** - * 获得计算公式明细 - * - * @param id 编号 + /** + * 获得计算公式明细 + * + * @param id 编号 * @return 计算公式明细 - */ + */ FormulaDetailDO getFormulaDetail(Long id); } \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaServiceImpl.java index 851806a82..cde480dcb 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/formula/FormulaServiceImpl.java @@ -1,23 +1,23 @@ package cn.iocoder.yudao.module.iot.service.formula; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; -import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - -import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaMapper; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO; +import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO; import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaDetailMapper; +import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_DETAIL_NOT_EXISTS; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_NOT_EXISTS; /** * 计算公式 Service 实现类 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java index c46862140..a0434d3f2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.iot.service.frpc; -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import javax.validation.Valid; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java index 8b8779455..0ac247f11 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java @@ -1,22 +1,18 @@ package cn.iocoder.yudao.module.iot.service.frpc; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; import cn.iocoder.yudao.module.iot.dal.mysql.frpc.FrpcProxyServerMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FRPC_PROXY_SERVER_NOT_EXISTS; /** * 代理服务 Service 实现类 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java index 616dcdcc2..ba7f409de 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java @@ -1,10 +1,9 @@ package cn.iocoder.yudao.module.iot.service.frps; -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; import javax.validation.Valid; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java index 7ccc290cc..e38f14858 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java @@ -1,22 +1,18 @@ package cn.iocoder.yudao.module.iot.service.frps; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.FrpsServerSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; import cn.iocoder.yudao.module.iot.dal.mysql.frps.FrpsServerMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FRPS_SERVER_NOT_EXISTS; /** * 代理服务器 Service 实现类 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayService.java index 4e44a169c..e9258c26d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayService.java @@ -1,12 +1,13 @@ package cn.iocoder.yudao.module.iot.service.gateway; -import javax.validation.Valid; -import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.*; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewayPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewaySaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import javax.validation.Valid; import java.util.List; /** @@ -47,6 +48,7 @@ public interface GatewayService { GatewayDO getGateway(Long id); List selectListByIsEnable(boolean isEnable); + /** * 获得网关分页 * @@ -88,12 +90,12 @@ public interface GatewayService { */ void deleteDevice(Long id); - /** - * 获得物联设备 - * - * @param id 编号 + /** + * 获得物联设备 + * + * @param id 编号 * @return 物联设备 - */ + */ DeviceDO getDevice(Long id); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayServiceImpl.java index e631d6429..8f12c18ea 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/gateway/GatewayServiceImpl.java @@ -1,30 +1,24 @@ package cn.iocoder.yudao.module.iot.service.gateway; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewayPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.GatewaySaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO; +import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceMapper; -import cn.iocoder.yudao.module.iot.framework.constant.Constants; -import cn.iocoder.yudao.module.iot.framework.constant.IsEnableConstant; -import cn.iocoder.yudao.module.iot.framework.mqtt.consumer.IMqttservice; -import org.apache.commons.lang3.StringUtils; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.springframework.beans.factory.annotation.Autowired; +import cn.iocoder.yudao.module.iot.dal.mysql.gateway.GatewayMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; -import cn.iocoder.yudao.module.iot.controller.admin.gateway.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - -import cn.iocoder.yudao.module.iot.dal.mysql.gateway.GatewayMapper; - +import javax.annotation.Resource; import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DEVICE_NOT_EXISTS; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.GATEWAY_NOT_EXISTS; /** * 网关 Service 实现类 @@ -83,9 +77,10 @@ public class GatewayServiceImpl implements GatewayService { } @Override - public List selectListByIsEnable(boolean isEnable){ + public List selectListByIsEnable(boolean isEnable) { return gatewayMapper.selectListByIsEnable(isEnable); } + @Override public PageResult getGatewayPage(GatewayPageReqVO pageReqVO) { return gatewayMapper.selectPage(pageReqVO); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationService.java index c9de1e93a..f6eacd37c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationService.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.iot.service.iotorganization; -import java.util.*; -import javax.validation.Valid; -import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.*; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationListReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationSaveReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; + +import javax.validation.Valid; +import java.util.List; /** * IOT组织 Service 接口 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationServiceImpl.java index 3feb860a0..b9ee13c83 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/iotorganization/IotOrganizationServiceImpl.java @@ -1,15 +1,16 @@ package cn.iocoder.yudao.module.iot.service.iotorganization; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationListReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.IotOrganizationSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; +import cn.iocoder.yudao.module.iot.dal.mysql.iotorganization.IotOrganizationMapper; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.iotorganization.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.iotorganization.IotOrganizationDO; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - -import cn.iocoder.yudao.module.iot.dal.mysql.iotorganization.IotOrganizationMapper; +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanService.java index be6821858..8446423de 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanService.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.iot.service.kanban; -import javax.validation.Valid; -import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; + +import javax.validation.Valid; /** * 物联看板 Service 接口 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanServiceImpl.java index 83f76d6fb..aef2bea2a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/kanban/KanbanServiceImpl.java @@ -1,23 +1,18 @@ package cn.iocoder.yudao.module.iot.service.kanban; -import org.springframework.stereotype.Service; - -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.kanban.vo.KanbanSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.kanban.KanbanDO; import cn.iocoder.yudao.module.iot.dal.mysql.kanban.KanbanMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.KANBAN_NOT_EXISTS; /** * 物联看板 Service 实现类 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordService.java index e28cdaa9e..8c6515169 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordService.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordService.java @@ -1,9 +1,9 @@ package cn.iocoder.yudao.module.iot.service.mqttrecord; -import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import javax.validation.Valid; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordServiceImpl.java index fc9cc56c4..423d5d84b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttrecord/MqttRecordServiceImpl.java @@ -1,22 +1,18 @@ package cn.iocoder.yudao.module.iot.service.mqttrecord; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; -import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.*; -import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; - +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordPageReqVO; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO; import cn.iocoder.yudao.module.iot.dal.mysql.mqttrecord.MqttRecordMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.MQTT_RECORD_NOT_EXISTS; /** * 数采记录 Service 实现类