optimize iot import

plp
chenshuichuan 2 years ago
parent 46f68077b8
commit 59d9d0ab3e

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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;
/**
* 线(01)
*
* <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;

@ -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-300S7-1500)
*
* <p>
* {@link TODO iot_siemens_type }
*/
private String siemensSeries;
@ -55,7 +54,7 @@ public class DeviceDO extends BaseDO {
private String siemensConnectParam;
/**
* (01)
*
* <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;
/**
* (01)
*
* <p>
* {@link TODO iot_1_or_0 }
*/
private String localPersistent;
/**
* (12)
*
* <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;
/**
* (01)
*
* <p>
* {@link TODO iot_1_or_0 }
*/
private String modbusReadAddrGap;
/**
* (0,1)
*
* <p>
* {@link TODO iot_1_or_0 }
*/
private String isUpload;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -12,6 +12,7 @@ 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<>();
static {
tdDataTypeMap.put("bool", "BOOL");
tdDataTypeMap.put("int8", "INT");
@ -88,19 +89,24 @@ public class AddressDataType {
mysqlDataTypeMap.put("date", "TIMESTAMP");
mysqlDataTypeMap.put("bcd", "double");
}
public static Map<String, String> getDataTypeMap() {
return tdDataTypeMap;
}
public static String getTdDataType(String originDataType) {
return tdDataTypeMap.get(originDataType);
}
public static String getTMysqlDataType(String originDataType) {
//return mysqlDataTypeMap.get(originDataType);
return "double(8,4)";
}
public static Map<String, Integer> getGatewayDataTypeMap() {
return gatewayDataTypeMap;
}
public static Integer getGatewayDataTypeMap(String originDataType) {
return gatewayDataTypeMap.get(originDataType);
}

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

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

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

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

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

@ -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;
@ -10,6 +9,7 @@ import java.util.List;
public interface GatewayMqttService {
public void login(String url, String username, String password);
//获取mqtt主题
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username, String password);

@ -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,6 +15,7 @@ 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);

@ -12,16 +12,20 @@ public interface ISiemensPointService {
//调用前统一登录保存cookies
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, String deviceId);
//下发单个设备
public int add(DeviceSiemensEntity siemens, String url);
//下发单个设备
public int add(List<DeviceSiemensEntity> list, String url);
//删除单个设备
public int delete(String url, String ids);
@ -34,7 +38,9 @@ public interface ISiemensPointService {
//下发点位
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);
@ -42,7 +48,6 @@ public interface ISiemensPointService {
public int deletePoint(String url, String ids);
//启用设备
public int changeStatusDevice(List<String> deviceIds, ChangeStatus changeStatus, String url);

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

@ -25,6 +25,7 @@ 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) {
@ -44,6 +45,7 @@ public class GatewayMqttServiceImpl implements GatewayMqttService {
HttpUtils.closeHttp(httpClient, httpResponse);
}
}
@Override
public List<MqttBrokerEntity> getMqttBrokerEntity(String url, String username, String password) {

@ -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,6 +39,7 @@ 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) {
@ -97,6 +98,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
return list;
}
/*获取西门子设备列表*/
@Override
public List<DeviceSiemensEntity> getSiemensList(String url, String username, String password, String deviceId) {
@ -211,7 +213,6 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
@Override
public List<SiemensPointEntity> getPointList(String url, String deviceConfigID, String username, String password) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
@ -247,12 +248,12 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
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();
@ -274,8 +275,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
} catch (Exception e) {
e.printStackTrace();
}
finally {
} finally {
HttpUtils.closeHttp(httpClient, httpResponse);
}
return 0;
@ -363,6 +363,7 @@ public class SiemensPointServiceImpl implements ISiemensPointService {
}
return count;
}
@Override
public List<SiemensPointEntity> getPointListAll(String url, String deviceConfigID, String username, String password) {
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();

@ -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;
@ -403,7 +401,6 @@ public class TheGatewayServiceImpl {
}
/*检测下发数据和实际下发数量是否匹配*/
public CommonResult<String> compare(GatewayDO gatewayDO, DeviceDO deviceDO, String type) {
String deviceConfigID = null;
@ -434,7 +431,9 @@ public class TheGatewayServiceImpl {
: CommonResult.success("下发成功!" + str);
}
/**网关登录测试*/
/**
*
*/
public CommonResult login(GatewayDO gateway) {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
@ -479,6 +478,7 @@ public class TheGatewayServiceImpl {
int code;
String msg;
}
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);

@ -25,6 +25,7 @@ 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) {

@ -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,55 +124,37 @@ 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());
@ -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()
{
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);
@ -337,6 +284,7 @@ public class HttpUtils
}
return httpGet;
}
public static boolean testNetworkConnected(String url) {
// 创建 HttpClient 客户端
CloseableHttpClient httpClient = HttpUtils.createSSLClientDefault();
@ -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];

