iot-production模块ioTDA表结构生成

hx-common/code-generator/src/main/java/com/fjhx/generator/CodeGenerator.java

@@ -80,13 +80,13 @@ public class CodeGenerator {
         // 包配置
         PackageConfig pc = new PackageConfig();
         pc.setParent(parent);// 包路径
-        pc.setModuleName(moduleName); //模块名
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setXml("mapper");
-        pc.setEntity("entity");
-        pc.setController("controller");
+//        pc.setModuleName(moduleName); //模块名
+        pc.setService("service." + moduleName);
+        pc.setServiceImpl("service." + moduleName + ".impl");
+        pc.setMapper("mapper." + moduleName);
+        pc.setXml("mapper." + moduleName);
+//        pc.setEntity("entity");
+        pc.setController("controller." + moduleName);
         mpg.setPackageInfo(pc);
 
         // 策略配置

hx-service-api/iot-production-api/src/main/java/com/fjhx/entity/tda/TdaApplication.java

@@ -0,0 +1,44 @@
+package com.fjhx.entity.tda;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaApplication extends BaseEntity {
+
+
+    /**
+     * 华为tda资源空间id
+     */
+    private String appId;
+
+    /**
+     * 华为tda资源空间名称
+     */
+    private String appName;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/entity/tda/TdaDevice.java

@@ -0,0 +1,74 @@
+package com.fjhx.entity.tda;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaDevice extends BaseEntity {
+
+
+    /**
+     * 资源空间表id
+     */
+    private Long tdaApplicationId;
+
+    /**
+     * 华为tda资源空间id
+     */
+    private String appId;
+
+    /**
+     * 产品表id
+     */
+    private Long tdaProductId;
+
+    /**
+     * 华为tda产品id
+     */
+    private String productId;
+
+    /**
+     * 设备节点（设备标识）
+     */
+    private String nodeId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备id
+     */
+    private String deviceId;
+
+    /**
+     * 设备密匙
+     */
+    private String secret;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/entity/tda/TdaProduct.java

@@ -0,0 +1,64 @@
+package com.fjhx.entity.tda;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaProduct extends BaseEntity {
+
+
+    /**
+     * 资源空间表id
+     */
+    private Long tdaApplicationId;
+
+    /**
+     * 华为tda资源空间id
+     */
+    private String appId;
+
+    /**
+     * 华为tda产品id
+     */
+    private String productId;
+
+    /**
+     * 华为tda产品名称
+     */
+    private String name;
+
+    /**
+     * 华为tda产品设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 华为tda产品厂商名称
+     */
+    private String manufacturerName;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaApplicationEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaApplication;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaApplicationEx extends TdaApplication {
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaApplicationVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaApplication;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaApplicationVo extends TdaApplication {
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaDeviceEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaDevice;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaDeviceEx extends TdaDevice {
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaDeviceVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaDevice;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaDeviceVo extends TdaDevice {
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaProductEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaProduct;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaProductEx extends TdaProduct {
+
+}

hx-service-api/iot-production-api/src/main/java/com/fjhx/params/tda/TdaProductVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.tda;
+
+import com.fjhx.entity.tda.TdaProduct;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TdaProductVo extends TdaProduct {
+
+}

hx-service/iot-management/src/main/java/com/fjhx/bom/controller/BomController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/bom/BomController.java

@@ -1,7 +1,7 @@
-package com.fjhx.bom.controller;
+package com.fjhx.controller.bom;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.bom.service.BomService;
+import com.fjhx.service.bom.BomService;
 import com.fjhx.params.bom.BomEx;
 import com.fjhx.params.bom.BomVo;
 import org.springblade.core.tool.api.R;

hx-service/iot-management/src/main/java/com/fjhx/bom/controller/BomDetailsController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/bom/BomDetailsController.java

@@ -1,7 +1,7 @@
-package com.fjhx.bom.controller;
+package com.fjhx.controller.bom;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.bom.service.BomDetailsService;
+import com.fjhx.service.bom.BomDetailsService;
 import com.fjhx.entity.bom.BomDetails;
 import com.fjhx.params.bom.BomDetailsVo;
 import org.springblade.core.tool.api.R;

hx-service/iot-management/src/main/java/com/fjhx/material/controller/MaterialExController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/material/MaterialExController.java

@@ -1,7 +1,7 @@
-package com.fjhx.material.controller;
+package com.fjhx.controller.material;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.material.service.MaterialExService;
+import com.fjhx.service.material.MaterialExService;
 import com.fjhx.service.MaterialService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

hx-service/iot-management/src/main/java/com/fjhx/product/controller/ProductExController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/product/ProductExController.java

@@ -1,7 +1,7 @@
-package com.fjhx.product.controller;
+package com.fjhx.controller.product;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.product.service.ProductExService;
+import com.fjhx.service.product.ProductExService;
 import com.fjhx.service.ProductService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;

hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionLineController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/production/ProductionLineController.java

@@ -1,9 +1,9 @@
-package com.fjhx.production.controller;
+package com.fjhx.controller.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.params.production.ProductionLineEx;
 import com.fjhx.params.production.ProductionLineVo;
-import com.fjhx.production.service.ProductionLineService;
+import com.fjhx.service.production.ProductionLineService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/iot-management/src/main/java/com/fjhx/production/controller/ProductionWorkshopController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/production/ProductionWorkshopController.java

@@ -1,10 +1,10 @@
-package com.fjhx.production.controller;
+package com.fjhx.controller.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.production.ProductionWorkshop;
 import com.fjhx.params.production.ProductionWorkshopEx;
 import com.fjhx.params.production.ProductionWorkshopVo;
-import com.fjhx.production.service.ProductionWorkshopService;
+import com.fjhx.service.production.ProductionWorkshopService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingProcedureController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/working/WorkingProcedureController.java

@@ -1,9 +1,9 @@
-package com.fjhx.working.controller;
+package com.fjhx.controller.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.working.WorkingProcedure;
 import com.fjhx.params.working.WorkingProcedureVo;
-import com.fjhx.working.service.WorkingProcedureService;
+import com.fjhx.service.working.WorkingProcedureService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/working/WorkingRouteController.java

@@ -1,9 +1,9 @@
-package com.fjhx.working.controller;
+package com.fjhx.controller.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.params.working.WorkingRouteEx;
 import com.fjhx.params.working.WorkingRouteVo;
-import com.fjhx.working.service.WorkingRouteService;
+import com.fjhx.service.working.WorkingRouteService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

hx-service/iot-management/src/main/java/com/fjhx/working/controller/WorkingRouteProcedureController.java → hx-service/iot-management/src/main/java/com/fjhx/controller/working/WorkingRouteProcedureController.java

@@ -1,10 +1,10 @@
-package com.fjhx.working.controller;
+package com.fjhx.controller.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springblade.core.tool.api.R;
 import com.fjhx.entity.working.WorkingRouteProcedure;
 import com.fjhx.params.working.WorkingRouteProcedureVo;
-import com.fjhx.working.service.WorkingRouteProcedureService;
+import com.fjhx.service.working.WorkingRouteProcedureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

hx-service/iot-management/src/main/java/com/fjhx/bom/mapper/BomDetailsMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/bom/BomDetailsMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.bom.mapper;
+package com.fjhx.mapper.bom;
 
 import com.fjhx.entity.bom.BomDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/bom/mapper/BomDetailsMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/bom/BomDetailsMapper.xml

@@ -1,5 +1,5 @@
 <?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.fjhx.bom.mapper.BomDetailsMapper">
+<mapper namespace="com.fjhx.mapper.bom.BomDetailsMapper">
 
 </mapper>

hx-service/iot-management/src/main/java/com/fjhx/bom/mapper/BomMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/bom/BomMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.bom.mapper;
+package com.fjhx.mapper.bom;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/bom/mapper/BomMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/bom/BomMapper.xml

@@ -1,6 +1,6 @@
 <?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.fjhx.bom.mapper.BomMapper">
+<mapper namespace="com.fjhx.mapper.bom.BomMapper">
 
     <select id="getPage" resultType="com.fjhx.params.bom.BomEx">
         select b.id,

hx-service/iot-management/src/main/java/com/fjhx/material/mapper/MaterialExMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/material/MaterialExMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.mapper;
+package com.fjhx.mapper.material;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/material/mapper/MaterialExMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/material/MaterialExMapper.xml

@@ -1,6 +1,6 @@
 <?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.fjhx.material.mapper.MaterialExMapper">
+<mapper namespace="com.fjhx.mapper.material.MaterialExMapper">
 
     <select id="getPage" resultType="java.util.LinkedHashMap">
         select m.id,

hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/product/ProductExMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.product.mapper;
+package com.fjhx.mapper.product;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/product/mapper/ProductExMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/product/ProductExMapper.xml

@@ -1,6 +1,6 @@
 <?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.fjhx.product.mapper.ProductExMapper">
+<mapper namespace="com.fjhx.mapper.product.ProductExMapper">
 
     <select id="getPage" resultType="java.util.LinkedHashMap">
         select p.id,

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionLineMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/production/ProductionLineMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.mapper;
+package com.fjhx.mapper.production;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionLineMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/production/ProductionLineMapper.xml

@@ -1,6 +1,6 @@
 <?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.fjhx.production.mapper.ProductionLineMapper">
+<mapper namespace="com.fjhx.mapper.production.ProductionLineMapper">
 
     <select id="getPage" resultType="com.fjhx.params.production.ProductionLineEx">
         select pl.id,

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionWorkshopMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/production/ProductionWorkshopMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.mapper;
+package com.fjhx.mapper.production;
 
 import com.fjhx.entity.production.ProductionWorkshop;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/production/mapper/ProductionWorkshopMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/production/ProductionWorkshopMapper.xml

@@ -1,5 +1,5 @@
 <?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.fjhx.production.mapper.ProductionWorkshopMapper">
+<mapper namespace="com.fjhx.mapper.production.ProductionWorkshopMapper">
 
 </mapper>

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingProcedureMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.mapper;
+package com.fjhx.mapper.working;
 
 import com.fjhx.entity.working.WorkingProcedure;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingProcedureMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingProcedureMapper.xml

@@ -1,5 +1,5 @@
 <?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.fjhx.working.mapper.WorkingProcedureMapper">
+<mapper namespace="com.fjhx.mapper.working.WorkingProcedureMapper">
 
 </mapper>

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingRouteMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.mapper;
+package com.fjhx.mapper.working;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingRouteMapper.xml

@@ -1,6 +1,6 @@
 <?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.fjhx.working.mapper.WorkingRouteMapper">
+<mapper namespace="com.fjhx.mapper.working.WorkingRouteMapper">
 
     <select id="getPage" resultType="com.fjhx.params.working.WorkingRouteEx">
         select wr.id,

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.java → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingRouteProcedureMapper.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.mapper;
+package com.fjhx.mapper.working;
 
 import com.fjhx.entity.working.WorkingRouteProcedure;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

hx-service/iot-management/src/main/java/com/fjhx/working/mapper/WorkingRouteProcedureMapper.xml → hx-service/iot-management/src/main/java/com/fjhx/mapper/working/WorkingRouteProcedureMapper.xml

@@ -1,5 +1,5 @@
 <?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.fjhx.working.mapper.WorkingRouteProcedureMapper">
+<mapper namespace="com.fjhx.mapper.working.WorkingRouteProcedureMapper">
 
 </mapper>

hx-service/iot-management/src/main/java/com/fjhx/bom/service/BomDetailsService.java → hx-service/iot-management/src/main/java/com/fjhx/service/bom/BomDetailsService.java

@@ -1,4 +1,4 @@
-package com.fjhx.bom.service;
+package com.fjhx.service.bom;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.bom.BomDetails;

hx-service/iot-management/src/main/java/com/fjhx/bom/service/BomService.java → hx-service/iot-management/src/main/java/com/fjhx/service/bom/BomService.java

@@ -1,4 +1,4 @@
-package com.fjhx.bom.service;
+package com.fjhx.service.bom;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

hx-service/iot-management/src/main/java/com/fjhx/bom/service/impl/BomDetailsServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/bom/impl/BomDetailsServiceImpl.java

@@ -1,13 +1,13 @@
-package com.fjhx.bom.service.impl;
+package com.fjhx.service.bom.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.bom.mapper.BomDetailsMapper;
+import com.fjhx.mapper.bom.BomDetailsMapper;
 import com.fjhx.utils.WrapperUtil;
 import com.fjhx.entity.bom.BomDetails;
 import com.fjhx.params.bom.BomDetailsVo;
-import com.fjhx.bom.service.BomDetailsService;
+import com.fjhx.service.bom.BomDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

hx-service/iot-management/src/main/java/com/fjhx/bom/service/impl/BomServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/bom/impl/BomServiceImpl.java

@@ -1,12 +1,12 @@
-package com.fjhx.bom.service.impl;
+package com.fjhx.service.bom.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.BaseEntity;
-import com.fjhx.bom.mapper.BomMapper;
-import com.fjhx.bom.service.BomService;
+import com.fjhx.mapper.bom.BomMapper;
+import com.fjhx.service.bom.BomService;
 import com.fjhx.constant.IotManagementLockConstant;
 import com.fjhx.constants.ErrorMsgConstant;
 import com.fjhx.constants.StatusConstant;

hx-service/iot-management/src/main/java/com/fjhx/material/service/MaterialExService.java → hx-service/iot-management/src/main/java/com/fjhx/service/material/MaterialExService.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.service;
+package com.fjhx.service.material;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

hx-service/iot-management/src/main/java/com/fjhx/material/service/impl/MaterialExServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/material/impl/MaterialExServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.service.impl;
+package com.fjhx.service.material.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.material.MaterialEx;
-import com.fjhx.material.mapper.MaterialExMapper;
-import com.fjhx.material.service.MaterialExService;
+import com.fjhx.mapper.material.MaterialExMapper;
+import com.fjhx.service.material.MaterialExService;
 import com.fjhx.params.MaterialVo;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.MaterialService;

hx-service/iot-management/src/main/java/com/fjhx/product/service/ProductExService.java → hx-service/iot-management/src/main/java/com/fjhx/service/product/ProductExService.java

@@ -1,4 +1,4 @@
-package com.fjhx.product.service;
+package com.fjhx.service.product;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

hx-service/iot-management/src/main/java/com/fjhx/product/service/impl/ProductExServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/product/impl/ProductExServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.product.service.impl;
+package com.fjhx.service.product.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.product.ProductEx;
 import com.fjhx.params.ProductVo;
-import com.fjhx.product.mapper.ProductExMapper;
-import com.fjhx.product.service.ProductExService;
+import com.fjhx.mapper.product.ProductExMapper;
+import com.fjhx.service.product.ProductExService;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.ProductService;
 import com.fjhx.utils.WrapperUtil;

hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionLineService.java → hx-service/iot-management/src/main/java/com/fjhx/service/production/ProductionLineService.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.service;
+package com.fjhx.service.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

hx-service/iot-management/src/main/java/com/fjhx/production/service/ProductionWorkshopService.java → hx-service/iot-management/src/main/java/com/fjhx/service/production/ProductionWorkshopService.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.service;
+package com.fjhx.service.production;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionLineServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/production/impl/ProductionLineServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.service.impl;
+package com.fjhx.service.production.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.production.ProductionLine;
 import com.fjhx.params.production.ProductionLineEx;
 import com.fjhx.params.production.ProductionLineVo;
-import com.fjhx.production.mapper.ProductionLineMapper;
-import com.fjhx.production.service.ProductionLineService;
+import com.fjhx.mapper.production.ProductionLineMapper;
+import com.fjhx.service.production.ProductionLineService;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 

hx-service/iot-management/src/main/java/com/fjhx/production/service/impl/ProductionWorkshopServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/production/impl/ProductionWorkshopServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.production.service.impl;
+package com.fjhx.service.production.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,8 +8,8 @@ import com.fjhx.base.BaseEntity;
 import com.fjhx.entity.production.ProductionWorkshop;
 import com.fjhx.params.production.ProductionWorkshopEx;
 import com.fjhx.params.production.ProductionWorkshopVo;
-import com.fjhx.production.mapper.ProductionWorkshopMapper;
-import com.fjhx.production.service.ProductionWorkshopService;
+import com.fjhx.mapper.production.ProductionWorkshopMapper;
+import com.fjhx.service.production.ProductionWorkshopService;
 import com.fjhx.utils.HxBeanUtil;
 import com.fjhx.utils.UserClientUtil;
 import com.fjhx.utils.WrapperUtil;

hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingProcedureService.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/WorkingProcedureService.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.service;
+package com.fjhx.service.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.working.WorkingProcedure;

hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteProcedureService.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/WorkingRouteProcedureService.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.service;
+package com.fjhx.service.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.working.WorkingRouteProcedure;

hx-service/iot-management/src/main/java/com/fjhx/working/service/WorkingRouteService.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/WorkingRouteService.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.service;
+package com.fjhx.service.working;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.working.WorkingRoute;

hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingProcedureServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/impl/WorkingProcedureServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.service.impl;
+package com.fjhx.service.working.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -9,8 +9,8 @@ import com.fjhx.entity.working.WorkingProcedure;
 import com.fjhx.params.working.WorkingProcedureVo;
 import com.fjhx.utils.FileClientUtil;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.working.mapper.WorkingProcedureMapper;
-import com.fjhx.working.service.WorkingProcedureService;
+import com.fjhx.mapper.working.WorkingProcedureMapper;
+import com.fjhx.service.working.WorkingProcedureService;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteProcedureServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/impl/WorkingRouteProcedureServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.working.service.impl;
+package com.fjhx.service.working.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.WrapperUtil;
 import com.fjhx.entity.working.WorkingRouteProcedure;
 import com.fjhx.params.working.WorkingRouteProcedureVo;
-import com.fjhx.working.mapper.WorkingRouteProcedureMapper;
-import com.fjhx.working.service.WorkingRouteProcedureService;
+import com.fjhx.mapper.working.WorkingRouteProcedureMapper;
+import com.fjhx.service.working.WorkingRouteProcedureService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

hx-service/iot-management/src/main/java/com/fjhx/working/service/impl/WorkingRouteServiceImpl.java → hx-service/iot-management/src/main/java/com/fjhx/service/working/impl/WorkingRouteServiceImpl.java

@@ -1,8 +1,7 @@
-package com.fjhx.working.service.impl;
+package com.fjhx.service.working.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,17 +12,16 @@ import com.fjhx.entity.working.WorkingRoute;
 import com.fjhx.entity.working.WorkingRouteProcedure;
 import com.fjhx.params.working.WorkingRouteEx;
 import com.fjhx.params.working.WorkingRouteVo;
-import com.fjhx.product.service.ProductExService;
+import com.fjhx.service.product.ProductExService;
 import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.working.mapper.WorkingRouteMapper;
-import com.fjhx.working.service.WorkingRouteProcedureService;
-import com.fjhx.working.service.WorkingRouteService;
+import com.fjhx.mapper.working.WorkingRouteMapper;
+import com.fjhx.service.working.WorkingRouteProcedureService;
+import com.fjhx.service.working.WorkingRouteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

hx-service/iot-production/pom.xml

@@ -24,6 +24,11 @@
         </dependency>
 
         <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>iot-production-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>com.huaweicloud.sdk</groupId>
             <artifactId>huaweicloud-sdk-core</artifactId>
             <version>3.0.92</version>

hx-service/iot-production/src/main/java/com/fjhx/IoTDA/IoTDAConfig.java → hx-service/iot-production/src/main/java/com/fjhx/config/IoTDAConfig.java

@@ -1,4 +1,4 @@
-package com.fjhx.IoTDA;
+package com.fjhx.config;
 
 import com.huaweicloud.sdk.core.auth.ICredential;
 import com.huaweicloud.sdk.iotda.v5.IoTDAClient;

hx-service/iot-production/src/main/java/com/fjhx/controller/tda/TdaApplicationController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.tda.TdaApplication;
+import com.fjhx.params.tda.TdaApplicationVo;
+import com.fjhx.service.tda.TdaApplicationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@RestController
+@RequestMapping("/tdaApplication")
+public class TdaApplicationController {
+
+    @Autowired
+    private TdaApplicationService tdaApplicationService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<TdaApplication> result = tdaApplicationService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody TdaApplicationVo tdaApplicationVo){
+        tdaApplicationService.add(tdaApplicationVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody TdaApplicationVo tdaApplicationVo){
+        tdaApplicationService.edit(tdaApplicationVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody TdaApplicationVo tdaApplicationVo){
+        tdaApplicationService.delete(tdaApplicationVo);
+        return R.success();
+    }
+
+}
+

hx-service/iot-production/src/main/java/com/fjhx/controller/tda/TdaDeviceController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.tda.TdaDevice;
+import com.fjhx.params.tda.TdaDeviceVo;
+import com.fjhx.service.tda.TdaDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@RestController
+@RequestMapping("/tdaDevice")
+public class TdaDeviceController {
+
+    @Autowired
+    private TdaDeviceService tdaDeviceService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<TdaDevice> result = tdaDeviceService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody TdaDeviceVo tdaDeviceVo){
+        tdaDeviceService.add(tdaDeviceVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody TdaDeviceVo tdaDeviceVo){
+        tdaDeviceService.edit(tdaDeviceVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody TdaDeviceVo tdaDeviceVo){
+        tdaDeviceService.delete(tdaDeviceVo);
+        return R.success();
+    }
+
+}
+

hx-service/iot-production/src/main/java/com/fjhx/controller/tda/TdaProductController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.tda.TdaProduct;
+import com.fjhx.params.tda.TdaProductVo;
+import com.fjhx.service.tda.TdaProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@RestController
+@RequestMapping("/tdaProduct")
+public class TdaProductController {
+
+    @Autowired
+    private TdaProductService tdaProductService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition){
+        Page<TdaProduct> result = tdaProductService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody TdaProductVo tdaProductVo){
+        tdaProductService.add(tdaProductVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody TdaProductVo tdaProductVo){
+        tdaProductService.edit(tdaProductVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody TdaProductVo tdaProductVo){
+        tdaProductService.delete(tdaProductVo);
+        return R.success();
+    }
+
+}
+

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaApplicationMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.tda;
+
+import com.fjhx.entity.tda.TdaApplication;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaApplicationMapper extends BaseMapper<TdaApplication> {
+
+}

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaApplicationMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.tda.TdaApplicationMapper">
+
+</mapper>

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.tda;
+
+import com.fjhx.entity.tda.TdaDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaDeviceMapper extends BaseMapper<TdaDevice> {
+
+}

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaDeviceMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.tda.TdaDeviceMapper">
+
+</mapper>

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaProductMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.tda;
+
+import com.fjhx.entity.tda.TdaProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaProductMapper extends BaseMapper<TdaProduct> {
+
+}

hx-service/iot-production/src/main/java/com/fjhx/mapper/tda/TdaProductMapper.xml

@@ -0,0 +1,5 @@
+<?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.fjhx.mapper.tda.TdaProductMapper">
+
+</mapper>

hx-service/iot-production/src/main/java/com/fjhx/service/tda/TdaApplicationService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.tda.TdaApplication;
+import com.fjhx.params.tda.TdaApplicationVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaApplicationService extends BaseService<TdaApplication> {
+
+    Page<TdaApplication> getPage(Map<String, String> condition);
+
+    void add(TdaApplicationVo tdaApplicationVo);
+
+    void edit(TdaApplicationVo tdaApplicationVo);
+
+    void delete(TdaApplicationVo tdaApplicationVo);
+
+}

hx-service/iot-production/src/main/java/com/fjhx/service/tda/TdaDeviceService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.tda.TdaDevice;
+import com.fjhx.params.tda.TdaDeviceVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaDeviceService extends BaseService<TdaDevice> {
+
+    Page<TdaDevice> getPage(Map<String, String> condition);
+
+    void add(TdaDeviceVo tdaDeviceVo);
+
+    void edit(TdaDeviceVo tdaDeviceVo);
+
+    void delete(TdaDeviceVo tdaDeviceVo);
+
+}

hx-service/iot-production/src/main/java/com/fjhx/service/tda/TdaProductService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.tda;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.tda.TdaProduct;
+import com.fjhx.params.tda.TdaProductVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+public interface TdaProductService extends BaseService<TdaProduct> {
+
+    Page<TdaProduct> getPage(Map<String, String> condition);
+
+    void add(TdaProductVo tdaProductVo);
+
+    void edit(TdaProductVo tdaProductVo);
+
+    void delete(TdaProductVo tdaProductVo);
+
+}

hx-service/iot-production/src/main/java/com/fjhx/service/tda/impl/TdaApplicationServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.service.tda.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.tda.TdaApplication;
+import com.fjhx.params.tda.TdaApplicationVo;
+import com.fjhx.mapper.tda.TdaApplicationMapper;
+import com.fjhx.service.tda.TdaApplicationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Service
+public class TdaApplicationServiceImpl extends ServiceImpl<TdaApplicationMapper, TdaApplication> implements TdaApplicationService {
+
+    @Override
+    public Page<TdaApplication> getPage(Map<String, String> condition) {
+
+        QueryWrapper<TdaApplication> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<TdaApplication> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(TdaApplicationVo tdaApplicationVo) {
+        save(tdaApplicationVo);
+    }
+
+    @Override
+    public void edit(TdaApplicationVo tdaApplicationVo) {
+        updateById(tdaApplicationVo);
+    }
+
+    @Override
+    public void delete(TdaApplicationVo tdaApplicationVo) {
+        removeById(tdaApplicationVo.getId());
+    }
+
+}

hx-service/iot-production/src/main/java/com/fjhx/service/tda/impl/TdaDeviceServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.service.tda.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.tda.TdaDevice;
+import com.fjhx.params.tda.TdaDeviceVo;
+import com.fjhx.mapper.tda.TdaDeviceMapper;
+import com.fjhx.service.tda.TdaDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Service
+public class TdaDeviceServiceImpl extends ServiceImpl<TdaDeviceMapper, TdaDevice> implements TdaDeviceService {
+
+    @Override
+    public Page<TdaDevice> getPage(Map<String, String> condition) {
+
+        QueryWrapper<TdaDevice> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<TdaDevice> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(TdaDeviceVo tdaDeviceVo) {
+        save(tdaDeviceVo);
+    }
+
+    @Override
+    public void edit(TdaDeviceVo tdaDeviceVo) {
+        updateById(tdaDeviceVo);
+    }
+
+    @Override
+    public void delete(TdaDeviceVo tdaDeviceVo) {
+        removeById(tdaDeviceVo.getId());
+    }
+
+}

hx-service/iot-production/src/main/java/com/fjhx/service/tda/impl/TdaProductServiceImpl.java

@@ -0,0 +1,55 @@
+package com.fjhx.service.tda.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.utils.WrapperUtil;
+import com.fjhx.entity.tda.TdaProduct;
+import com.fjhx.params.tda.TdaProductVo;
+import com.fjhx.mapper.tda.TdaProductMapper;
+import com.fjhx.service.tda.TdaProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-07-21
+ */
+@Service
+public class TdaProductServiceImpl extends ServiceImpl<TdaProductMapper, TdaProduct> implements TdaProductService {
+
+    @Override
+    public Page<TdaProduct> getPage(Map<String, String> condition) {
+
+        QueryWrapper<TdaProduct> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .eqTenantId()
+                .createTimeDesc();
+
+        Page<TdaProduct> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(TdaProductVo tdaProductVo) {
+        save(tdaProductVo);
+    }
+
+    @Override
+    public void edit(TdaProductVo tdaProductVo) {
+        updateById(tdaProductVo);
+    }
+
+    @Override
+    public void delete(TdaProductVo tdaProductVo) {
+        removeById(tdaProductVo.getId());
+    }
+
+}

hx-service/iot-production/src/main/java/com/fjhx/test/ListDevicesSolution.java

@@ -1,53 +0,0 @@
-package com.fjhx.test;
-
-
-import com.fjhx.IoTDA.IoTDAConfig;
-import com.fjhx.IoTDA.IoTDAUtil;
-import com.huaweicloud.sdk.core.exception.ConnectionException;
-import com.huaweicloud.sdk.core.exception.RequestTimeoutException;
-import com.huaweicloud.sdk.core.exception.ServiceResponseException;
-import com.huaweicloud.sdk.iotda.v5.IoTDAClient;
-import com.huaweicloud.sdk.iotda.v5.model.*;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import java.util.Collections;
-
-public class ListDevicesSolution {
-
-    private static final AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(IoTDAConfig.class);
-    private static final IoTDAClient client = applicationContext.getBean(IoTDAClient.class);
-
-    public static void main(String[] args) {
-
-        try {
-
-            ShowApplicationsRequest showApplicationsRequest = new ShowApplicationsRequest();
-            System.out.println(client.showApplications(showApplicationsRequest));
-            System.out.println("========================================================");
-
-            ListProductsRequest listProductsRequest = new ListProductsRequest();
-            listProductsRequest.setAppId("fa74090e9e534511b65545a456f4bf2f");
-            System.out.println(client.listProducts(listProductsRequest));
-            System.out.println("========================================================");
-
-
-            ListDevicesRequest listDevicesRequest = new ListDevicesRequest();
-            listDevicesRequest.setProductId("62d4ff516b9813541d51f893");
-            ListDevicesResponse listDevicesResponse = client.listDevices(listDevicesRequest);
-            System.out.println(listDevicesResponse);
-            System.out.println("========================================================");
-
-
-
-
-
-        } catch (ConnectionException | RequestTimeoutException e) {
-            e.printStackTrace();
-        } catch (ServiceResponseException e) {
-            e.printStackTrace();
-            System.out.println(e.getHttpStatusCode());
-            System.out.println(e.getErrorCode());
-            System.out.println(e.getErrorMsg());
-        }
-    }
-}

hx-service/iot-production/src/main/java/com/fjhx/test/ZipTest.java

@@ -1,53 +0,0 @@
-package com.fjhx.test;
-
-import cn.hutool.http.HttpUtil;
-import lombok.SneakyThrows;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-public class ZipTest {
-
-    @SneakyThrows
-    public static void main(String[] args) {
-        byte[] bytes = HttpUtil.downloadBytes("http://36.134.91.96:10001/file/test.zip");
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        byteArrayOutputStream.write(bytes);
-
-
-        ZipInputStream in = new ZipInputStream(new ByteArrayInputStream(bytes));
-        ZipEntry zipEntry;
-
-        ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream("E:\\test.zip"));
-
-        while ((zipEntry = in.getNextEntry()) != null) {
-            String name = zipEntry.getName();
-
-            zipOutputStream.putNextEntry(new ZipEntry(name));
-
-            //读取该文件的字节内容
-            byte[] buff = new byte[1024];
-            int len;
-            while ((len = in.read(buff)) != -1) {
-                zipOutputStream.write(buff, 0, len);
-            }
-
-        }
-
-        String testCont = "测试内容";
-
-        zipOutputStream.putNextEntry(new ZipEntry("测试zip\\config"));
-        zipOutputStream.write(testCont.getBytes(StandardCharsets.UTF_8));
-
-        zipOutputStream.closeEntry();
-        zipOutputStream.close();
-
-
-    }
-
-}

hx-service/iot-production/src/main/java/com/fjhx/IoTDA/IoTDAUtil.java → hx-service/iot-production/src/main/java/com/fjhx/utils/IoTDAUtil.java

@@ -1,4 +1,4 @@
-package com.fjhx.IoTDA;
+package com.fjhx.utils;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.huaweicloud.sdk.iotda.v5.IoTDAClient;

hx-service/pom.xml

@@ -66,6 +66,12 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
+                <artifactId>iot-production-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
                 <artifactId>storage-api</artifactId>
                 <version>${hx.version}</version>
             </dependency>

hx-service/storage/src/main/java/com/fjhx/material/service/impl/MaterialServiceImpl.java → hx-service/storage/src/main/java/com/fjhx/service/material/impl/MaterialServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.material.service.impl;
+package com.fjhx.service.material.impl;
 
 
 import com.fjhx.entity.material.Material;