结构重构

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

@@ -1,5 +1,6 @@
 package com.fjhx.generator;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -30,6 +31,9 @@ public class CodeGenerator {
     // 数据库名
     public static String DATABASE_NAME = "";
 
+    // 模块名称
+    public static String MODULAR_NAME = "";
+
     // 需要生成的表名称,多表用,隔开
     public static String INCLUDE = "";
 
@@ -41,11 +45,13 @@ public class CodeGenerator {
     // 执行代码生成
     public static void execute() {
 
+        MODULAR_NAME = ObjectUtil.isEmpty(MODULAR_NAME) ? DATABASE_NAME : MODULAR_NAME;
+
         // 实体类所在模块
-        String entityChildren = "/hx-service-api/" + DATABASE_NAME.replace("_", "-") + "-api";
+        String entityChildren = "/hx-service-api/" + MODULAR_NAME.replace("_", "-") + "-api";
 
         //  业务所在模块
-        String children = "/hx-service/" + DATABASE_NAME.replace("_", "-");
+        String children = "/hx-service/" + MODULAR_NAME.replace("_", "-");
 
         // 生成的包路径
         String parent = "com.fjhx";

hx-common/client-util/pom.xml → hx-common/common-client-util/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>client-util</artifactId>
+    <artifactId>common-client-util</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-common/pom.xml

@@ -14,12 +14,12 @@
 
     <modules>
         <module>code-generator</module>
+        <module>common-client-util</module>
         <module>common-file</module>
         <module>common-flow</module>
         <module>common-rocketmq</module>
         <module>common-socket</module>
         <module>common-tool</module>
-        <module>client-util</module>
         <module>product-library</module>
     </modules>
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/base/BaseStockEntity.java

@@ -67,4 +67,5 @@ public class BaseStockEntity implements Serializable {
         setUpdateTime(new Date());
         setUpdateUser(AuthUtil.getUserIdStr());
     }
+
 }

hx-service/iot-management/pom.xml

@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>client-util</artifactId>
+            <artifactId>common-client-util</artifactId>
         </dependency>
 
         <dependency>

hx-service/iot-production/pom.xml

@@ -20,7 +20,7 @@
 
         <dependency>
             <groupId>com.fjhx</groupId>
-            <artifactId>client-util</artifactId>
+            <artifactId>common-client-util</artifactId>
         </dependency>
 
         <dependency>

hx-service/pom.xml

@@ -47,7 +47,7 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
-                <artifactId>client-util</artifactId>
+                <artifactId>common-client-util</artifactId>
                 <version>${hx.version}</version>
             </dependency>