@ -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;
@ -57,6 +55,7 @@ public class TestApp {
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();
@ -129,7 +129,8 @@ public class TestApp {
httpResponse.getHeaders("Set-Cookie")) {
System.out.println("name:" + str.getName() + ",value:" + str.getValue());
}
System.out.println();;
System.out.println();
;
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (ClientProtocolException e) {

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

@ -9,6 +9,7 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
public interface MsgDecoder<T> {
/**
*
*
* @param msg
* @return
*/

@ -6,6 +6,7 @@ package cn.iocoder.yudao.module.iot.framework.mqtt.common;
public interface MsgEncoder<T> {
/**
* string
*
* @param t
* @return
*/

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

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

@ -7,15 +7,17 @@ public interface IMqttservice {
/**
*
* topic client
* */
*/
public void subscribeMysqlTopic() throws Exception;
/**
* topic client
* */
*/
public int subscribeTopic(String topic) throws MqttException;
/**
* topic clienttopic
* */
*/
public int unsubscribeTopic(String topic) throws MqttException;
}

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

@ -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,13 +70,17 @@ public class AsyncService {
// else
// return null;
// }
/**系数**/
/**
*
**/
private String factor(String value, String factor) {
if (StringUtils.isNotBlank(factor)) {
return String.format("%.2f", Double.parseDouble(value) * Double.parseDouble(factor));
}
return value;
}
private Map<String, String> getValueMap(MqttData data) {
Map<String, String> valueMap = new HashMap<>();
for (String key : data.getDeviceData().keySet()) {
@ -87,9 +88,10 @@ public class AsyncService {
}
return valueMap;
}
/**
* java valuebinary,octal,hexadecimal,decimal
* */
*/
private String transferBase(String value, String originBase, String transferBase) {
switch (transferBase) {
case "decimal": {
@ -107,10 +109,12 @@ public class AsyncService {
}
}
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) {
return String.valueOf(Integer.parseInt(value, 16));
}

@ -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,10 +49,11 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
subscribeMysqlTopic();
}).start();
}
/**
*
* topic client
* */
*/
@Override
public void subscribeMysqlTopic() {
if (client.isConnected()) {
@ -73,8 +73,7 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
}
client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options));
log.info("共订阅: " + defaultBizTopicSet.getTopicMap().size() + " 个主题!");
}
else{
} else {
log.error("Mqtt is not connected !");
}
@ -82,7 +81,7 @@ 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);
@ -91,9 +90,10 @@ public class MqttserviceImpl implements IMqttservice, ApplicationListener<Applic
client.setCallback(new MqttCallbackImpl(defaultBizTopicSet.getTopicMap(), client, options));
return 0;
}
/**
* topic clienttopic
* */
*/
@Override
public int unsubscribeTopic(String topic) throws MqttException {
for (int i = 0; i < defaultBizTopicSet.getTopicMap().size(); i++) {

@ -9,6 +9,7 @@ import lombok.ToString;
* <p> 线
* :275236367@qq.com
* : 2020/1/4
*
* @author jie
*/
@Data

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

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

@ -14,6 +14,7 @@ import java.util.TimeZone;
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
/**
* ,
*
* @param sourceDate
* @return
*/
@ -30,6 +31,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* ,
*
* @param localDate
* @param targetTimezone
* @return
@ -41,6 +43,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
/**
* sourceDate
*
* @param sourceDate
* @param sourceTimezone sourceDate
* @param targetTimezone
@ -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;
@ -293,6 +278,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils{
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");

@ -3,7 +3,6 @@ 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 {

@ -10,6 +10,7 @@ import java.nio.charset.StandardCharsets;
/**
*
* client pub
*
* @author jie
*/
@Slf4j

@ -9,7 +9,7 @@ public interface RedisKeyConstants {
/**
*
*
* <p>
* KEY trade_no:{prefix}
* VALUE
*/

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

@ -1,34 +1,27 @@
package cn.iocoder.yudao.module.iot.service.device;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DevicePageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.DeviceSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.gateway.GatewayDO;
import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceAttributeMapper;
import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceMapper;
import cn.iocoder.yudao.module.iot.framework.constant.DeviceTypeEnum;
import cn.iocoder.yudao.module.iot.framework.gateway.service.impl.TheGatewayServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.*;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceAttributeDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.iot.dal.mysql.device.DeviceAttributeMapper;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DEVICE_ATTRIBUTE_NOT_EXISTS;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.DEVICE_NOT_EXISTS;
/**
* Service
@ -92,16 +85,16 @@ public class DeviceServiceImpl implements DeviceService {
public PageResult<DeviceDO> getDevicePage(DevicePageReqVO pageReqVO) {
return deviceMapper.selectPage(pageReqVO);
}
@Override
public CommonResult<String> pushDevice(DeviceDO deviceDO, GatewayDO gatewayDO) {
if (DeviceTypeEnum.isSiemens(deviceDO.getDeviceType())) {
return siemensAdd(deviceDO, gatewayDO);
}
else if(DeviceTypeEnum.isModbus(deviceDO.getDeviceType())){
} else if (DeviceTypeEnum.isModbus(deviceDO.getDeviceType())) {
return modbusAdd(deviceDO, gatewayDO);
} else return CommonResult.error(500, "未知类型设备!");
}
else return CommonResult.error(500,"未知类型设备!");
}
public CommonResult<String> siemensAdd(DeviceDO deviceDO, GatewayDO gatewayDO) {
if (gatewayDO != null && deviceDO != null &&
deviceDO.getDeviceCode() != null && gatewayDO.getGatewayCode() != null) {

@ -1,9 +1,9 @@
package cn.iocoder.yudao.module.iot.service.formula;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO;
import javax.validation.Valid;

@ -1,22 +1,18 @@
package cn.iocoder.yudao.module.iot.service.formula;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaRecordSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaRecordDO;
import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaRecordMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_RECORD_NOT_EXISTS;
/**
* Service

@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.iot.service.formula;
import javax.validation.Valid;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import javax.validation.Valid;
/**

@ -1,23 +1,23 @@
package cn.iocoder.yudao.module.iot.service.formula;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.*;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaMapper;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.formula.vo.FormulaSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.formula.FormulaDetailDO;
import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaDetailMapper;
import cn.iocoder.yudao.module.iot.dal.mysql.formula.FormulaMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_DETAIL_NOT_EXISTS;
import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.FORMULA_NOT_EXISTS;
/**
* Service

@ -1,10 +1,9 @@
package cn.iocoder.yudao.module.iot.service.frpc;
import java.util.*;
import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*;
import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.FrpcProxyServerSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO;
import javax.validation.Valid;

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

Loading…
Cancel
Save