linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize iot import

Browse Source
plp
chenshuichuan 2 years ago
parent 46f68077b8
commit 59d9d0ab3e
128 changed files with 3503 additions and 3591 deletions
Show Stats Download Patch File Download Diff File

41
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java
Unescape Escape View File

@ -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")
@ -96,6 +94,7 @@ public class DeviceController {
ExcelUtils.write(response, "物联设备.xls", "数据", 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<String> 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);
}
// ==================== 子表（设备属性） ====================

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DevicePageReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java
Unescape Escape View File

@ -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

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceSaveReqVO.java
Unescape Escape View File

@ -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")

39
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java
Unescape Escape View File

@ -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")

35
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java
Unescape Escape View File

@ -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

9
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaPageReqVO.java
Unescape Escape View File

@ -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;

9
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordPageReqVO.java
Unescape Escape View File

@ -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;

15
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordRespVO.java
Unescape Escape View File

@ -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

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRecordSaveReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaRespVO.java
Unescape Escape View File

@ -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

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/vo/FormulaSaveReqVO.java
Unescape Escape View File

@ -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")

35
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java
Unescape Escape View File

@ -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

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java
Unescape Escape View File

@ -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

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java
Unescape Escape View File

@ -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;

38
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java
Unescape Escape View File

@ -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")

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java
Unescape Escape View File

@ -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

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java
Unescape Escape View File

@ -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;

37
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java
Unescape Escape View File

@ -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")

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayPageReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewayRespVO.java
Unescape Escape View File

@ -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

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/vo/GatewaySaveReqVO.java
Unescape Escape View File

@ -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

35
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java
Unescape Escape View File

@ -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")

7
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationListReqVO.java
Unescape Escape View File

@ -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")

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationRespVO.java
Unescape Escape View File

@ -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

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/vo/IotOrganizationSaveReqVO.java
Unescape Escape View File

@ -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 {

37
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java
Unescape Escape View File

@ -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")

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanPageReqVO.java
Unescape Escape View File

@ -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;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanRespVO.java
Unescape Escape View File

@ -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

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/vo/KanbanSaveReqVO.java
Unescape Escape View File

@ -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 {

34
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java
Unescape Escape View File

@ -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

11
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttServerController.java
Unescape Escape View File

@ -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 {
}
}

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordPageReqVO.java
Unescape Escape View File

@ -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;

9
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordRespVO.java
Unescape Escape View File

@ -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

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/vo/MqttRecordSaveReqVO.java
Unescape Escape View File

@ -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;

15
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceAttributeDO.java
Unescape Escape View File

@ -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否)
*
* <p>
* 枚举 {@link TODO iot_1_or_0 对应的类}
*/
private String isLinearTransfer;
/**
* 数据类型
*
* <p>
* 枚举 {@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
*
* <p>
* 枚举 {@link TODO iot_device_data_transfer_type 对应的类}
*/
private String transferDataType;

29
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java
Unescape Escape View File

