自动生成代码

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/MybatisGeneratorUtils.java

@@ -43,10 +43,10 @@ public class MybatisGeneratorUtils {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://47.111.81.118:3306/dm?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://101.133.214.75:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("Yt2021");
+        dsc.setUsername("usky");
+        dsc.setPassword("Yt#75Usky");
         mpg.setDataSource(dsc);
 
         // 3、包配置
@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("sys_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dmp_data_event","dmp_data_info","dmp_device_info","dmp_device_status","dmp_product_attribute","dmp_product_attribute_attach","dmp_product_info","dmp_software_subpackage","dmp_software_upgrade");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/TestController.java

@@ -1,8 +0,0 @@
-package com.usky.iot.controller;//package com.usky.iot.controller;
-//
-//
-//import org.springframework.web.bind.annotation.RestController;
-//
-//@RestController
-//public class TestController {
-//}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDataEventController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 事件数据 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpDataEvent")
+public class DmpDataEventController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDataInfoController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 数据信息 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpDataInfo")
+public class DmpDataInfoController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceInfoController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备信息表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpDeviceInfo")
+public class DmpDeviceInfoController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceStatusController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备状态表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpDeviceStatus")
+public class DmpDeviceStatusController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductAttributeAttachController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 产品属性附表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpProductAttributeAttach")
+public class DmpProductAttributeAttachController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductAttributeController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 产品属性表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpProductAttribute")
+public class DmpProductAttributeController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpProductInfoController.java

@@ -0,0 +1,64 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.iot.domain.DmpProductInfo;
+import com.usky.iot.service.DmpProductInfoService;
+import com.usky.iot.service.vo.DmpProductInfoRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 产品信息表
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpProductInfo")
+public class DmpProductInfoController {
+
+
+    @Autowired
+    private DmpProductInfoService dmpProductInfoService;
+
+    /**
+     * 新增
+     * @param dmpProductInfo
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody DmpProductInfo dmpProductInfo){
+        dmpProductInfoService.add(dmpProductInfo);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param dmpProductInfo
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody DmpProductInfo dmpProductInfo){
+        dmpProductInfoService.update(dmpProductInfo);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 分页
+     * @param dmpProductInfoRequest
+     * @return
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<DmpProductInfo>> page(@RequestBody DmpProductInfoRequest dmpProductInfoRequest)
+    {
+        return ApiResult.success(dmpProductInfoService.page(dmpProductInfoRequest));
+    }
+
+
+
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpSoftwareSubpackageController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 软件分包信息表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpSoftwareSubpackage")
+public class DmpSoftwareSubpackageController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpSoftwareUpgradeController.java

@@ -0,0 +1,20 @@
+package com.usky.iot.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 软件升级信息表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@RestController
+@RequestMapping("/dmpSoftwareUpgrade")
+public class DmpSoftwareUpgradeController {
+
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/FileController.java

@@ -0,0 +1,92 @@
+package com.usky.iot.controller.web;
+
+import com.alibaba.nacos.common.utils.MD5Utils;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.core.util.FileUtils;
+import com.usky.common.core.util.GlobalUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Optional;
+
+/**
+ * 文件系统
+ * @author yq
+ * @date 2022/1/25 13:42
+ */
+@RestController
+@RequestMapping("file")
+@Slf4j
+public class FileController {
+
+
+    /**
+     * 上传文件
+     * @param multipartFile
+     * @param request
+     * @return
+     */
+    @RequestMapping("/upload")
+    public ApiResult<Void> upload(@RequestParam("file") MultipartFile multipartFile, HttpServletRequest request){
+        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
+        System.out.println(multipartFile.getSize());
+        cutFile(multipartFile,1024);
+        return ApiResult.success();
+    }
+
+
+    private static void cutFile(MultipartFile multipartFile, int num) {
+
+        InputStream inputStream = null;
+        try {
+            byte [] byteArr=multipartFile.getBytes();
+            inputStream = new ByteArrayInputStream(byteArr);
+            //创建规定大小的byte数组
+            byte[] b = new byte[num];
+            int len = 0;
+            //name为以后的小文件命名做准备
+            int name = 1;
+            //遍历将大文件读入byte数组中，当byte数组读满后写入对应的小文件中
+            while ((len = inputStream.read(b)) != -1) {
+                int chk = 0x0000;
+                for(int i=0;i<len;i++){
+                    chk += b[i]&0x00ff;
+                }
+                System.out.println(String.format("%04x", chk& 0x0000ffff));
+                name++;
+            }
+            String s = MD5Utils.md5Hex(byteArr);
+            System.out.println(s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != inputStream) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * 删除文件
+     * @param fileName
+     * @return
+     */
+    @RequestMapping("/delete")
+    public ApiResult<Boolean> delete(@RequestParam String fileName){
+        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), fileName);
+        return ApiResult.success(file.delete());
+    }
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/SysUserController.java

@@ -1,36 +0,0 @@
-package com.usky.iot.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.iot.domain.SysUser;
-import com.usky.iot.service.SysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户信息表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@RestController
-@RequestMapping("/sysUser")
-public class SysUserController {
-
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    @GetMapping("/list")
-    public ApiResult<List<SysUser>> list(){
-        return ApiResult.success(sysUserService.list());
-    }
-}
-

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDataEvent.java

@@ -0,0 +1,56 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 事件数据
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDataEvent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 事件类型
+     */
+    private Integer eventType;
+
+    /**
+     * 事件内容
+     */
+    private String eventContent;
+
+    /**
+     * 上报时间
+     */
+    private LocalDateTime reportTime;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDataInfo.java

@@ -0,0 +1,51 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 数据信息
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDataInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 数据内容
+     */
+    private String dataContent;
+
+    /**
+     * 上报时间
+     */
+    private LocalDateTime reportTime;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDeviceInfo.java

@@ -0,0 +1,106 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDeviceInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 物联网卡号
+     */
+    private String simCode;
+
+    /**
+     * 国际移动用户识别码
+     */
+    private String imsiCode;
+
+    /**
+     * 节点类型
+     */
+    private Integer nodeType;
+
+    /**
+     * 分组id
+     */
+    private Integer groupId;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDeviceStatus.java

@@ -0,0 +1,61 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备状态表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDeviceStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 设备状态;1：已注册，2：待激活，3：已激活，4：故障，5：告警，6：离线
+     */
+    private Integer deviceStatus;
+
+    /**
+     * 最后上线时间
+     */
+    private LocalDateTime lastOnlineTime;
+
+    /**
+     * 最后离线时间
+     */
+    private LocalDateTime lastOfflineTime;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpProductAttribute.java

@@ -0,0 +1,137 @@
+package com.usky.iot.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品属性表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProductAttribute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性标识
+     */
+    private String attributeCode;
+
+    /**
+     * 对应端口/属性ID
+     */
+    private Integer attributePort;
+
+    /**
+     * 属性类型;1：必选，2：可选
+     */
+    private Integer attributeType;
+
+    /**
+     * 数据类型
+     */
+    private Integer dataType;
+
+    /**
+     * 绑定状态;1：已绑定，2：未绑定
+     */
+    private Integer bindStatus;
+
+    /**
+     * 长度
+     */
+    private Integer attributeLength;
+
+    /**
+     * 单位
+     */
+    private Integer attributeUnit;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maximum;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minimum;
+
+    /**
+     * 时间格式
+     */
+    private String timeFormat;
+
+    /**
+     * 布尔值false
+     */
+    private String boolFalse;
+
+    /**
+     * 布尔值true
+     */
+    private String boolTrue;
+
+    /**
+     * 删除标识;0：未删除，1：已删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 描述
+     */
+    private String attributeDescribe;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpProductAttributeAttach.java

@@ -0,0 +1,45 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品属性附表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProductAttributeAttach implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 属性id
+     */
+    private Integer attributeId;
+
+    /**
+     * 参数值
+     */
+    private Integer parameterValue;
+
+    /**
+     * 参数描述
+     */
+    private String parameterDescribe;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpProductInfo.java

@@ -0,0 +1,136 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProductInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 接入方式
+     */
+    private Integer accessMode;
+
+    /**
+     * 网络类型
+     */
+    private Integer networkType;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 通信协议
+     */
+    private Integer comProtocol;
+
+    /**
+     * 认证方式
+     */
+    private String authMode;
+
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
+
+    /**
+     * 产品描述
+     */
+    private String productDescribe;
+
+    /**
+     * 厂家名称
+     */
+    private String factoryName;
+
+    /**
+     * 厂家联系人
+     */
+    private String factoryPerson;
+
+    /**
+     * 厂家联系电话
+     */
+    private String factoryPhone;
+
+    /**
+     * 资质证书1
+     */
+    private String certificateUrl1;
+
+    /**
+     * 资质证书2
+     */
+    private String certificateUrl2;
+
+    /**
+     * 资质证书3
+     */
+    private String certificateUrl3;
+
+    /**
+     * 协议文档
+     */
+    private String agreementUrl;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpSoftwareSubpackage.java

@@ -0,0 +1,59 @@
+package com.usky.iot.domain;
+
+import java.time.LocalDateTime;
+import java.sql.Blob;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 软件分包信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpSoftwareSubpackage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 主升级信息id
+     */
+    private Integer upgradeId;
+
+    /**
+     * 分包序号
+     */
+    private Integer subpackageNumber;
+
+    /**
+     * 应用程序数据包
+     */
+    private Blob applyPackage;
+
+    /**
+     * 分包大小
+     */
+    private String subpackageLength;
+
+    /**
+     * 从第一个数据包到当前的总校验值
+     */
+    private String checkCode;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpSoftwareUpgrade.java

@@ -0,0 +1,93 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 软件升级信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpSoftwareUpgrade implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 版本名称
+     */
+    private String versionName;
+
+    private String majorVersion;
+
+    /**
+     * 版本号
+     */
+    private String minorVersion;
+
+    /**
+     * 升级包大小（byte）
+     */
+    private Integer packageLength;
+
+    /**
+     * 校验码
+     */
+    private String checkCode;
+
+    /**
+     * 版本描述
+     */
+    private String versionDescribe;
+
+    /**
+     * 执行时间
+     */
+    private LocalDateTime implementTime;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/SysUser.java

@@ -1,123 +0,0 @@
-package com.usky.iot.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 用户信息表
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysUser implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 用户ID
-     */
-    @TableId(value = "user_id", type = IdType.AUTO)
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 用户账号
-     */
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    private String nickName;
-
-    /**
-     * 用户类型（00系统用户）
-     */
-    private String userType;
-
-    /**
-     * 用户邮箱
-     */
-    private String email;
-
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-
-    /**
-     * 用户性别（0男 1女 2未知）
-     */
-    private String sex;
-
-    /**
-     * 头像地址
-     */
-    private String avatar;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    private LocalDateTime loginDate;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDataEventMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpDataEvent;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 事件数据 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDataEventMapper extends CrudMapper<DmpDataEvent> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDataInfoMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpDataInfo;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 数据信息 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDataInfoMapper extends CrudMapper<DmpDataInfo> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 设备信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceStatusMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpDeviceStatus;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 设备状态表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDeviceStatusMapper extends CrudMapper<DmpDeviceStatus> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpProductAttributeAttachMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpProductAttributeAttach;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 产品属性附表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductAttributeAttachMapper extends CrudMapper<DmpProductAttributeAttach> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpProductAttributeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 产品属性表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductAttributeMapper extends CrudMapper<DmpProductAttribute> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpProductInfoMapper.java

@@ -0,0 +1,17 @@
+package com.usky.iot.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.iot.domain.DmpProductInfo;
+
+
+/**
+ * <p>
+ * 产品信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductInfoMapper extends CrudMapper<DmpProductInfo> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpSoftwareSubpackageMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpSoftwareSubpackage;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 软件分包信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpSoftwareSubpackageMapper extends CrudMapper<DmpSoftwareSubpackage> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpSoftwareUpgradeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.DmpSoftwareUpgrade;
+import com.usky.common.mvc.base.CrudMapper;
+
+/**
+ * <p>
+ * 软件升级信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpSoftwareUpgradeMapper extends CrudMapper<DmpSoftwareUpgrade> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/SysUserMapper.java

@@ -1,16 +0,0 @@
-package com.usky.iot.mapper;
-
-import com.usky.common.mybatis.core.CrudMapper;
-import com.usky.iot.domain.SysUser;
-
-/**
- * <p>
- * 用户信息表 Mapper 接口
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysUserMapper extends CrudMapper<SysUser> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDataEventService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpDataEvent;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 事件数据 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDataEventService extends CrudService<DmpDataEvent> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDataInfoService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpDataInfo;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 数据信息 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDataInfoService extends CrudService<DmpDataInfo> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceInfoService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 设备信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDeviceInfoService extends CrudService<DmpDeviceInfo> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceStatusService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpDeviceStatus;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 设备状态表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDeviceStatusService extends CrudService<DmpDeviceStatus> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductAttributeAttachService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpProductAttributeAttach;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 产品属性附表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductAttributeAttachService extends CrudService<DmpProductAttributeAttach> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductAttributeService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 产品属性表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductAttributeService extends CrudService<DmpProductAttribute> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpProductInfoService.java

@@ -0,0 +1,27 @@
+package com.usky.iot.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.domain.DmpProductInfo;
+import com.usky.iot.service.vo.DmpProductInfoRequest;
+
+/**
+ * <p>
+ * 产品信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpProductInfoService extends CrudService<DmpProductInfo> {
+
+
+    boolean add(DmpProductInfo dmpProductInfo);
+
+    boolean update(DmpProductInfo dmpProductInfo);
+
+    boolean checkNameUnique(DmpProductInfo dmpProductInfo);
+
+    CommonPage<DmpProductInfo> page(DmpProductInfoRequest dmpProductInfoRequest);
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpSoftwareSubpackageService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpSoftwareSubpackage;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 软件分包信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpSoftwareSubpackageService extends CrudService<DmpSoftwareSubpackage> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpSoftwareUpgradeService.java

@@ -0,0 +1,16 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.DmpSoftwareUpgrade;
+import com.usky.common.mvc.base.CrudService;
+
+/**
+ * <p>
+ * 软件升级信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpSoftwareUpgradeService extends CrudService<DmpSoftwareUpgrade> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/SysUserService.java

@@ -1,17 +0,0 @@
-package com.usky.iot.service;
-
-import com.usky.common.mybatis.core.CrudService;
-import com.usky.iot.domain.SysUser;
-
-
-/**
- * <p>
- * 用户信息表 服务类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysUserService extends CrudService<SysUser> {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDataEventServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpDataEvent;
+import com.usky.iot.mapper.DmpDataEventMapper;
+import com.usky.iot.service.DmpDataEventService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 事件数据 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpDataEventServiceImpl extends AbstractCrudService<DmpDataEventMapper, DmpDataEvent> implements DmpDataEventService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDataInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpDataInfo;
+import com.usky.iot.mapper.DmpDataInfoMapper;
+import com.usky.iot.service.DmpDataInfoService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 数据信息 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMapper, DmpDataInfo> implements DmpDataInfoService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.iot.mapper.DmpDeviceInfoMapper;
+import com.usky.iot.service.DmpDeviceInfoService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoMapper, DmpDeviceInfo> implements DmpDeviceInfoService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceStatusServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpDeviceStatus;
+import com.usky.iot.mapper.DmpDeviceStatusMapper;
+import com.usky.iot.service.DmpDeviceStatusService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备状态表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpDeviceStatusServiceImpl extends AbstractCrudService<DmpDeviceStatusMapper, DmpDeviceStatus> implements DmpDeviceStatusService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeAttachServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpProductAttributeAttach;
+import com.usky.iot.mapper.DmpProductAttributeAttachMapper;
+import com.usky.iot.service.DmpProductAttributeAttachService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 产品属性附表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpProductAttributeAttachServiceImpl extends AbstractCrudService<DmpProductAttributeAttachMapper, DmpProductAttributeAttach> implements DmpProductAttributeAttachService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductAttributeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.iot.mapper.DmpProductAttributeMapper;
+import com.usky.iot.service.DmpProductAttributeService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 产品属性表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpProductAttributeServiceImpl extends AbstractCrudService<DmpProductAttributeMapper, DmpProductAttribute> implements DmpProductAttributeService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpProductInfoServiceImpl.java

@@ -0,0 +1,67 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.domain.DmpProductInfo;
+import com.usky.iot.mapper.DmpProductInfoMapper;
+import com.usky.iot.service.DmpProductInfoService;
+import com.usky.iot.service.vo.DmpProductInfoRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * <p>
+ * 产品信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpProductInfoServiceImpl extends AbstractCrudService<DmpProductInfoMapper, DmpProductInfo> implements DmpProductInfoService {
+
+
+    @Override
+    public boolean add(DmpProductInfo dmpProductInfo) {
+        if (checkNameUnique(dmpProductInfo)){
+            throw new BusinessException("新增产品信息'" + dmpProductInfo.getProductName() + "'失败，产品信息已存在");
+        }
+        return this.save(dmpProductInfo);
+    }
+
+    @Override
+    public boolean update(DmpProductInfo dmpProductInfo) {
+        if (checkNameUnique(dmpProductInfo)){
+            throw new BusinessException("修改产品信息'" + dmpProductInfo.getProductName() + "'失败，产品信息已存在");
+        }
+        return this.updateById(dmpProductInfo);
+    }
+
+    @Override
+    public boolean checkNameUnique(DmpProductInfo dmpProductInfo) {
+        Integer id = null == dmpProductInfo.getId() ? -1 : dmpProductInfo.getId();
+        LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DmpProductInfo::getProductName,dmpProductInfo.getProductName())
+                .eq(DmpProductInfo::getDeleteFlag,0);
+        DmpProductInfo one = this.getOne(queryWrapper);
+        return null != one && !Objects.equals(one.getId(), id);
+    }
+
+    @Override
+    public CommonPage<DmpProductInfo> page(DmpProductInfoRequest piRequest) {
+        IPage<DmpProductInfo> page = new Page<>(piRequest.getCurrent(), piRequest.getSize());
+        LambdaQueryWrapper<DmpProductInfo> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery
+                .eq(StringUtils.isNotBlank(piRequest.getProductName()),DmpProductInfo::getProductName,piRequest.getProductName())
+                .eq(DmpProductInfo::getDeleteFlag,0);
+        page = this.page(page,lambdaQuery);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpSoftwareSubpackageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpSoftwareSubpackage;
+import com.usky.iot.mapper.DmpSoftwareSubpackageMapper;
+import com.usky.iot.service.DmpSoftwareSubpackageService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 软件分包信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpSoftwareSubpackageServiceImpl extends AbstractCrudService<DmpSoftwareSubpackageMapper, DmpSoftwareSubpackage> implements DmpSoftwareSubpackageService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpSoftwareUpgradeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.iot.service.impl;
+
+import com.usky.iot.domain.DmpSoftwareUpgrade;
+import com.usky.iot.mapper.DmpSoftwareUpgradeMapper;
+import com.usky.iot.service.DmpSoftwareUpgradeService;
+import com.usky.common.mvc.base.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 软件升级信息表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+@Service
+public class DmpSoftwareUpgradeServiceImpl extends AbstractCrudService<DmpSoftwareUpgradeMapper, DmpSoftwareUpgrade> implements DmpSoftwareUpgradeService {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/SysUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.iot.service.impl;
-
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.iot.domain.SysUser;
-import com.usky.iot.mapper.SysUserMapper;
-import com.usky.iot.service.SysUserService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户信息表 服务实现类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Service
-public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUser> implements SysUserService {
-
-}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/DmpProductInfoRequest.java

@@ -0,0 +1,21 @@
+package com.usky.iot.service.vo;
+
+import lombok.Data;
+
+@Data
+public class DmpProductInfoRequest {
+
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+}

service-iot/service-iot-biz/src/main/resources/mapper.iot/SysUserMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.iot.mapper.SysUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.iot.domain.SysUser">
-        <id column="user_id" property="userId" />
-        <result column="dept_id" property="deptId" />
-        <result column="user_name" property="userName" />
-        <result column="nick_name" property="nickName" />
-        <result column="user_type" property="userType" />
-        <result column="email" property="email" />
-        <result column="phonenumber" property="phonenumber" />
-        <result column="sex" property="sex" />
-        <result column="avatar" property="avatar" />
-        <result column="password" property="password" />
-        <result column="status" property="status" />
-        <result column="del_flag" property="delFlag" />
-        <result column="login_ip" property="loginIp" />
-        <result column="login_date" property="loginDate" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDataEventMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpDataEventMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpDataEvent">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="event_type" property="eventType" />
+        <result column="event_content" property="eventContent" />
+        <result column="report_time" property="reportTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDataInfoMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpDataInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpDataInfo">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="data_content" property="dataContent" />
+        <result column="report_time" property="reportTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpDeviceInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpDeviceInfo">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="device_type" property="deviceType" />
+        <result column="product_id" property="productId" />
+        <result column="sim_code" property="simCode" />
+        <result column="imsi_code" property="imsiCode" />
+        <result column="node_type" property="nodeType" />
+        <result column="group_id" property="groupId" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceStatusMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpDeviceStatusMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpDeviceStatus">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_code" property="deviceCode" />
+        <result column="product_id" property="productId" />
+        <result column="device_status" property="deviceStatus" />
+        <result column="last_online_time" property="lastOnlineTime" />
+        <result column="last_offline_time" property="lastOfflineTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpProductAttributeAttachMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpProductAttributeAttachMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpProductAttributeAttach">
+        <id column="id" property="id" />
+        <result column="attribute_id" property="attributeId" />
+        <result column="parameter_value" property="parameterValue" />
+        <result column="parameter_describe" property="parameterDescribe" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpProductAttributeMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpProductAttributeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpProductAttribute">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="attribute_name" property="attributeName" />
+        <result column="attribute_code" property="attributeCode" />
+        <result column="attribute_port" property="attributePort" />
+        <result column="attribute_type" property="attributeType" />
+        <result column="data_type" property="dataType" />
+        <result column="bind_status" property="bindStatus" />
+        <result column="attribute_length" property="attributeLength" />
+        <result column="attribute_unit" property="attributeUnit" />
+        <result column="maximum" property="maximum" />
+        <result column="minimum" property="minimum" />
+        <result column="time_format" property="timeFormat" />
+        <result column="bool_false" property="boolFalse" />
+        <result column="bool_true" property="boolTrue" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="attribute_describe" property="attributeDescribe" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpProductInfoMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpProductInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpProductInfo">
+        <id column="id" property="id" />
+        <result column="product_name" property="productName" />
+        <result column="access_mode" property="accessMode" />
+        <result column="network_type" property="networkType" />
+        <result column="device_type" property="deviceType" />
+        <result column="com_protocol" property="comProtocol" />
+        <result column="auth_mode" property="authMode" />
+        <result column="device_model" property="deviceModel" />
+        <result column="product_describe" property="productDescribe" />
+        <result column="factory_name" property="factoryName" />
+        <result column="factory_person" property="factoryPerson" />
+        <result column="factory_phone" property="factoryPhone" />
+        <result column="certificate_url1" property="certificateUrl1" />
+        <result column="certificate_url2" property="certificateUrl2" />
+        <result column="certificate_url3" property="certificateUrl3" />
+        <result column="agreement_url" property="agreementUrl" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpSoftwareSubpackageMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpSoftwareSubpackageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpSoftwareSubpackage">
+        <result column="id" property="id" />
+        <result column="upgrade_id" property="upgradeId" />
+        <result column="subpackage_number" property="subpackageNumber" />
+        <result column="apply_package" property="applyPackage" />
+        <result column="subpackage_length" property="subpackageLength" />
+        <result column="check_code" property="checkCode" />
+        <result column="created_time" property="createdTime" />
+    </resultMap>
+
+</mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpSoftwareUpgradeMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.iot.mapper.DmpSoftwareUpgradeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.DmpSoftwareUpgrade">
+        <id column="id" property="id" />
+        <result column="product_id" property="productId" />
+        <result column="version_name" property="versionName" />
+        <result column="major_version" property="majorVersion" />
+        <result column="minor_version" property="minorVersion" />
+        <result column="package_length" property="packageLength" />
+        <result column="check_code" property="checkCode" />
+        <result column="version_describe" property="versionDescribe" />
+        <result column="implement_time" property="implementTime" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

usky-module-demo/usky-module-demo-biz/src/main/java/com/usky/demo/MybatisGenerator.java

@@ -94,7 +94,7 @@ public class MybatisGenerator {
             @Override
             public String outputFile(TableInfo tableInfo) {
                 // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return finalProjectPath + "/src/main/resources/mapper.demo" + "/"
+                return finalProjectPath + "/src/main/resources/mapper/demo" + "/"
                         + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
             }
         });