@ -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)
*
* <p>
* 枚举 {@link TODO iot_siemens_type 对应的类}
*/
private String siemensSeries;
@ -55,7 +54,7 @@ public class DeviceDO extends BaseDO {
private String siemensConnectParam;
/**
* 读取任务方式(0无，1有)
*
* <p>
* 枚举 {@link TODO iot_1_or_0 对应的类}
*/
private String readCronType;
@ -65,7 +64,7 @@ public class DeviceDO extends BaseDO {
private Integer readRepeatValue;
/**
* 读取任务时间间隔单位
*
* <p>
* 枚举 {@link TODO iot_device_data_unit 对应的类}
*/
private String readRepeatUnit;
@ -91,13 +90,13 @@ public class DeviceDO extends BaseDO {
private String writeCron;
/**
* 是否持久化(0不持久化，1持久化)
*
* <p>
* 枚举 {@link TODO iot_1_or_0 对应的类}
*/
private String localPersistent;
/**
* 上传方式(1实时，2自定义)
*
* <p>
* 枚举 {@link TODO iot_device_uploading_type 对应的类}
*/
private String uploadRate;
@ -107,19 +106,19 @@ public class DeviceDO extends BaseDO {
private Integer rateCount;
/**
* modbus协议类型(serial-rtu)
*
* <p>
* 枚举 {@link TODO iot_modbus_type 对应的类}
*/
private String modbusProtocol;
/**
* modbus模式(client)
*
* <p>
* 枚举 {@link TODO iot_modbus_mold 对应的类}
*/
private String modbusPattern;
/**
* modbus串口号
*
* <p>
* 枚举 {@link TODO iot_modbus_port 对应的类}
*/
private String portName;
@ -129,13 +128,13 @@ public class DeviceDO extends BaseDO {
private String modbusConnectParam;
/**
* 读地址是否连续(0否，1是)
*
* <p>
* 枚举 {@link TODO iot_1_or_0 对应的类}
*/
private String modbusReadAddrGap;
/**
* 是否已下发(0下,1没下)
*
* <p>
* 枚举 {@link TODO iot_1_or_0 对应的类}
*/
private String isUpload;

12
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDO.java
Unescape Escape View File

@ -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;
/**
* 结果类型（产量，电耗，浆耗，水耗，气耗，参数）
*
* <p>
* 枚举 {@link TODO mes_data_type 对应的类}
*/
private String resultType;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaDetailDO.java
Unescape Escape View File

@ -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:最大值-最小值
*
* <p>
* 枚举 {@link TODO iot_formula_var_type 对应的类}
*/
private String sumType;
/**
* 计算范围，为空则不计算day：当天,week：当周,month：当月
*
* <p>
* 枚举 {@link TODO iot_formula_cal_rang 对应的类}
*/
private String sumRange;

11
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/formula/FormulaRecordDO.java
Unescape Escape View File

@ -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;
/**
* 类型
*
* <p>
* 枚举 {@link TODO mes_data_type 对应的类}
*/
private String resultType;

15
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java
Unescape Escape View File

@ -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;
/**
* 内网状态
*
* <p>
* 枚举 {@link TODO iot_proxy_server_status 对应的类}
*/
private String localStatus;
@ -63,7 +62,7 @@ public class FrpcProxyServerDO extends BaseDO {
private String proxyAddress;
/**
* 代理状态
*
* <p>
* 枚举 {@link TODO iot_proxy_server_status 对应的类}
*/
private String proxyStatus;
@ -73,7 +72,7 @@ public class FrpcProxyServerDO extends BaseDO {
private String remark;
/**
* 是否启用
*
* <p>
* 枚举 {@link TODO infra_boolean_string 对应的类}
*/
private Boolean isEnable;

13
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java
Unescape Escape View File

@ -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;
/**
* 服务状态
*
* <p>
* 枚举 {@link TODO iot_proxy_server_status 对应的类}
*/
private String frpsState;
@ -63,7 +62,7 @@ public class FrpsServerDO extends BaseDO {
private String remark;
/**
* 是否启用
*
* <p>
* 枚举 {@link TODO infra_boolean_string 对应的类}
*/
private Boolean isEnable;

11
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/gateway/GatewayDO.java
Unescape Escape View File

@ -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;
/**
* 网关状态
*
* <p>
* 枚举 {@link TODO iot_gateway_status 对应的类}
*/
private String gatewayStatus;

17
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/iotorganization/IotOrganizationDO.java
Unescape Escape View File

@ -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;
/**
* 组织状态
*
* <p>
* 枚举 {@link TODO mes_machine_status 对应的类}
*/
private Integer status;
/**
* 设备类型
*
* <p>
* 枚举 {@link TODO iot_device_type 对应的类}
*/
private String deviceType;
/**
* 组织等级
*
* <p>
* 枚举 {@link TODO iot_org_class 对应的类}
*/
private String orgClass;
/**
* 机台类型
*
* <p>
* 枚举 {@link TODO mes_org_type 对应的类}
*/
private String machineType;

11
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/kanban/KanbanDO.java
Unescape Escape View File

@ -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;
/**
* 是否启用
*
* <p>
* 枚举 {@link TODO infra_boolean_string 对应的类}
*/
private Boolean isEnable;

10
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttrecord/MqttRecordDO.java
Unescape Escape View File

@ -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

9
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceAttributeMapper.java
Unescape Escape View File

@ -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
*
@ -26,6 +26,7 @@ public interface DeviceAttributeMapper extends BaseMapperX<DeviceAttributeDO> {
default int deleteByDeviceId(Long deviceId) {
return delete(DeviceAttributeDO::getDeviceId, deviceId);
}
default List<DeviceAttributeDO> selectByDeviceId(Long deviceId) {
return selectList(DeviceAttributeDO::getDeviceId, deviceId);
}

7
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java
Unescape Escape View File

@ -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<DeviceDO> {
.betweenIfPresent(DeviceDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(DeviceDO::getId));
}
default PageResult<DeviceDO> selectPage(PageParam reqVO, Long gatewayId) {
return selectPage(reqVO, new LambdaQueryWrapperX<DeviceDO>()
.eq(DeviceDO::getGatewayId, gatewayId)
@ -60,6 +60,7 @@ public interface DeviceMapper extends BaseMapperX<DeviceDO> {
default int deleteByGatewayId(Long gatewayId) {
return delete(DeviceDO::getGatewayId, gatewayId);
}
default List<DeviceDO> selectByGatewayId(Long gatewayId) {
return selectList(DeviceDO::getGatewayId, gatewayId);
}

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaDetailMapper.java
Unescape Escape View File

@ -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;

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaMapper.java
Unescape Escape View File

@ -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

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/formula/FormulaRecordMapper.java
Unescape Escape View File

@ -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

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java
Unescape Escape View File

@ -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

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java
Unescape Escape View File

@ -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

10
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/gateway/GatewayMapper.java
Unescape Escape View File

@ -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<GatewayDO> {
.eqIfPresent(GatewayDO::getTopic, reqVO.getTopic())
.orderByDesc(GatewayDO::getId));
}
default List<GatewayDO> selectListByIsEnable(boolean isEnable) {
return selectList(GatewayDO::getIsEnable, isEnable);
}

9
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/iotorganization/IotOrganizationMapper.java
Unescape Escape View File

@ -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

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/kanban/KanbanMapper.java
Unescape Escape View File

@ -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

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttrecord/MqttRecordMapper.java
Unescape Escape View File

@ -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

162
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/AddressDataType.java
Unescape Escape View File

@ -9,99 +9,105 @@ import java.util.Map;
@Data
@AllArgsConstructor
public class AddressDataType {
private static Map<String,String> tdDataTypeMap = new HashMap<>();
private static Map<String,String> mysqlDataTypeMap = new HashMap<>();
private static Map<String,Integer> gatewayDataTypeMap = new HashMap<>();
private static Map<String, String> tdDataTypeMap = new HashMap<>();
private static Map<String, String> mysqlDataTypeMap = new HashMap<>();
private static Map<String, Integer> 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)");
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);
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");
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<String,String> getDataTypeMap(){
public static Map<String, String> getDataTypeMap() {
return tdDataTypeMap;
}
public static String getTdDataType(String originDataType){
public static String getTdDataType(String originDataType) {
return tdDataTypeMap.get(originDataType);
}
public static String getTMysqlDataType(String originDataType){
public static String getTMysqlDataType(String originDataType) {
//return mysqlDataTypeMap.get(originDataType);
return "double(8,4)";
}
public static Map<String,Integer> getGatewayDataTypeMap(){
public static Map<String, Integer> getGatewayDataTypeMap() {
return gatewayDataTypeMap;
}
public static Integer getGatewayDataTypeMap(String originDataType){
public static Integer getGatewayDataTypeMap(String originDataType) {
return gatewayDataTypeMap.get(originDataType);
}

3
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/constant/DeviceTypeEnum.java
Unescape Escape View File

@ -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 {

11
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/bo/HttpEntity.java
Unescape Escape View File

@ -30,6 +30,7 @@ public class HttpEntity {
params.add(new BasicNameValuePair("isAsc", pageEntity.getIsAsc()));
return params;
}
public static List<BasicNameValuePair> getPageParamVo(PageEntityByDecice pageEntity) {
List<BasicNameValuePair> params = new ArrayList<>();
params.add(new BasicNameValuePair("pageSize", pageEntity.getPageSize()));
@ -140,8 +141,8 @@ public class HttpEntity {
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()));
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()));
@ -154,7 +155,7 @@ public class HttpEntity {
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("siemensFieldPrecision", String.valueOf(entity.getSiemensFieldPrecision())));
params.add(new BasicNameValuePair("siemensFieldUnit", entity.getSiemensFieldUnit()));
return params;
}
@ -165,7 +166,7 @@ public class HttpEntity {
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())));
params.add(new BasicNameValuePair("deviceName", String.valueOf(entity.getDeviceName())));
return params;
}
@ -196,7 +197,7 @@ public class HttpEntity {
return params;
}
public static List<BasicNameValuePair> getLoginParam(String username,String password) {
public static List<BasicNameValuePair> getLoginParam(String username, String password) {
List<BasicNameValuePair> params = new ArrayList<>();
params.add(new BasicNameValuePair("username", username));
params.add(new BasicNameValuePair("password", password));

57
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/DeviceSiemensEntity.java
Unescape Escape View File

@ -9,30 +9,48 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class DeviceSiemensEntity {
/**数据库id*/
/**
* 数据库id
*/
String deviceConfigID;
/**设备编号*/
/**
* 设备编号
*/
String deviceID;//71220220500200001
/**设备名称*/
/**
* 设备名称
*/
String deviceName;
/**Siemens系列*/
/**
* Siemens系列
*/
String siemensSeries;
/**连接参数*/
/**
* 连接参数
*/
String siemensConnectParam;
/**读取任务*/
/**
* 读取任务
*/
String readCronType;//无、频率、定点
/**频率值*/
/**
* 频率值
*/
Integer readRepeatValue;//正整数
/**读单位*/
/**
* 读单位
*/
String readRepeatUnit;//秒、分、时、毫秒
/**读取任务时间表达式*/
/**
* 读取任务时间表达式
*/
String readCron;
//写入任务时间间隔
@ -41,25 +59,34 @@ public class DeviceSiemensEntity {
//写入任务时间间隔
Integer writeRepeatValue;
/**数据库id*/
/**
* 数据库id
*/
String writeRepeatUnit;
/**
* 写入任务时间表达式
*/
String writeCron;
/**是否持久化*/
/**
* 是否持久化
*/
String localPersistent;
/**上传*/
/**
* 上传
*/
String uploadRate;
/**不变次数*/
/**
* 不变次数
*/
Integer rateCount;
/**设备类型*/
/**
* 设备类型
*/
String deviceType; //siemens、modbus
String deviceComm; //1
String deviceStatus;//0,notok; 1,ok

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntity.java
Unescape Escape View File

@ -12,8 +12,9 @@ public class PageEntity {
String pageNum; //: 1
String orderByColumn; //: updateTime
String isAsc; //: asc
// String deviceID; //: 设备编码
public PageEntity(){
// String deviceID; //: 设备编码
public PageEntity() {
this.isAsc = "asc";
this.orderByColumn = "updateTime";
this.pageSize = "100";

3
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/entity/PageEntityByDecice.java
Unescape Escape View File

@ -13,7 +13,8 @@ public class PageEntityByDecice {
String orderByColumn; //: updateTime
String isAsc; //: asc
String deviceID; //: 设备编码
public PageEntityByDecice(){
public PageEntityByDecice() {
this.isAsc = "asc";
this.orderByColumn = "updateTime";
this.pageSize = "100";

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/GatewayMqttService.java
Unescape Escape View File

@ -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,15 +8,16 @@ import java.util.List;
public interface GatewayMqttService {
public void login(String url ,String username ,String password);
public void login(String url, String username, String password);
//获取mqtt主题
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username , String password);
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username, String password);
//下发单个mqtt主题
public int add(MqttBrokerEntity entity, String url);
//删除mqtt主题
public int delete( String url, String ids);
public int delete(String url, String ids);
//启用网关
public int changeStatus(ChangeStatus changeStatus, String url);

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IModbusPointService.java
Unescape Escape View File

@ -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;
@ -16,8 +15,9 @@ public interface IModbusPointService {
/*modbus*/
//获取设备列表
public List<DeviceModbusEntity> getModbusList(String url, String username, String password);
//获取指定设备编码列表
public List<DeviceModbusEntity> getModbusList(String url, String username, String password,String deviceId);
public List<DeviceModbusEntity> getModbusList(String url, String username, String password, String deviceId);
//下发单个设备
public int add(DeviceModbusEntity entity, String url);

23
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/ISiemensPointService.java
Unescape Escape View File

@ -11,17 +11,21 @@ import java.util.List;
public interface ISiemensPointService {
//调用前统一登录，保存cookies
public String login(String url ,String username ,String password);
public String login(String url, String username, String password);
/*西门子*/
//获取设备列表
public List<DeviceSiemensEntity> getSiemensList(String url, String username , String password);
public List<DeviceSiemensEntity> getSiemensList(String url, String username, String password);
//获取指定编码设备列表
public List<DeviceSiemensEntity> getSiemensList(String url, String username , String password,String deviceId);
public List<DeviceSiemensEntity> getSiemensList(String url, String username, String password, String deviceId);
//下发单个设备
public int add(DeviceSiemensEntity siemens,String url);
public int add(DeviceSiemensEntity siemens, String url);
//下发单个设备
public int add(List<DeviceSiemensEntity> list,String url);
public int add(List<DeviceSiemensEntity> list, String url);
//删除单个设备
public int delete(String url, String ids);
@ -30,21 +34,22 @@ public interface ISiemensPointService {
//获取设备点位列表
public List<SiemensPointEntity> getPointList(String url, String deviceConfigID, String username , String password);
public List<SiemensPointEntity> getPointList(String url, String deviceConfigID, String username, String password);
//下发点位
public int add(SiemensPointEntity point, String url, String id);
public int add(List<SiemensPointEntity> list, String url, String deviceConfigID);
//更改点位状态
public int edit(SiemensPointEntity point,String url);
public int edit(SiemensPointEntity point, String url);
//删除点位
public int deletePoint(String url, String ids);
//启用设备
public int changeStatusDevice(List<String>deviceIds,ChangeStatus changeStatus, String url);
public int changeStatusDevice(List<String> deviceIds, ChangeStatus changeStatus, String url);
Integer getPointListByCount(String url, String deviceConfigID, String username, String password);

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/IVideoService.java
Unescape Escape View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.iot.framework.gateway.service;
import cn.iocoder.yudao.module.iot.framework.gateway.entity.DeviceVideoEntity;
import java.util.List;

10
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/GatewayMqttServiceImpl.java
Unescape Escape View File

@ -25,14 +25,15 @@ import java.util.List;
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){
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));
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);
@ -44,8 +45,9 @@ public class GatewayMqttServiceImpl implements GatewayMqttService {
HttpUtils.closeHttp(httpClient, httpResponse);
}
}
@Override
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username , String password) {
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username, String password) {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
@ -95,7 +97,7 @@ public class GatewayMqttServiceImpl implements GatewayMqttService {
}
@Override
public int delete( String address, String ids) {
public int delete(String address, String ids) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
CloseableHttpResponse httpResponse = null;
HttpPost httpPost = null;

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/ModbusPointServiceImpl.java
Unescape Escape View File

@ -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;

39
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/SiemensPointServiceImpl.java
Unescape Escape View File

@ -39,14 +39,15 @@ import static cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils.getHt
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){
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));
HttpPost httpPost = getHttpPost(url + UrlConstans.loginUrl, HttpEntity.getLoginParam(username, password));
httpResponse = httpClient.execute(httpPost);
this.cookie = HttpUtils.getCookies(httpResponse);
}
@ -72,7 +73,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
/*获取西门子设备列表*/
@Override
public List<DeviceSiemensEntity> getSiemensList(String url , String username , String password) {
public List<DeviceSiemensEntity> getSiemensList(String url, String username, String password) {
PageEntity pageEntity = new PageEntity();
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
@ -97,9 +98,10 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
return list;
}
/*获取西门子设备列表*/
@Override
public List<DeviceSiemensEntity> getSiemensList(String url , String username , String password,String deviceId) {
public List<DeviceSiemensEntity> getSiemensList(String url, String username, String password, String deviceId) {
PageEntityByDecice pageEntity = new PageEntityByDecice();
pageEntity.setDeviceID(deviceId);
// 创建 HttpClient 客户端
@ -156,7 +158,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
try {
httpPost = getHttpPost(url + UrlConstans.siemens_add, null);
httpPost.setHeader("Cookie", cookie);
for (DeviceSiemensEntity entity: list) {
for (DeviceSiemensEntity entity : list) {
List<BasicNameValuePair> pairList = HttpEntity.getParam(entity);
if (pairList != null) {
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>(pairList);
@ -211,9 +213,8 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
@Override
public List<SiemensPointEntity> getPointList(String url, String deviceConfigID,String username ,String password) {
public List<SiemensPointEntity> getPointList(String url, String deviceConfigID, String username, String password) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
CloseableHttpResponse httpResponse = null;
List<SiemensPointEntity> list = new ArrayList<>();
@ -242,27 +243,27 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
CloseableHttpResponse httpResponse = null;
HttpPost httpPost = null;
try {
httpPost = getHttpPost(url + UrlConstans.siemens_iopoint_edit_r+deviceConfigID, HttpEntity.getParam(point));
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 {
} finally {
HttpUtils.closeHttp(httpClient, httpResponse);
}
return 0;
}
@Override
public int add(List<SiemensPointEntity> 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 = getHttpPost(url + UrlConstans.siemens_iopoint_add_r + deviceConfigID, null);
httpPost.setHeader("Cookie", cookie);
for (SiemensPointEntity entity: list) {
if(entity.getSiemensFieldDataType()==null)continue;
for (SiemensPointEntity entity : list) {
if (entity.getSiemensFieldDataType() == null) continue;
List<BasicNameValuePair> pairList = HttpEntity.getParam(entity);
if (pairList != null) {
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>(pairList);
@ -274,8 +275,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
} catch (Exception e) {
e.printStackTrace();
}
finally {
} finally {
HttpUtils.closeHttp(httpClient, httpResponse);
}
return 0;
@ -299,7 +299,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
@Override
public int deletePoint( String url, String ids) {
public int deletePoint(String url, String ids) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
CloseableHttpResponse httpResponse = null;
HttpPost httpPost = null;
@ -316,13 +316,13 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
@Override
public int changeStatusDevice(List<String>deviceIds,ChangeStatus changeStatus, String url) {
public int changeStatusDevice(List<String> 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) {
for (String id : deviceIds) {
changeStatus.setChangesStatusID(id);
List<BasicNameValuePair> pairList = HttpEntity.getChangestatus(changeStatus);
if (pairList != null) {
@ -363,8 +363,9 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
return count;
}
@Override
public List<SiemensPointEntity> getPointListAll(String url, String deviceConfigID,String username ,String password) {
public List<SiemensPointEntity> getPointListAll(String url, String deviceConfigID, String username, String password) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
CloseableHttpResponse httpResponse = null;
List<SiemensPointEntity> list = new ArrayList<>();

32
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/TheGatewayServiceImpl.java
Unescape Escape View File

@ -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;
@ -162,7 +160,7 @@ public class TheGatewayServiceImpl {
//下发完成西门子设备后 下发对应设备的点位
public void addDeviceSiemensEntity(GatewayDO gatewayDO,Long machineId, DeviceDO deviceDO) {
public void addDeviceSiemensEntity(GatewayDO gatewayDO, Long machineId, DeviceDO deviceDO) {
siemensPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
/*下发好设备后获取设备列表找点位*/
List<DeviceSiemensEntity> siemensList = siemensPointService.getSiemensList(gatewayDO.getAdminIp(),
@ -347,7 +345,7 @@ public class TheGatewayServiceImpl {
* 5启用
*/
public void deleteMqttEntity(GatewayDO gatewayDO) {
modbusPointService.login(gatewayDO.getAdminIp(),gatewayDO.getUsername(),gatewayDO.getPassword());
modbusPointService.login(gatewayDO.getAdminIp(), gatewayDO.getUsername(), gatewayDO.getPassword());
List<MqttBrokerEntity> mqttBrokerEntity = gatewayMqttService.getMqttBrokerEntity(gatewayDO.getAdminIp(),
gatewayDO.getUsername(), gatewayDO.getPassword());
for (MqttBrokerEntity brokerEntity : mqttBrokerEntity) {
@ -403,7 +401,6 @@ public class TheGatewayServiceImpl {
}
/*检测下发数据和实际下发数量是否匹配*/
public CommonResult<String> compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) {
String deviceConfigID = null;
@ -430,26 +427,28 @@ public class TheGatewayServiceImpl {
List<DeviceAttributeDO> points = deviceAttributeMapper.selectByDeviceId(deviceDO.getId());
int size = points.size();
String str = "应下发" + points.size() + "个地址,实下发" + pointList + "个地址";
return size!=pointList? CommonResult.error(500,"下发失败！"+str)
: CommonResult.success("下发成功！"+str);
return size != pointList ? CommonResult.error(500, "下发失败！" + str)
: CommonResult.success("下发成功！" + str);
}
/**网关登录测试*/
public CommonResult login(GatewayDO gateway){
/**
* 网关登录测试
*/
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()));
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("<!DOCTYPE html>"))
if (entityStr.contains("服务不可用") || entityStr.contains("<!DOCTYPE html>"))
return CommonResult.success("网关服务不可用！");
ResponseInfo info = JSON.parseObject(entityStr, ResponseInfo.class);
if(info.code==0)return CommonResult.success("网关登录测试成功！");
if (info.code == 0) return CommonResult.success("网关登录测试成功！");
}
}
// 无论如何必须关闭连接
@ -458,7 +457,7 @@ public class TheGatewayServiceImpl {
} finally {
HttpUtils.closeHttp(httpClient, httpResponse);
}
return CommonResult.error(500,"网关登录测试失败！");
return CommonResult.error(500, "网关登录测试失败！");
}
public int openOrClose(String adminIp, String username, String password, String monitorCode) {
@ -468,7 +467,7 @@ public class TheGatewayServiceImpl {
for (int j = 0; j < videoId.size(); j++) {
addressIds[j] = videoId.get(j).getDeviceConfigID();
}
return videoService.openOrClose(adminIp,String.join(",",addressIds));
return videoService.openOrClose(adminIp, String.join(",", addressIds));
}
return 1;
}
@ -479,8 +478,9 @@ public class TheGatewayServiceImpl {
int code;
String msg;
}
public void deleteVideo(String adminIp,String username,String password,String monitorCode) {
videoService.login(adminIp,username,password);
public void deleteVideo(String adminIp, String username, String password, String monitorCode) {
videoService.login(adminIp, username, password);
List<DeviceVideoEntity> videoId = videoService.getVideoId(adminIp, username, password, monitorCode);
if (videoId != null && videoId.size() > 0) {
String[] addressIds = new String[videoId.size()];

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/service/impl/VideoServiceImpl.java
Unescape Escape View File

@ -25,14 +25,15 @@ import static cn.iocoder.yudao.module.iot.framework.gateway.util.HttpUtils.getHt
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){
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));
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);

149
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/HttpUtils.java
Unescape Escape View File

@ -36,8 +36,7 @@ import java.util.List;
*
* @author ruoyi
*/
public class HttpUtils
{
public class HttpUtils {
private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
/**
@ -47,8 +46,7 @@ public class HttpUtils
* @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");
}
@ -60,12 +58,10 @@ public class HttpUtils
* @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);
}
}
@ -122,13 +103,11 @@ public class HttpUtils
* @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,63 +174,48 @@ 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() 方法实现一个信任策略，信任所有证书
@ -317,6 +263,7 @@ public class HttpUtils
}
return httpPost;
}
public static HttpGet getHttpGet(String url, List<BasicNameValuePair> list) throws UnsupportedEncodingException {
// 创建 HttpGet 请求
HttpGet httpGet = new HttpGet(url);
@ -332,20 +279,21 @@ public class HttpUtils
if (list != null) {
for (BasicNameValuePair pair : list) {
// 设置 httpGet 参数
httpGet.setHeader(pair.getName(),pair.getValue());
httpGet.setHeader(pair.getName(), pair.getValue());
}
}
return httpGet;
}
public static boolean testNetworkConnected(String url){
public static boolean testNetworkConnected(String url) {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
CloseableHttpResponse httpResponse = null;
try {
HttpGet httpGet = HttpUtils.getHttpGet(url,new ArrayList<>());
HttpGet httpGet = HttpUtils.getHttpGet(url, new ArrayList<>());
httpResponse = httpClient.execute(httpGet);
StatusLine statusLine = httpResponse.getStatusLine();
if(statusLine.getStatusCode() == 200)return true;
if (statusLine.getStatusCode() == 200) return true;
}
// 无论如何必须关闭连接
catch (IOException e) {
@ -355,6 +303,7 @@ public class HttpUtils
}
return false;
}
public static String getCookies(CloseableHttpResponse httpResponse) {
Header str = httpResponse.getHeaders("Set-Cookie")[0];
return str.getValue().split(";")[0];

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/SslUtil.java
Unescape Escape View File

@ -45,7 +45,7 @@ public class SslUtil {
/**
* 忽略HTTPS请求的SSL证书，必须在openConnection之前调用
*/
public static void ignoreSsl() throws Exception{
public static void ignoreSsl() throws Exception {
HostnameVerifier hv = (urlHostName, session) -> true;
trustAllHttpsCertificates();
HttpsURLConnection.setDefaultHostnameVerifier(hv);

23
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/TestApp.java
Unescape Escape View File

@ -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;
@ -38,7 +36,7 @@ public class TestApp {
@Autowired
private ISiemensPointService iopointUploadService;
public static void main(String[] args){
public static void main(String[] args) {
BigDecimal b1 = new BigDecimal("123.564");
BigDecimal b2 = new BigDecimal("3.3");
@ -54,9 +52,10 @@ public class TestApp {
}
//@Scheduled(fixedRate = 5000)
public void testHttp(){
public void testHttp() {
//iopointUploadService.getList();
}
private static void get() {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpClients.createDefault();
@ -100,6 +99,7 @@ public class TestApp {
}
}
}
private static void post() {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpClients.createDefault();
@ -127,9 +127,10 @@ public class TestApp {
for (Header str :
httpResponse.getHeaders("Set-Cookie")) {
System.out.println("name:"+str.getName()+",value:"+str.getValue());
System.out.println("name:" + str.getName() + ",value:" + str.getValue());
}
System.out.println();;
System.out.println();
;
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (ClientProtocolException e) {
@ -159,16 +160,16 @@ public class TestApp {
}
public static void test(){
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<String,Object> map = JSON.parseObject(str);
Map<String, Object> map = JSON.parseObject(str);
for (Object obj : map.keySet()){
for (Object obj : map.keySet()) {
Object value = map.get(obj);
System.out.println("key为："+obj+"值为："+value);
System.out.println("key为：" + obj + "值为：" + value);
}
String key ="rows";
String key = "rows";
List<JSONArray> jsonArrays = (List<JSONArray>) map.get(key);

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/gateway/util/UrlConstans.java
Unescape Escape View File

@ -25,7 +25,7 @@ public class UrlConstans {
*/
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_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";//推流

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/annotation/Topic.java
Unescape Escape View File

@ -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";

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MqttCallbackImpl.java
Unescape Escape View File

@ -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;
}

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgDecoder.java
Unescape Escape View File

@ -9,6 +9,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
public interface MsgDecoder<T> {
/**
* 下位机消息解码器
*
* @param msg
* @return
*/

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/MsgEncoder.java
Unescape Escape View File

@ -6,6 +6,7 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.common;
public interface MsgEncoder<T> {
/**
* 数据库消息编码为string
*
* @param t
* @return
*/

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/common/SuperConsumer.java
Unescape Escape View File

@ -21,7 +21,7 @@ public abstract class SuperConsumer<T> implements IMqttMessageListener, MsgDecod
msgHandler(topic, decoder);
} catch (Exception ex) {
//解决业务处理错误导致断线问题
log.error(topic+":解决业务处理错误导致断线问题");
log.error(topic + ":解决业务处理错误导致断线问题");
log.error(ex.toString());
}
});

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqConfig.java
Unescape Escape View File

@ -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<SubscriptTopic> topicMap = new ArrayList<>();
//得到所有使用@Topic注解的类
Map<String, Object> beansWithAnnotation = applicationContext.getBeansWithAnnotation(Topic.class);

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultEmqProperties.java
Unescape Escape View File

@ -5,6 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* 配置类
*
* @author jie
*/
@Data

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/config/DefaultMqttStarter.java
Unescape Escape View File

@ -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;

10
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/IMqttservice.java
Unescape Escape View File

@ -5,17 +5,19 @@ 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;
}

15
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/MqttDataHandler.java
Unescape Escape View File

@ -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,18 +14,11 @@ 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
@ -43,6 +35,7 @@ public class MqttDataHandler extends SuperConsumer<String> {
private MqttRecordService mqttRecordService;
@Resource
private MqttRecordMapper mqttRecordMapper;
@Override
public String decoder(MqttMessage msg) {
return new String(msg.getPayload());
@ -50,13 +43,13 @@ public class MqttDataHandler extends SuperConsumer<String> {
@Override
protected void msgHandler(String topic, String entity) {
log.debug("msgHandler"+":topic="+topic);
log.debug("entity:"+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) {
if (data != null) {
//根据设定转化
// try {
// String transfer = asyncService.transferBase(data,equipments.getEquipmentsId());

52
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/AsyncService.java
Unescape Escape View File

@ -1,21 +1,18 @@
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
@ -73,45 +70,52 @@ 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));
/**
* 系数
**/
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<String, String> getValueMap(MqttData data){
private Map<String, String> getValueMap(MqttData data) {
Map<String, String> valueMap = new HashMap<>();
for (String key: data.getDeviceData().keySet()){
valueMap.put(key,data.getDeviceData().get(key).getV());
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){
*/
private String transferBase(String value, String originBase, String transferBase) {
switch (transferBase) {
case "decimal": {
switch (originBase) {
case "binary":
value = convertBase(value,2,10);
value = convertBase(value, 2, 10);
break;
case "octal":
value = convertBase(value,8,10);
value = convertBase(value, 8, 10);
break;
case "hexadecimal":
value = convertBase(value,16,10);
value = convertBase(value, 16, 10);
case "hexfloat":
value = hexToDecimal(value);
}
}
break;
default:log.debug("数据未进行转换！：(value,originBase,transferBase)("+value+","+originBase+","+transferBase+")");
default:
log.debug("数据未进行转换！：(value,originBase,transferBase)(" + value + "," + originBase + "," + transferBase + ")");
}
return value;
}
private static String hexToDecimal(String value){
private static String hexToDecimal(String value) {
return String.valueOf(Integer.parseInt(value, 16));
}

40
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/consumer/impl/MqttserviceImpl.java
Unescape Escape View File

@ -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;
@ -50,31 +49,31 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
subscribeMysqlTopic();
}).start();
}
/**
*一次性定时器
* 一次性定时器
* 程序启动后去数据库找到所有需要订阅的topic 添加进client订阅
* */
*/
@Override
public void subscribeMysqlTopic(){
if(client.isConnected()){
public void subscribeMysqlTopic() {
if (client.isConnected()) {
List<GatewayDO> gatewayList = gatewayService.selectListByIsEnable(IsEnableConstant.IsEnableTrue);
for (GatewayDO gateway : gatewayList) {
if(StringUtils.isNotBlank(gateway.getTopic())){
if (StringUtils.isNotBlank(gateway.getTopic())) {
SubscriptTopic topic = new SubscriptTopic(gateway.getTopic(),
gateway.getTopic(), Pattern.QUEUE, 0, dataHandler );
gateway.getTopic(), Pattern.QUEUE, 0, dataHandler);
defaultBizTopicSet.getTopicMap().add(topic);
try {
client.subscribe(topic.getSubTopic(),0, dataHandler);
client.subscribe(topic.getSubTopic(), 0, dataHandler);
} catch (MqttException e) {
e.printStackTrace();
}
}
}
client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(),client,options));
client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options));
log.info("共订阅: " + defaultBizTopicSet.getTopicMap().size() + " 个主题!");
}
else{
} else {
log.error("Mqtt is not connected !");
}
@ -82,28 +81,29 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
/**
* 需要订阅的topic 添加进client订阅
* */
*/
@Override
public int subscribeTopic(String topic)throws MqttException{
SubscriptTopic subscriptTopic = new SubscriptTopic(topic, topic,Pattern.QUEUE, 0, dataHandler );
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));
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{
public int unsubscribeTopic(String topic) throws MqttException {
for (int i = 0; i < defaultBizTopicSet.getTopicMap().size(); i++) {
if(topic.equals(defaultBizTopicSet.getTopicMap().get(i).getSubTopic())){
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));
client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options));
return 0;
}

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Connect.java
Unescape Escape View File

@ -9,6 +9,7 @@ import lombok.ToString;
* <p> 设备上线
* 邮箱: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;
}

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Disconnect.java
Unescape Escape View File

@ -7,6 +7,7 @@ import lombok.ToString;
/**
* <p>设备下线
*
* @author jie
*/
@Data

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/MqttData.java
Unescape Escape View File

@ -13,7 +13,7 @@ import java.util.Map;
public class MqttData {
protected String deviceID;
protected String gatewayID;
protected Map<String,IoData> deviceData;
protected Map<String, IoData> deviceData;
protected String deviceDataTime;
}

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/entity/Pattern.java
Unescape Escape View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.entity;
/**
* 订阅模式
*
* @author jie
*/

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/ApplicationContextUtil.java
Unescape Escape View File

@ -27,6 +27,7 @@ public class ApplicationContextUtil {
/**
* 根据字节码获取bean
*
* @param clazz
* @param <T>
* @return
@ -37,6 +38,7 @@ public class ApplicationContextUtil {
/**
* 根据名字获取bean
*
* @param name
* @param <T>
* @return

112
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/DateUtils.java
Unescape Escape View File

@ -11,42 +11,45 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
/**
* 将本地时间, 转换成目标时区的时间
*
* @param sourceDate
* @return
*/
public static Date convertTimezone(Date sourceDate, String targetZoneId){
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);
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){
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){
public static Date convertTimezone(Date sourceDate, TimeZone sourceTimezone, TimeZone targetTimezone) {
// targetDate - sourceDate=targetTimezone-sourceTimezone
@ -54,33 +57,33 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
// targetDate=sourceDate + (targetTimezone-sourceTimezone)
Calendar calendar=Calendar.getInstance();
Calendar calendar = Calendar.getInstance();
// date.getTime() 为时间戳, 为格林尼治到系统现在的时间差,世界各个地方获取的时间戳是一样的,
// 格式化输出时,因为设置了不同的时区,所以输出不一样
long sourceTime=sourceDate.getTime();
long sourceTime = sourceDate.getTime();
calendar.setTimeZone(sourceTimezone);
calendar.setTimeInMillis(sourceTime);// 设置之后,calendar会计算各种filed对应的值,并保存
//获取源时区的到UTC的时区差
int sourceZoneOffset=calendar.get(Calendar.ZONE_OFFSET);
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); // 夏令时
int targetZoneOffset = calendar.get(Calendar.ZONE_OFFSET);
int targetDaylightOffset = calendar.get(Calendar.DST_OFFSET); // 夏令时
long targetTime=sourceTime+ (targetZoneOffset+targetDaylightOffset) -sourceZoneOffset;
long targetTime = sourceTime + (targetZoneOffset + targetDaylightOffset) - sourceZoneOffset;
return new Date(targetTime);
}
public static String addDateMinut(String day, int hour){
public static String addDateMinut(String day, int hour) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = null;
try {
@ -98,7 +101,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
return format.format(date);
}
public static String addDateDay(String time, int day){
public static String addDateDay(String time, int day) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = null;
try {
@ -117,7 +120,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
}
public static String addDateMonth(String day, int hour){
public static String addDateMonth(String day, int hour) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = null;
try {
@ -134,6 +137,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
cal = null;
return format.format(date);
}
public static String YYYY = "yyyy";
public static String YYYY_MM = "yyyy-MM";
@ -154,8 +158,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
*
* @return Date() 当前日期
*/
public static Date getNowDate()
{
public static Date getNowDate() {
return new Date();
}
@ -164,59 +167,50 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
*
* @return String
*/
public static String getDate()
{
public static String getDate() {
return dateTimeNow(YYYY_MM_DD);
}
public static String getMills()
{
public static String getMills() {
return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS);
}
public static String getMills(Date date)
{
public static String getMills(Date date) {
return parseDateToStr(YYYY_MM_DD_HH_MM_SS_SSS, date);
}
public static Long getMillsLong()
{
public static Long getMillsLong() {
return new Date().getTime();
}
public static Long getMillsLong(Date date)
{
public static Long getMillsLong(Date date) {
return date.getTime();
}
public static final String getTime()
{
public static final String getTime() {
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
}
public static final String dateTimeNow()
{
public static final String dateTimeNow() {
return dateTimeNow(YYYYMMDDHHMMSS);
}
public static final String dateTimeNow(final String format)
{
public static final String dateTimeNow(final String format) {
return parseDateToStr(format, new Date());
}
public static final String dateTime(final Date 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)
{
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
{
public static final Date dateTime(final String format, final String ts) {
try {
return new SimpleDateFormat(format).parse(ts);
}
catch (ParseException e)
{
} catch (ParseException e) {
throw new RuntimeException(e);
}
}
@ -224,8 +218,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* 日期路径 即年/月/日 如2018/08/08
*/
public static final String datePath()
{
public static final String datePath() {
Date now = new Date();
return DateFormatUtils.format(now, "yyyy/MM/dd");
}
@ -233,8 +226,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* 日期路径 即年/月/日 如20180808
*/
public static final String dateTime()
{
public static final String dateTime() {
Date now = new Date();
return DateFormatUtils.format(now, "yyyyMMdd");
}
@ -242,18 +234,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* 日期型字符串转化为日期 格式
*/
public static Date parseDate(Object str)
{
if (str == null)
{
public static Date parseDate(Object str) {
if (str == null) {
return null;
}
try
{
try {
return parseDate(str.toString(), parsePatterns);
}
catch (ParseException e)
{
} catch (ParseException e) {
return null;
}
}
@ -261,8 +248,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* 获取服务器启动时间
*/
public static Date getServerStartDate()
{
public static Date getServerStartDate() {
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
return new Date(time);
}
@ -270,8 +256,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* 计算两个时间差
*/
public static String getDatePoor(Date endDate, Date nowDate)
{
public static String getDatePoor(Date endDate, Date nowDate) {
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
@ -289,10 +274,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
return day + "天" + hour + "小时" + min + "分钟";
}
public static Long strToTimeStamp(String dateTime,String format) throws ParseException {
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");

5
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/MqttDataUtils.java
Unescape Escape View File

@ -3,16 +3,15 @@ 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){
public static MqttData parse(String entity) {
try {
MqttData data = JSON.parseObject(entity, MqttData.class);
return data;
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
log.error("MqttDataHandler.JSON.parseObject error:");
}

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/mqtt/utils/PubMessageUtils.java
Unescape Escape View File

@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;
/**
* 发布消息工具类
* 注意，直接注入client pub会报错 报错原因我也不知道 如果有大佬知道就请留言告知一下
*
* @author jie
*/
@Slf4j

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/framework/redis/RedisKeyConstants.java
Unescape Escape View File

@ -9,7 +9,7 @@ public interface RedisKeyConstants {
/**
* 序号的缓存
*
* <p>
* KEY 格式：trade_no:{prefix}
* VALUE 数据格式：编号自增
*/

7
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java
Unescape Escape View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save