Merge branch 'develop' of http://47.108.150.237:10000/allen/gphm into develop-rmd

PHM-admin/phm-admin/pom.xml

@@ -16,18 +16,27 @@
     </description>
 
     <dependencies>
-
         <!-- spring-boot-devtools -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>Dm8JdbcDriver18</artifactId>
+        </dependency>
 
         <!-- swagger3-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
@@ -66,6 +75,11 @@
             <artifactId>phm-manage</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.phm</groupId>
+            <artifactId>phm-netty</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

PHM-admin/phm-admin/src/main/java/com/phm/PHMApplication.java

@@ -3,7 +3,6 @@ package com.phm;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 启动程序

PHM-admin/phm-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,63 @@
+# 数据源配置
+spring:
+  redis:
+    host: 124.71.193.202
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: dm.jdbc.driver.DmDriver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:dm://124.71.193.202:5236?schema=PHM&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: SYSDBA
+        password: SYSDBA
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: SYSDBA
+        login-password: SYSDBA
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

PHM-admin/phm-admin/src/main/resources/application-local.yml

@@ -1,63 +1,63 @@
 # 数据源配置
 spring:
-    redis:
-        host: localhost
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://localhost:3306/phm-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: root123
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置连接超时时间
-            connectTimeout: 30000
-            # 配置网络超时时间
-            socketTimeout: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: root
-                login-password: root123
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
+  redis:
+    host: localhost
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: dm.jdbc.driver.DmDriver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:dm://124.71.193.202:5236?schema=PHM&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: SYSDBA
+        password: SYSDBA
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: SYSDBA
+        login-password: SYSDBA
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

PHM-admin/phm-admin/src/main/resources/application-pro.yml

@@ -1,63 +1,63 @@
 # 数据源配置
 spring:
-    redis:
-        host: 124.71.193.202
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://47.108.150.237:3306/phm-dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: w.cf123321
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置连接超时时间
-            connectTimeout: 30000
-            # 配置网络超时时间
-            socketTimeout: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: root
-                login-password: root123
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
+  redis:
+    host: 124.71.193.202
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: dm.jdbc.driver.DmDriver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:dm://124.71.193.202:5236?schema=PHM&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: SYSDBA
+        password: SYSDBA
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: SYSDBA
+        login-password: SYSDBA
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

PHM-admin/phm-common/pom.xml

@@ -17,6 +17,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>

PHM-admin/phm-common/src/main/java/com/phm/common/constant/GenConstants.java

@@ -46,6 +46,13 @@ public class GenConstants {
      */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
+    /** 浮点数 */
+    public static final String[] COLUMNTYPE_NUMBER_DOUBLE = {  "number", "float", "double", "decimal" };
+
+    /** 整型 */
+    public static final String[] COLUMNTYPE_NUMBER_INTEGER = { "tinyint", "smallint", "mediumint", "int", "integer",
+            "bit" };
+
     /**
      * 数据库字符串类型
      */

PHM-admin/phm-common/src/main/java/com/phm/common/core/domain/BaseEntity.java

@@ -1,22 +1,29 @@
 package com.phm.common.core.domain;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.phm.common.constant.HttpStatus;
 import com.phm.common.core.domain.model.LoginUser;
+import com.phm.common.exception.ServiceException;
 import com.phm.common.utils.DateUtils;
 import com.phm.common.utils.SecurityUtils;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Entity基类
  *
  * @author phm
  */
+@Data
+@Slf4j
 public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -64,62 +71,6 @@ public class BaseEntity implements Serializable {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
-    public String getSearchValue() {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue) {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
     public Map<String, Object> getParams() {
         if (params == null) {
             params = new HashMap<>();
@@ -127,29 +78,39 @@ public class BaseEntity implements Serializable {
         return params;
     }
 
-    public void setParams(Map<String, Object> params) {
-        this.params = params;
-    }
-
     /**
      * 新增数据SET创建和更新信息
      */
     public void initCreatInfo() {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
         Date nowDate = DateUtils.getNowDate();
-        this.createBy = loginUser.getUsername();
-        this.createTime =nowDate;
-        this.updateBy = loginUser.getUsername();
-        this.updateTime =nowDate;
+        this.createTime = nowDate;
+        this.updateTime = nowDate;
+        LoginUser loginUser = null;
+        try {
+            loginUser = (LoginUser)SecurityUtils.getAuthentication().getPrincipal();
+        } catch (Exception ignored) {
+            log.error("获取用户信息异常");
+        }
+        if (ObjectUtils.isNotEmpty(loginUser)) {
+            this.createBy = loginUser.getUsername();
+            this.updateBy = loginUser.getUsername();
+        } else {
+            this.createBy = "ANONYMITY";
+            this.updateBy = "ANONYMITY";
+        }
     }
 
     /**
      * 更新数据时，SET更新信息
      */
     public void initUpdateInfo() {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        Date nowDate = DateUtils.getNowDate();
-        this.updateBy = loginUser.getUsername();
-        this.updateTime =nowDate;
+        this.updateTime = DateUtils.getNowDate();
+        LoginUser loginUser = null;
+        try {
+            loginUser = (LoginUser)SecurityUtils.getAuthentication().getPrincipal();
+        } catch (Exception ignored) {
+            log.error("error: 获取用户信息异常");
+        }
+        this.updateBy = ObjectUtils.isNotEmpty(loginUser) ? loginUser.getUsername() : "ANONYMITY";
     }
 }

PHM-admin/phm-common/src/main/java/com/phm/common/core/domain/TreeSelect.java

@@ -5,6 +5,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.core.domain.entity.SysDept;
 import com.phm.common.core.domain.entity.SysMenu;
 
@@ -19,7 +21,8 @@ public class TreeSelect implements Serializable {
     /**
      * 节点ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 节点名称

PHM-admin/phm-common/src/main/java/com/phm/common/utils/ip/IpUtils.java

@@ -1,11 +1,13 @@
 package com.phm.common.utils.ip;
 
+import com.phm.common.utils.ServletUtils;
+import com.phm.common.utils.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
-
-import com.phm.common.utils.StringUtils;
-import com.phm.common.utils.ServletUtils;
 
 /**
  * 获取IP方法
@@ -191,11 +193,31 @@ public class IpUtils {
     public static String getHostIp() {
         try {
             return InetAddress.getLocalHost().getHostAddress();
-        } catch (UnknownHostException e) {
+        } catch (UnknownHostException ignored) {
         }
         return "127.0.0.1";
     }
 
+    /**
+     * 获取MAC地址
+     *
+     * @return MAC地址
+     */
+    public static String getMac() {
+        try {
+            NetworkInterface network = NetworkInterface.getByInetAddress(InetAddress.getLocalHost());
+            byte[] mac = network.getHardwareAddress();
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < mac.length; i++) {
+                sb.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : ""));
+            }
+            return sb.toString();
+        } catch (SocketException | UnknownHostException ignored) {
+
+        }
+        return "99-99-99-99-99-99";
+    }
+
     /**
      * 获取主机名
      *

PHM-admin/phm-framework/src/main/java/com/phm/framework/aspectj/DataScopeAspect.java

@@ -109,7 +109,7 @@ public class DataScopeAspect {
                 sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
             } else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
                 sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+                        " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or instr(','||ancestors||',' ,  ','|| {} ||',')  )",
                         deptAlias, user.getDeptId(), user.getDeptId()));
             } else if (DATA_SCOPE_SELF.equals(dataScope)) {
                 if (StringUtils.isNotBlank(userAlias)) {

PHM-admin/phm-generator/src/main/java/com/phm/generator/util/GenUtils.java

@@ -1,13 +1,13 @@
 package com.phm.generator.util;
 
-import java.util.Arrays;
-
-import com.phm.generator.domain.GenTable;
-import com.phm.generator.domain.GenTableColumn;
-import org.apache.commons.lang3.RegExUtils;
 import com.phm.common.constant.GenConstants;
 import com.phm.common.utils.StringUtils;
 import com.phm.generator.config.GenConfig;
+import com.phm.generator.domain.GenTable;
+import com.phm.generator.domain.GenTableColumn;
+import org.apache.commons.lang3.RegExUtils;
+
+import java.util.Arrays;
 
 /**
  * 代码生成器 工具类
@@ -54,12 +54,23 @@ public class GenUtils {
             column.setHtmlType(GenConstants.HTML_INPUT);
 
             // 如果是浮点型 统一用BigDecimal
-            String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
-                column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+            // String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
+            // if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
+            //     column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
+            // }
+            // // 如果是整形
+            // else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
+            //     column.setJavaType(GenConstants.TYPE_INTEGER);
+            // }
+            // // 长整形
+            // else {
+            //     column.setJavaType(GenConstants.TYPE_LONG);
+            // }
+            if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_DOUBLE, dataType)) {
+                column.setJavaType(GenConstants.TYPE_DOUBLE);
             }
             // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
+            else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER_INTEGER, dataType)) {
                 column.setJavaType(GenConstants.TYPE_INTEGER);
             }
             // 长整形

PHM-admin/phm-generator/src/main/resources/generator.yml

@@ -7,4 +7,4 @@ gen:
   # 自动去除表前缀，默认是false
   autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_,phm_
+  tablePrefix: sys_,phm_,PHM_,SYS_

PHM-admin/phm-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -1,36 +1,58 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.generator.mapper.GenTableColumnMapper">
 
     <resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
+        <id property="columnId" column="column_id"/>
+        <result property="tableId" column="table_id"/>
+        <result property="columnName" column="column_name"/>
+        <result property="columnComment" column="column_comment"/>
+        <result property="columnType" column="column_type"/>
+        <result property="javaType" column="java_type"/>
+        <result property="javaField" column="java_field"/>
+        <result property="isPk" column="is_pk"/>
+        <result property="isIncrement" column="is_increment"/>
+        <result property="isRequired" column="is_required"/>
+        <result property="isInsert" column="is_insert"/>
+        <result property="isEdit" column="is_edit"/>
+        <result property="isList" column="is_list"/>
+        <result property="isQuery" column="is_query"/>
+        <result property="queryType" column="query_type"/>
+        <result property="htmlType" column="html_type"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="sort" column="sort"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
-	<sql id="selectGenTableColumnVo">
-        select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column
+    <sql id="selectGenTableColumnVo">
+        select column_id,
+               table_id,
+               column_name,
+               column_comment,
+               column_type,
+               java_type,
+               java_field,
+               is_pk,
+               is_increment,
+               is_required,
+               is_insert,
+               is_edit,
+               is_list,
+               is_query,
+               query_type,
+               html_type,
+               dict_type,
+               sort,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.GEN_TABLE_COLUMN
     </sql>
 
     <select id="selectGenTableColumnListByTableId" parameterType="Long" resultMap="GenTableColumnResult">
@@ -39,58 +61,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by sort
     </select>
 
+    <!-- RuoYi-vue 3.8.5版本，主要增加了（is_required是否必填属性） -->
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
-		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
-		order by ordinal_position
-	</select>
+        select sc.NAME                                                  column_name,
+               (case when sc.NULLABLE$ = 'N' then '1' else null end) as is_required,
+               (case when sc.INFO2 = 1 then '1' else '0' end)           is_pk,
+               sc.COLID                                                 sort,
+               scc.COMMENT$                                             column_comment,
+               (case when sc.INFO2 = 1 then '1' else '0' end)        as is_increment,
+               LOWER(sc.TYPE$)                                          column_type
+        from SYS.SYSCOLUMNS sc
+                 left join SYS.SYSOBJECTS so on sc.ID = so.ID
+                 left join SYS.SYSCOLUMNCOMMENTS SCC on sc.NAME = scc.COLNAME and scc.TABLE_TYPE = 'TABLE' and
+                                                        scc.SCHNAME = (select CURR_SCH from V$SESSIONS LIMIT 1) and
+                                                        scc.TVNAME = so.NAME
+        where so.TYPE$ = 'SCHOBJ'
+          and so.SUBTYPE$ = 'UTAB'
+          and so.PID = -1
+          and so.SCHID =
+              (select ID from SYS.SYSOBJECTS where TYPE$ = 'SCH' and NAME = (select CURR_SCH from V$SESSIONS LIMIT 1))
+          and so.NAME = #{tableName}
+        order by sc.COLID
+    </select>
+
 
     <insert id="insertGenTableColumn" parameterType="GenTableColumn" useGeneratedKeys="true" keyProperty="columnId">
-        insert into gen_table_column (
-			<if test="tableId != null and tableId != ''">table_id,</if>
-			<if test="columnName != null and columnName != ''">column_name,</if>
-			<if test="columnComment != null and columnComment != ''">column_comment,</if>
-			<if test="columnType != null and columnType != ''">column_type,</if>
-			<if test="javaType != null and javaType != ''">java_type,</if>
-			<if test="javaField != null  and javaField != ''">java_field,</if>
-			<if test="isPk != null and isPk != ''">is_pk,</if>
-			<if test="isIncrement != null and isIncrement != ''">is_increment,</if>
-			<if test="isRequired != null and isRequired != ''">is_required,</if>
-			<if test="isInsert != null and isInsert != ''">is_insert,</if>
-			<if test="isEdit != null and isEdit != ''">is_edit,</if>
-			<if test="isList != null and isList != ''">is_list,</if>
-			<if test="isQuery != null and isQuery != ''">is_query,</if>
-			<if test="queryType != null and queryType != ''">query_type,</if>
-			<if test="htmlType != null and htmlType != ''">html_type,</if>
-			<if test="dictType != null and dictType != ''">dict_type,</if>
-			<if test="sort != null">sort,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time
-         )values(
-			<if test="tableId != null and tableId != ''">#{tableId},</if>
-			<if test="columnName != null and columnName != ''">#{columnName},</if>
-			<if test="columnComment != null and columnComment != ''">#{columnComment},</if>
-			<if test="columnType != null and columnType != ''">#{columnType},</if>
-			<if test="javaType != null and javaType != ''">#{javaType},</if>
-			<if test="javaField != null and javaField != ''">#{javaField},</if>
-			<if test="isPk != null and isPk != ''">#{isPk},</if>
-			<if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
-			<if test="isRequired != null and isRequired != ''">#{isRequired},</if>
-			<if test="isInsert != null and isInsert != ''">#{isInsert},</if>
-			<if test="isEdit != null and isEdit != ''">#{isEdit},</if>
-			<if test="isList != null and isList != ''">#{isList},</if>
-			<if test="isQuery != null and isQuery != ''">#{isQuery},</if>
-			<if test="queryType != null and queryType != ''">#{queryType},</if>
-			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
-			<if test="dictType != null and dictType != ''">#{dictType},</if>
-			<if test="sort != null">#{sort},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate()
-         )
+        insert into PHM.GEN_TABLE_COLUMN (
+        <if test="tableId != null and tableId != ''">table_id,</if>
+        <if test="columnName != null and columnName != ''">column_name,</if>
+        <if test="columnComment != null and columnComment != ''">column_comment,</if>
+        <if test="columnType != null and columnType != ''">column_type,</if>
+        <if test="javaType != null and javaType != ''">java_type,</if>
+        <if test="javaField != null  and javaField != ''">java_field,</if>
+        <if test="isPk != null and isPk != ''">is_pk,</if>
+        <if test="isIncrement != null and isIncrement != ''">is_increment,</if>
+        <if test="isRequired != null and isRequired != ''">is_required,</if>
+        <if test="isInsert != null and isInsert != ''">is_insert,</if>
+        <if test="isEdit != null and isEdit != ''">is_edit,</if>
+        <if test="isList != null and isList != ''">is_list,</if>
+        <if test="isQuery != null and isQuery != ''">is_query,</if>
+        <if test="queryType != null and queryType != ''">query_type,</if>
+        <if test="htmlType != null and htmlType != ''">html_type,</if>
+        <if test="dictType != null and dictType != ''">dict_type,</if>
+        <if test="sort != null">sort,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="tableId != null and tableId != ''">#{tableId},</if>
+        <if test="columnName != null and columnName != ''">#{columnName},</if>
+        <if test="columnComment != null and columnComment != ''">#{columnComment},</if>
+        <if test="columnType != null and columnType != ''">#{columnType},</if>
+        <if test="javaType != null and javaType != ''">#{javaType},</if>
+        <if test="javaField != null and javaField != ''">#{javaField},</if>
+        <if test="isPk != null and isPk != ''">#{isPk},</if>
+        <if test="isIncrement != null and isIncrement != ''">#{isIncrement},</if>
+        <if test="isRequired != null and isRequired != ''">#{isRequired},</if>
+        <if test="isInsert != null and isInsert != ''">#{isInsert},</if>
+        <if test="isEdit != null and isEdit != ''">#{isEdit},</if>
+        <if test="isList != null and isList != ''">#{isList},</if>
+        <if test="isQuery != null and isQuery != ''">#{isQuery},</if>
+        <if test="queryType != null and queryType != ''">#{queryType},</if>
+        <if test="htmlType != null and htmlType != ''">#{htmlType},</if>
+        <if test="dictType != null and dictType != ''">#{dictType},</if>
+        <if test="sort != null">#{sort},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
     </insert>
 
     <update id="updateGenTableColumn" parameterType="GenTableColumn">
-        update gen_table_column
+        update PHM.GEN_TABLE_COLUMN
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
@@ -111,14 +151,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteGenTableColumnByIds" parameterType="Long">
-        delete from gen_table_column where table_id in
+        delete from PHM.GEN_TABLE_COLUMN where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>
     </delete>
 
     <delete id="deleteGenTableColumns">
-        delete from gen_table_column where column_id in
+        delete from PHM.GEN_TABLE_COLUMN where column_id in
         <foreach collection="list" item="item" open="(" separator="," close=")">
             #{item.columnId}
         </foreach>

PHM-admin/phm-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -1,173 +1,291 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.generator.mapper.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
-	    <id     property="tableId"        column="table_id"          />
-		<result property="tableName"      column="table_name"        />
-		<result property="tableComment"   column="table_comment"     />
-		<result property="subTableName"   column="sub_table_name"    />
-		<result property="subTableFkName" column="sub_table_fk_name" />
-		<result property="className"      column="class_name"        />
-		<result property="tplCategory"    column="tpl_category"      />
-		<result property="packageName"    column="package_name"      />
-		<result property="moduleName"     column="module_name"       />
-		<result property="businessName"   column="business_name"     />
-		<result property="functionName"   column="function_name"     />
-		<result property="functionAuthor" column="function_author"   />
-		<result property="genType"        column="gen_type"          />
-		<result property="genPath"        column="gen_path"          />
-		<result property="options"        column="options"           />
-		<result property="createBy"       column="create_by"         />
-		<result property="createTime"     column="create_time"       />
-		<result property="updateBy"       column="update_by"         />
-		<result property="updateTime"     column="update_time"       />
-		<result property="remark"         column="remark"            />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
-	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
+    <resultMap type="GenTable" id="GenTableResult">
+        <id property="tableId" column="table_id"/>
+        <result property="tableName" column="table_name"/>
+        <result property="tableComment" column="table_comment"/>
+        <result property="subTableName" column="sub_table_name"/>
+        <result property="subTableFkName" column="sub_table_fk_name"/>
+        <result property="className" column="class_name"/>
+        <result property="tplCategory" column="tpl_category"/>
+        <result property="packageName" column="package_name"/>
+        <result property="moduleName" column="module_name"/>
+        <result property="businessName" column="business_name"/>
+        <result property="functionName" column="function_name"/>
+        <result property="functionAuthor" column="function_author"/>
+        <result property="genType" column="gen_type"/>
+        <result property="genPath" column="gen_path"/>
+        <result property="options" column="options"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
     </resultMap>
-	
-	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+
+    <resultMap type="GenTableColumn" id="GenTableColumnResult">
+        <id property="columnId" column="column_id"/>
+        <result property="tableId" column="table_id"/>
+        <result property="columnName" column="column_name"/>
+        <result property="columnComment" column="column_comment"/>
+        <result property="columnType" column="column_type"/>
+        <result property="javaType" column="java_type"/>
+        <result property="javaField" column="java_field"/>
+        <result property="isPk" column="is_pk"/>
+        <result property="isIncrement" column="is_increment"/>
+        <result property="isRequired" column="is_required"/>
+        <result property="isInsert" column="is_insert"/>
+        <result property="isEdit" column="is_edit"/>
+        <result property="isList" column="is_list"/>
+        <result property="isQuery" column="is_query"/>
+        <result property="queryType" column="query_type"/>
+        <result property="htmlType" column="html_type"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="sort" column="sort"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectGenTableVo">
+        select table_id,
+               table_name,
+               table_comment,
+               sub_table_name,
+               sub_table_fk_name,
+               class_name,
+               tpl_category,
+               package_name,
+               module_name,
+               business_name,
+               function_name,
+               function_author,
+               gen_type,
+               gen_path,
+               options,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from gen_table
     </sql>
-    
+
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
-		<include refid="selectGenTableVo"/>
-		<where>
-			<if test="tableName != null and tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-			</if>
-			<if test="tableComment != null and tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-			</if>
-			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-			</if>
-			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-			</if>
-		</where>
-	</select>
-
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_schema = (select database())
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
-		AND table_name NOT IN (select table_name from gen_table)
-		<if test="tableName != null and tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-		</if>
-		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-		</if>
-		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
-		</if>
-		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
-		</if>
-        order by create_time desc
-	</select>
-	
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
-		and table_name in
-	    <foreach collection="array" item="name" open="(" separator="," close=")">
- 			#{name}
-        </foreach> 
-	</select>
-	
-	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
-		and table_name = #{tableName}
-	</select>
-	
-	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_id = #{tableId} order by c.sort
-	</select>
-	
-	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		where t.table_name = #{tableName} order by c.sort
-	</select>
-	
-	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
-			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
-		FROM gen_table t
-			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
-		order by c.sort
-	</select>
-	
-	<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
+        <include refid="selectGenTableVo"/>
+        <where>
+            <if test="tableName != null and tableName != ''">
+                AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+            </if>
+            <if test="tableComment != null and tableComment != ''">
+                AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
+    <select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
+        select so.NAME table_name, st.COMMENT$ table_comment, so.CRTDATE create_time from SYS.SYSOBJECTS so left join
+        SYS.SYSTABLECOMMENTS st on so.NAME = st.TVNAME and st.TABLE_TYPE = 'TABLE' and st.SCHNAME = (select CURR_SCH
+        from V$SESSIONS LIMIT 1)
+        where so.TYPE$='SCHOBJ' and so.SUBTYPE$='UTAB' and so.PID = -1 and INSTR(so.NAME,'##') = 0 and so.SCHID =
+        (select ID from SYS.SYSOBJECTS where TYPE$='SCH' and NAME= (select CURR_SCH from V$SESSIONS LIMIT 1)) and
+        so.NAME NOT LIKE 'QRTZ_%' AND so.NAME NOT LIKE 'gen_%'
+        and so.NAME NOT IN (select table_name from gen_table)
+        <if test="tableName != null and tableName != ''">
+            and lower(so.NAME) like lower(concat('%', #{tableName}, '%'))
+        </if>
+        <if test="tableComment != null and tableComment != ''">
+            and lower(st.COMMENT$) like lower(concat('%', #{tableComment}, '%'))
+        </if>
+        order by so.CRTDATE desc
+    </select>
+
+
+    <select id="selectDbTableListByNames" resultMap="GenTableResult">
+        select so.NAME table_name, st.COMMENT$ table_comment, so.CRTDATE create_time from SYS.SYSOBJECTS so left join
+        SYS.SYSTABLECOMMENTS st on so.NAME = st.TVNAME and st.TABLE_TYPE = 'TABLE' and st.SCHNAME = (select CURR_SCH
+        from V$SESSIONS LIMIT 1)
+        where so.TYPE$='SCHOBJ' and so.SUBTYPE$='UTAB' and so.PID = -1 and INSTR(so.NAME,'##') = 0 and so.SCHID =
+        (select ID from SYS.SYSOBJECTS where TYPE$='SCH' and NAME= (select CURR_SCH from V$SESSIONS LIMIT 1)) and
+        so.NAME NOT LIKE 'qrtz_%' and so.NAME NOT LIKE 'gen_%'
+        and so.NAME in
+        <foreach collection="array" item="name" open="(" separator="," close=")">
+            #{name}
+        </foreach>
+    </select>
+
+
+    <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
+        select table_name, table_comment, create_time, update_time
+        from information_schema.tables
+        where table_comment <![CDATA[ <> ]]> ''
+          and table_schema = (select database())
+          and table_name = #{tableName}
+    </select>
+
+    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+        SELECT t.table_id,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.gen_type,
+               t.gen_path,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        where t.table_id = #{tableId}
+        order by c.sort
+    </select>
+
+    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+        SELECT t.table_id,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.gen_type,
+               t.gen_path,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        where t.table_name = #{tableName}
+        order by c.sort
+    </select>
+
+    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+        SELECT t.table_id,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+        order by c.sort
+    </select>
+
+    <insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (
-			<if test="tableName != null">table_name,</if>
-			<if test="tableComment != null and tableComment != ''">table_comment,</if>
-			<if test="className != null and className != ''">class_name,</if>
-			<if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
-			<if test="packageName != null and packageName != ''">package_name,</if>
-			<if test="moduleName != null and moduleName != ''">module_name,</if>
-			<if test="businessName != null and businessName != ''">business_name,</if>
-			<if test="functionName != null and functionName != ''">function_name,</if>
-			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="genType != null and genType != ''">gen_type,</if>
-			<if test="genPath != null and genPath != ''">gen_path,</if>
-			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
-			create_time
-         )values(
-			<if test="tableName != null">#{tableName},</if>
-			<if test="tableComment != null and tableComment != ''">#{tableComment},</if>
-			<if test="className != null and className != ''">#{className},</if>
-			<if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
-			<if test="packageName != null and packageName != ''">#{packageName},</if>
-			<if test="moduleName != null and moduleName != ''">#{moduleName},</if>
-			<if test="businessName != null and businessName != ''">#{businessName},</if>
-			<if test="functionName != null and functionName != ''">#{functionName},</if>
-			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="genType != null and genType != ''">#{genType},</if>
-			<if test="genPath != null and genPath != ''">#{genPath},</if>
-			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
-			sysdate()
-         )
+        <if test="tableName != null">table_name,</if>
+        <if test="tableComment != null and tableComment != ''">table_comment,</if>
+        <if test="className != null and className != ''">class_name,</if>
+        <if test="tplCategory != null and tplCategory != ''">tpl_category,</if>
+        <if test="packageName != null and packageName != ''">package_name,</if>
+        <if test="moduleName != null and moduleName != ''">module_name,</if>
+        <if test="businessName != null and businessName != ''">business_name,</if>
+        <if test="functionName != null and functionName != ''">function_name,</if>
+        <if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
+        <if test="genType != null and genType != ''">gen_type,</if>
+        <if test="genPath != null and genPath != ''">gen_path,</if>
+        <if test="remark != null and remark != ''">remark,</if>
+        <if test="createBy != null and createBy != ''">create_by,</if>
+        create_time
+        )values(
+        <if test="tableName != null">#{tableName},</if>
+        <if test="tableComment != null and tableComment != ''">#{tableComment},</if>
+        <if test="className != null and className != ''">#{className},</if>
+        <if test="tplCategory != null and tplCategory != ''">#{tplCategory},</if>
+        <if test="packageName != null and packageName != ''">#{packageName},</if>
+        <if test="moduleName != null and moduleName != ''">#{moduleName},</if>
+        <if test="businessName != null and businessName != ''">#{businessName},</if>
+        <if test="functionName != null and functionName != ''">#{functionName},</if>
+        <if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
+        <if test="genType != null and genType != ''">#{genType},</if>
+        <if test="genPath != null and genPath != ''">#{genPath},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
+        <if test="createBy != null and createBy != ''">#{createBy},</if>
+        sysdate()
+        )
     </insert>
-    
+
     <update id="updateGenTable" parameterType="GenTable">
         update gen_table
         <set>
@@ -191,9 +309,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </set>
         where table_id = #{tableId}
     </update>
-    
+
     <delete id="deleteGenTableByIds" parameterType="Long">
-        delete from gen_table where table_id in 
+        delete from gen_table where table_id in
         <foreach collection="array" item="tableId" open="(" separator="," close=")">
             #{tableId}
         </foreach>

PHM-admin/phm-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -18,46 +18,47 @@ import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${ClassName}Mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 
 /**
  * ${functionName}Service业务层处理
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
-{
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
     }
 
     /**
      * 查询${functionName}列表
-     * 
+     *
      * @param ${className} ${functionName}
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
 
     /**
      * 新增${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -65,12 +66,14 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int insert${ClassName}(${ClassName} ${className})
-    {
+    public int insert${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
 #end
+    #if($column.javaField == 'id')
+        ${className}.setId(snowFlakeIdGenerator.nextId());
+    #end
 #end
 #if($table.sub)
         int rows = ${className}Mapper.insert${ClassName}(${className});
@@ -83,7 +86,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 修改${functionName}
-     * 
+     *
      * @param ${className} ${functionName}
      * @return 结果
      */
@@ -91,8 +94,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int update${ClassName}(${ClassName} ${className})
-    {
+    public int update${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
@@ -107,7 +109,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 批量删除${functionName}
-     * 
+     *
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
      * @return 结果
      */
@@ -115,8 +117,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
@@ -125,7 +126,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 删除${functionName}信息
-     * 
+     *
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
@@ -133,8 +134,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) {
 #if($table.sub)
         ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
@@ -144,11 +144,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
 
     /**
      * 新增${subTable.functionName}信息
-     * 
+     *
      * @param ${className} ${functionName}对象
      */
-    public void insert${subClassName}(${ClassName} ${className})
-    {
+    public void insert${subClassName}(${ClassName} ${className}) {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
         ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
         if (StringUtils.isNotNull(${subclassName}List))

PHM-admin/phm-manage/src/main/java/com/phm/manage/config/SnowFlakeConfig.java

@@ -0,0 +1,68 @@
+package com.phm.manage.config;
+
+import com.phm.common.utils.ip.IpUtils;
+import com.phm.manage.domain.GlobalIdRegister;
+import com.phm.manage.mapper.GlobalIdRegisterMapper;
+import com.phm.manage.util.SnowFlakeIdGenerator;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ * @Description SnowFlakeConfig
+ * @Author WGK
+ * @Date 2023/9/8 14:33
+ */
+@Configuration
+public class SnowFlakeConfig {
+
+    @Autowired
+    private GlobalIdRegisterMapper globalIdRegisterMapper;
+
+    /**
+     * 初始化生成ID参数
+     *
+     * @return bean
+     */
+    @Bean()
+    @ConditionalOnMissingBean(SnowFlakeIdGenerator.class)//用户没有注入自己的bean才装配
+    public SnowFlakeIdGenerator getDefaultIdGenerator() {
+        GlobalIdRegister globalIdRegister = new GlobalIdRegister();
+        globalIdRegister.setMachine(IpUtils.getMac());
+        List<GlobalIdRegister> registerList = globalIdRegisterMapper.selectGlobalIdRegisterList(globalIdRegister);
+        Long machineId = 1L;
+        Long datacenterId = 1L;
+        if (CollectionUtils.isEmpty(registerList)) {
+            globalIdRegister.setMachineId(1L);
+            globalIdRegister.setDatacenterId(1L);
+            GlobalIdRegister register = globalIdRegisterMapper.selectGlobalIdRegister();
+            if (ObjectUtils.isNotEmpty(register)) {
+                machineId = register.getMachineId();
+                datacenterId = register.getDatacenterId();
+                globalIdRegister.setMachineId(++machineId);
+                globalIdRegister.setDatacenterId(datacenterId);
+                if (register.getMachineId() >= SnowFlakeIdGenerator.MAX_MACHINE_NUM && register.getDatacenterId() < SnowFlakeIdGenerator.MAX_DATACENTER_NUM) {
+                    globalIdRegister.setMachineId(1L);
+                    globalIdRegister.setDatacenterId(++datacenterId);
+                }
+                if (register.getMachineId() >= SnowFlakeIdGenerator.MAX_MACHINE_NUM && register.getDatacenterId() >= SnowFlakeIdGenerator.MAX_DATACENTER_NUM) {
+                    globalIdRegister.setDatacenterId(1L);
+                    globalIdRegister.setMachineId(1L);
+                }
+            }
+            SnowFlakeIdGenerator snowFlakeIdGenerator = new SnowFlakeIdGenerator(globalIdRegister.getDatacenterId(), globalIdRegister.getMachineId());
+            globalIdRegisterMapper.insertGlobalIdRegister(globalIdRegister);
+            return snowFlakeIdGenerator;
+        } else {
+            globalIdRegister.setDatacenterId(registerList.get(0).getDatacenterId());
+            globalIdRegister.setMachineId(registerList.get(0).getMachineId());
+            return new SnowFlakeIdGenerator(globalIdRegister.getDatacenterId(), globalIdRegister.getMachineId());
+        }
+    }
+
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/GlobalIdRegisterController.java

@@ -0,0 +1,91 @@
+package com.phm.manage.controller;
+
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.GlobalIdRegister;
+import com.phm.manage.service.IGlobalIdRegisterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 全局机器ID注册Controller
+ *
+ * @author phm
+ * @date 2023-09-08
+ */
+@RestController
+@RequestMapping("/manage/register")
+public class GlobalIdRegisterController extends BaseController {
+    @Autowired
+    private IGlobalIdRegisterService globalIdRegisterService;
+
+    /**
+     * 查询全局机器ID注册列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(GlobalIdRegister globalIdRegister) {
+        startPage();
+        List<GlobalIdRegister> list = globalIdRegisterService.selectGlobalIdRegisterList(globalIdRegister);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出全局机器ID注册列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:export')")
+    @Log(title = "全局机器ID注册", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, GlobalIdRegister globalIdRegister) {
+        List<GlobalIdRegister> list = globalIdRegisterService.selectGlobalIdRegisterList(globalIdRegister);
+        ExcelUtil<GlobalIdRegister> util = new ExcelUtil<GlobalIdRegister>(GlobalIdRegister.class);
+        util.exportExcel(response, list, "全局机器ID注册数据");
+    }
+
+    /**
+     * 获取全局机器ID注册详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(globalIdRegisterService.selectGlobalIdRegisterById(id));
+    }
+
+    /**
+     * 新增全局机器ID注册
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:add')")
+    @Log(title = "全局机器ID注册", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody GlobalIdRegister globalIdRegister) {
+        return toAjax(globalIdRegisterService.insertGlobalIdRegister(globalIdRegister));
+    }
+
+    /**
+     * 修改全局机器ID注册
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:edit')")
+    @Log(title = "全局机器ID注册", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody GlobalIdRegister globalIdRegister) {
+        return toAjax(globalIdRegisterService.updateGlobalIdRegister(globalIdRegister));
+    }
+
+    /**
+     * 删除全局机器ID注册
+     */
+    @PreAuthorize("@ss.hasPermi('manage:register:remove')")
+    @Log(title = "全局机器ID注册", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(globalIdRegisterService.deleteGlobalIdRegisterByIds(ids));
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/OrderConfigController.java

@@ -0,0 +1,116 @@
+package com.phm.manage.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.phm.common.annotation.Log;
+import com.phm.common.core.controller.BaseController;
+import com.phm.common.core.domain.AjaxResult;
+import com.phm.common.core.page.TableDataInfo;
+import com.phm.common.enums.BusinessType;
+import com.phm.common.utils.poi.ExcelUtil;
+import com.phm.manage.domain.OrderConfig;
+import com.phm.manage.domain.common.CommonResult;
+import com.phm.manage.domain.common.OrderXmlVO;
+import com.phm.manage.service.IOrderConfigService;
+import com.phm.manage.util.JaxbUtil;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 指令配置Controller
+ *
+ * @author phm
+ * @date 2023-10-07
+ */
+@RestController
+@RequestMapping("/manage/orderConfig")
+public class OrderConfigController extends BaseController {
+    @Autowired
+    private IOrderConfigService orderConfigService;
+
+    /**
+     * 查询指令配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(OrderConfig orderConfig) {
+        startPage();
+        List<OrderConfig> list = orderConfigService.selectOrderConfigList(orderConfig);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出指令配置列表
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:export')")
+    @Log(title = "指令配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, OrderConfig orderConfig) {
+        List<OrderConfig> list = orderConfigService.selectOrderConfigList(orderConfig);
+        ExcelUtil<OrderConfig> util = new ExcelUtil<OrderConfig>(OrderConfig.class);
+        util.exportExcel(response, list, "指令配置数据");
+    }
+
+    /**
+     * 获取指令配置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(orderConfigService.selectOrderConfigById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:query')")
+    @GetMapping(value = "/xml/{id}")
+    public CommonResult<String> getInfoXml(@PathVariable("id") Long id) throws Exception {
+        OrderConfig orderConfig = orderConfigService.selectOrderConfigById(id);
+        OrderXmlVO xmlVO = new OrderXmlVO();
+        BeanUtil.copyProperties(orderConfig, xmlVO);
+        return CommonResult.success(JaxbUtil.convertToXml(xmlVO));
+    }
+
+    /**
+     * 新增指令配置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:add')")
+    @Log(title = "指令配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public CommonResult<Object> add(@RequestBody OrderConfig orderConfig) {
+        OrderConfig order = orderConfigService.selectOrderConfigByCode(orderConfig.getOrderCode());
+        if (ObjectUtils.isNotEmpty(order)) {
+            return CommonResult.error("指令编码已存在,请重新输入！");
+        }
+        return CommonResult.success(orderConfigService.insertOrderConfig(orderConfig));
+    }
+
+    /**
+     * 修改指令配置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:edit')")
+    @Log(title = "指令配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody OrderConfig orderConfig) {
+        return toAjax(orderConfigService.updateOrderConfig(orderConfig));
+    }
+
+    /**
+     * 删除指令配置
+     */
+    @PreAuthorize("@ss.hasPermi('manage:orderConfig:remove')")
+    @Log(title = "指令配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(orderConfigService.deleteOrderConfigByIds(ids));
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/SortieController.java

@@ -52,7 +52,7 @@ public class SortieController extends BaseController {
         util.exportExcel(response, list, "架次信息数据");
     }
     @Log(title = "架次信息", businessType = BusinessType.IMPORT)
-//    @PreAuthorize("@ss.hasPermi('manage:sortie:import')")
+    @PreAuthorize("@ss.hasPermi('manage:sortie:import')")
     @PostMapping("/import")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtil<Sortie> util = new ExcelUtil<Sortie>(Sortie.class);

PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/externalInter/ExternalInterfaceController.java

@@ -43,6 +43,7 @@ public class ExternalInterfaceController {
     @Autowired
     private IOrderInfoService orderInfoService;
 
+
     /**
      * 指令接收API
      *

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AfterAnalysisResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,5 +26,6 @@ public class AfterAnalysisResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Aircraft.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -21,7 +23,8 @@ public class Aircraft extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 名称
@@ -46,6 +49,7 @@ public class Aircraft extends BaseEntity {
      */
     @Excel(name = "归属机队")
     private String fleetId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeCourseLog.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -21,7 +23,8 @@ public class AnalyzeCourseLog extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 模块功能名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeDownLog.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class AnalyzeDownLog extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 文件名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/AnalyzeResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,5 +26,6 @@ public class AnalyzeResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DataDownResult.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -20,7 +22,8 @@ public class DataDownResult extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 唯一ID */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /** 指令 */
     @Excel(name = "指令")

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DeepIsolationModel.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class DeepIsolationModel extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 维护代码

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DeriveParameter.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class DeriveParameter extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 参数名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/DiagnoseResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class DiagnoseResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 故障模式

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ExternalInterfaceLog.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class ExternalInterfaceLog extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 接口结果

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FalseAlarmRestrainModel.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class FalseAlarmRestrainModel extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 故障代码

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FaultAnalyzeResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class FaultAnalyzeResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 功能模块名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FaultCase.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class FaultCase extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 案例案例名称
@@ -49,4 +52,21 @@ public class FaultCase extends BaseEntity {
      */
     @Excel(name = "案例编号")
     private String caseNumber;
+
+    /**
+     * 案例特征参数
+     */
+    @Excel(name = "案例特征参数")
+    private String parameter;
+
+    /**
+     * 故障定位
+     */
+    @Excel(name = "故障定位")
+    private String location;
+    /**
+     * 故障描述
+     */
+    @Excel(name = "故障描述")
+    private String solution;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/FeedbackRawData.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,5 +26,6 @@ public class FeedbackRawData extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Fleet.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class Fleet extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 机队名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ForecastModel.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class ForecastModel extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 预测对象

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ForecastResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class ForecastResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 部件名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/GlobalIdRegister.java

@@ -0,0 +1,44 @@
+package com.phm.manage.domain;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.phm.common.annotation.Excel;
+import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 全局机器ID注册对象 phm_global_id_register
+ *
+ * @author phm
+ * @date 2023-09-08
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class GlobalIdRegister extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
+
+    /**
+     * 机器标识
+     */
+    @Excel(name = "机器标识")
+    private String machine;
+
+    /**
+     * 机器id
+     */
+    @Excel(name = "机器id")
+    private Long machineId;
+
+    /**
+     * 数据中心id
+     */
+    @Excel(name = "数据中心id")
+    private Long datacenterId;
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/GroundDiagnosisModel.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -20,7 +22,8 @@ public class GroundDiagnosisModel extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 事件代码

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/ImportExportLog.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class ImportExportLog extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 模块名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/InstructionInfo.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class InstructionInfo extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 指令属性

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/LifePartConfig.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,7 +21,8 @@ public class LifePartConfig extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 寿命件名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Maintenance.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class Maintenance extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 维护代码

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/MaintenanceTestControl.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class MaintenanceTestControl extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 维修控制信息

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/MonitorParameterConfig.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class MonitorParameterConfig extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 参数名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/OrderConfig.java

@@ -0,0 +1,63 @@
+package com.phm.manage.domain;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.phm.common.annotation.Excel;
+import com.phm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 指令配置对象 PHM_ORDER_CONFIG
+ *
+ * @author phm
+ * @date 2023-10-07
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class OrderConfig extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一ID
+     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
+    /**
+     * 指令编码
+     */
+    @Excel(name = "指令编码")
+    private String orderCode;
+
+    /**
+     * 指令类型
+     */
+    @Excel(name = "指令类型")
+    private String type;
+
+    /**
+     * 指令名称
+     */
+    @Excel(name = "指令名称")
+    private String name;
+
+    /**
+     * 架次
+     */
+    @Excel(name = "架次")
+    private String sortie;
+
+    /**
+     * 步长
+     */
+    @Excel(name = "步长")
+    private String step;
+
+    /**
+     * 指令描述
+     */
+    @Excel(name = "指令描述")
+    private String description;
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/OrderInfo.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -21,7 +23,20 @@ public class OrderInfo extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
+
+    /**
+     * 指令批次
+     */
+    @Excel(name = "指令批次")
+    private String orderBatchId;
+
+    /**
+     * 指令编码
+     */
+    @Excel(name = "指令编码")
+    private String orderCode;
 
     /**
      * 指令名称

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/PerformanceMonitorModel.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,7 +26,8 @@ public class PerformanceMonitorModel extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 监测对象

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/PreHandleResult.java

@@ -1,6 +1,8 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -24,5 +26,6 @@ public class PreHandleResult extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Product.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -21,7 +23,8 @@ public class Product extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 父ID

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/SoftwareConfig.java

@@ -1,5 +1,7 @@
 package com.phm.manage.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -19,7 +21,8 @@ public class SoftwareConfig extends BaseEntity {
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 软件序号

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/Sortie.java

@@ -1,10 +1,12 @@
 package com.phm.manage.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.phm.common.annotation.Excel;
 import com.phm.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -14,13 +16,16 @@ import java.util.Date;
  * @author phm
  * @date 2023-08-25
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class Sortie extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
      * 唯一ID
      */
-    private Long id;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private long id;
 
     /**
      * 机号
@@ -53,69 +58,4 @@ public class Sortie extends BaseEntity {
      */
     @Excel(name = "飞行时长")
     private String duration;
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setAircraftNumber(String aircraftNumber) {
-        this.aircraftNumber = aircraftNumber;
-    }
-
-    public String getAircraftNumber() {
-        return aircraftNumber;
-    }
-
-    public void setSortieNumber(String sortieNumber) {
-        this.sortieNumber = sortieNumber;
-    }
-
-    public String getSortieNumber() {
-        return sortieNumber;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setDuration(String duration) {
-        this.duration = duration;
-    }
-
-    public String getDuration() {
-        return duration;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("aircraftNumber", getAircraftNumber())
-                .append("sortieNumber", getSortieNumber())
-                .append("startTime", getStartTime())
-                .append("endTime", getEndTime())
-                .append("duration", getDuration())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .toString();
-    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/CommonResult.java

@@ -37,6 +37,13 @@ public class CommonResult<T> implements Serializable {
         return result;
     }
 
+    public static <T> CommonResult<T> error(String message) {
+        CommonResult<T> result = new CommonResult<>();
+        result.code = GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode();
+        result.msg = message;
+        return result;
+    }
+
     public static <T> CommonResult<T> error(ErrorCode errorCode) {
         return error(errorCode.getCode(), errorCode.getMsg());
     }
@@ -48,6 +55,13 @@ public class CommonResult<T> implements Serializable {
         result.msg = "";
         return result;
     }
+    public static <T> CommonResult<T> complete(T data) {
+        CommonResult<T> result = new CommonResult<>();
+        result.code = GlobalErrorCodeConstants.COMPLETE.getCode();
+        result.data = data;
+        result.msg = "";
+        return result;
+    }
 
     public static <T> CommonResult<T> buildSuccess() {
         CommonResult<T> result = new CommonResult<>();

PHM-admin/phm-manage/src/main/java/com/phm/manage/domain/common/OrderXmlVO.java

@@ -1,34 +1,55 @@
 package com.phm.manage.domain.common;
 
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import lombok.Data;
+import com.phm.manage.util.JaxbUtil;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
 
 /**
  * @author wgk
  */
-@Data
-@JacksonXmlRootElement(localName = "ORDER")
+@Getter
+@Setter
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "root")
 public class OrderXmlVO {
     /**
-     * 指令类型
+     * 指令编码
      */
-    @JacksonXmlProperty(localName = "ORDER-TYPE")
-    private String orderType;
+    private String orderCode;
 
-    // 指令名称
-    @JacksonXmlProperty(localName = "ORDER-NAME")
-    private String orderName;
+    /**
+     * 指令名称
+     */
+    private String name;
+    /**
+     * 指令类型
+     */
+    private String type;
 
-    // 模型
-    @JacksonXmlProperty(localName = "MODEL-TYPE")
-    private String model;
 
-    // 架次号
-    @JacksonXmlProperty(localName = "SORTIE-NO")
-    private String sortieNo;
+    /**
+     * 架次
+     */
+    private String sortie;
 
-    // 步长
-    @JacksonXmlProperty(localName = "STEP")
+    /**
+     * 步长
+     */
     private String step;
+
+    /**
+     * 指令描述
+     */
+    private String description;
+
+    public static void main(String[] args) throws Exception {
+        System.out.println(JaxbUtil.convertToXml(new OrderXmlVO()));
+    }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/GlobalErrorCodeConstants.java

@@ -8,6 +8,7 @@ import com.phm.manage.util.ErrorCode;
 public interface GlobalErrorCodeConstants {
 
     ErrorCode SUCCESS = new ErrorCode(200, "成功");
+    ErrorCode COMPLETE = new ErrorCode(999, "完成");
 
     // ========== 客户端错误段 ==========
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/ModelEnum.java

@@ -16,7 +16,7 @@ public enum ModelEnum {
     /*
      * 虚警抑制模型
      */
-    DATA_DOWN("虚警抑制模型", "FALSE_ALARM"),
+    FALSE_ALARM("虚警抑制模型", "FALSE_ALARM"),
 
     /*
      * 地面诊断模型
@@ -26,7 +26,7 @@ public enum ModelEnum {
     /*
      * 深度隔离模型
      */
-    FORECAST("深度隔离模型", "DEEP_ISOLATION");
+    DEEP_ISOLATION("深度隔离模型", "DEEP_ISOLATION");
 
 
     private final String name;

PHM-admin/phm-manage/src/main/java/com/phm/manage/enums/OrderEnum.java

@@ -19,9 +19,19 @@ public enum OrderEnum {
     DATA_DOWN("数据下载", "DATA_DOWN"),
 
     /*
-     * 增强诊断
+     * 虚警抑制模型
      */
-    DIAGNOSIS("增强诊断", "DIAGNOSIS"),
+    FALSE_ALARM("虚警抑制", "FALSE_ALARM"),
+
+    /*
+     * 地面诊断模型
+     */
+    GROUND_DIAGNOSIS("地面诊断", "GROUND_DIAGNOSIS"),
+
+    /*
+     * 深度隔离模型
+     */
+    DEEP_ISOLATION("深度隔离", "DEEP_ISOLATION"),
 
     /*
      * 故障预测

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/GlobalIdRegisterMapper.java

@@ -0,0 +1,68 @@
+package com.phm.manage.mapper;
+
+import com.phm.manage.domain.GlobalIdRegister;
+
+import java.util.List;
+
+/**
+ * 全局机器ID注册Mapper接口
+ *
+ * @author phm
+ * @date 2023-09-08
+ */
+public interface GlobalIdRegisterMapper {
+    /**
+     * 查询全局机器ID注册
+     *
+     * @param id 全局机器ID注册主键
+     * @return 全局机器ID注册
+     */
+    public GlobalIdRegister selectGlobalIdRegisterById(Long id);
+
+    /**
+     * 查询最新一条数据
+     *
+     * @return GlobalIdRegister
+     */
+    public GlobalIdRegister selectGlobalIdRegister();
+
+    /**
+     * 查询全局机器ID注册列表
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 全局机器ID注册集合
+     */
+    public List<GlobalIdRegister> selectGlobalIdRegisterList(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 新增全局机器ID注册
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    public int insertGlobalIdRegister(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 修改全局机器ID注册
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    public int updateGlobalIdRegister(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 删除全局机器ID注册
+     *
+     * @param id 全局机器ID注册主键
+     * @return 结果
+     */
+    public int deleteGlobalIdRegisterById(Long id);
+
+    /**
+     * 批量删除全局机器ID注册
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteGlobalIdRegisterByIds(Long[] ids);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/mapper/OrderConfigMapper.java

@@ -0,0 +1,69 @@
+package com.phm.manage.mapper;
+
+import java.util.List;
+
+import com.phm.manage.domain.OrderConfig;
+
+/**
+ * 指令配置Mapper接口
+ *
+ * @author phm
+ * @date 2023-10-07
+ */
+public interface OrderConfigMapper {
+    /**
+     * 查询指令配置
+     *
+     * @param id 指令配置主键
+     * @return 指令配置
+     */
+    public OrderConfig selectOrderConfigById(Long id);
+
+    /**
+     * 查询指令配置
+     *
+     * @param orderCode 指令编码
+     * @return 指令配置
+     */
+    public OrderConfig selectOrderConfigByCode(String orderCode);
+
+    /**
+     * 查询指令配置列表
+     *
+     * @param orderConfig 指令配置
+     * @return 指令配置集合
+     */
+    public List<OrderConfig> selectOrderConfigList(OrderConfig orderConfig);
+
+    /**
+     * 新增指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    public int insertOrderConfig(OrderConfig orderConfig);
+
+    /**
+     * 修改指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    public int updateOrderConfig(OrderConfig orderConfig);
+
+    /**
+     * 删除指令配置
+     *
+     * @param id 指令配置主键
+     * @return 结果
+     */
+    public int deleteOrderConfigById(Long id);
+
+    /**
+     * 批量删除指令配置
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOrderConfigByIds(Long[] ids);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IGlobalIdRegisterService.java

@@ -0,0 +1,61 @@
+package com.phm.manage.service;
+
+import java.util.List;
+import com.phm.manage.domain.GlobalIdRegister;
+
+/**
+ * 全局机器ID注册Service接口
+ * 
+ * @author phm
+ * @date 2023-09-08
+ */
+public interface IGlobalIdRegisterService 
+{
+    /**
+     * 查询全局机器ID注册
+     * 
+     * @param id 全局机器ID注册主键
+     * @return 全局机器ID注册
+     */
+    public GlobalIdRegister selectGlobalIdRegisterById(Long id);
+
+    /**
+     * 查询全局机器ID注册列表
+     * 
+     * @param globalIdRegister 全局机器ID注册
+     * @return 全局机器ID注册集合
+     */
+    public List<GlobalIdRegister> selectGlobalIdRegisterList(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 新增全局机器ID注册
+     * 
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    public int insertGlobalIdRegister(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 修改全局机器ID注册
+     * 
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    public int updateGlobalIdRegister(GlobalIdRegister globalIdRegister);
+
+    /**
+     * 批量删除全局机器ID注册
+     * 
+     * @param ids 需要删除的全局机器ID注册主键集合
+     * @return 结果
+     */
+    public int deleteGlobalIdRegisterByIds(Long[] ids);
+
+    /**
+     * 删除全局机器ID注册信息
+     * 
+     * @param id 全局机器ID注册主键
+     * @return 结果
+     */
+    public int deleteGlobalIdRegisterById(Long id);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/IOrderConfigService.java

@@ -0,0 +1,69 @@
+package com.phm.manage.service;
+
+import com.phm.manage.domain.OrderConfig;
+
+import java.util.List;
+
+/**
+ * 指令配置Service接口
+ *
+ * @author phm
+ * @date 2023-10-07
+ */
+public interface IOrderConfigService {
+    /**
+     * 查询指令配置
+     *
+     * @param id 指令配置主键
+     * @return 指令配置
+     */
+    public OrderConfig selectOrderConfigById(Long id);
+
+    /**
+     * 查询指令配置
+     *
+     * @param code 指令编码
+     * @return 指令配置
+     */
+    public OrderConfig selectOrderConfigByCode(String code);
+
+    /**
+     * 查询指令配置列表
+     *
+     * @param orderConfig 指令配置
+     * @return 指令配置集合
+     */
+    public List<OrderConfig> selectOrderConfigList(OrderConfig orderConfig);
+
+    /**
+     * 新增指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    public int insertOrderConfig(OrderConfig orderConfig);
+
+    /**
+     * 修改指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    public int updateOrderConfig(OrderConfig orderConfig);
+
+    /**
+     * 批量删除指令配置
+     *
+     * @param ids 需要删除的指令配置主键集合
+     * @return 结果
+     */
+    public int deleteOrderConfigByIds(Long[] ids);
+
+    /**
+     * 删除指令配置信息
+     *
+     * @param id 指令配置主键
+     * @return 结果
+     */
+    public int deleteOrderConfigById(Long id);
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AfterAnalysisResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AfterAnalysisResult;
 import com.phm.manage.mapper.AfterAnalysisResultMapper;
 import com.phm.manage.service.IAfterAnalysisResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AfterAnalysisResultServiceImpl implements IAfterAnalysisResultServi
     @Autowired
     private AfterAnalysisResultMapper afterAnalysisResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维修测试控制解析后数据
      *
@@ -49,6 +53,7 @@ public class AfterAnalysisResultServiceImpl implements IAfterAnalysisResultServi
      */
     @Override
     public int insertAfterAnalysisResult(AfterAnalysisResult afterAnalysisResult) {
+        afterAnalysisResult.setId(snowFlakeIdGenerator.nextId());
         return afterAnalysisResultMapper.insertAfterAnalysisResult(afterAnalysisResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AircraftServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Aircraft;
 import com.phm.manage.mapper.AircraftMapper;
 import com.phm.manage.service.IAircraftService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AircraftServiceImpl implements IAircraftService {
     @Autowired
     private AircraftMapper aircraftMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询单机信息
      *
@@ -49,6 +53,8 @@ public class AircraftServiceImpl implements IAircraftService {
      */
     @Override
     public int insertAircraft(Aircraft aircraft) {
+        aircraft.setId(snowFlakeIdGenerator.nextId());
+        aircraft.initCreatInfo();
         return aircraftMapper.insertAircraft(aircraft);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeCourseLogServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.AnalyzeCourseLog;
 import com.phm.manage.mapper.AnalyzeCourseLogMapper;
 import com.phm.manage.service.IAnalyzeCourseLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
     @Autowired
     private AnalyzeCourseLogMapper analyzeCourseLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询分析过程日志
      *
@@ -51,6 +55,7 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
     @Override
     public int insertAnalyzeCourseLog(AnalyzeCourseLog analyzeCourseLog) {
         analyzeCourseLog.setCreateTime(DateUtils.getNowDate());
+        analyzeCourseLog.setId(snowFlakeIdGenerator.nextId());
         return analyzeCourseLogMapper.insertAnalyzeCourseLog(analyzeCourseLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeDownLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AnalyzeDownLog;
 import com.phm.manage.mapper.AnalyzeDownLogMapper;
 import com.phm.manage.service.IAnalyzeDownLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AnalyzeDownLogServiceImpl implements IAnalyzeDownLogService {
     @Autowired
     private AnalyzeDownLogMapper analyzeDownLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据解析下载日志
      *
@@ -49,6 +53,7 @@ public class AnalyzeDownLogServiceImpl implements IAnalyzeDownLogService {
      */
     @Override
     public int insertAnalyzeDownLog(AnalyzeDownLog analyzeDownLog) {
+        analyzeDownLog.setId(snowFlakeIdGenerator.nextId());
         return analyzeDownLogMapper.insertAnalyzeDownLog(analyzeDownLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AnalyzeResult;
 import com.phm.manage.mapper.AnalyzeResultMapper;
 import com.phm.manage.service.IAnalyzeResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AnalyzeResultServiceImpl implements IAnalyzeResultService {
     @Autowired
     private AnalyzeResultMapper analyzeResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据解析结果
      *
@@ -49,6 +53,7 @@ public class AnalyzeResultServiceImpl implements IAnalyzeResultService {
      */
     @Override
     public int insertAnalyzeResult(AnalyzeResult analyzeResult) {
+        analyzeResult.setId(snowFlakeIdGenerator.nextId());
         return analyzeResultMapper.insertAnalyzeResult(analyzeResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DataDownResultServiceImpl.java

@@ -1,96 +1,95 @@
 package com.phm.manage.service.impl;
 
-import java.util.List;
 import com.phm.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.phm.manage.mapper.DataDownResultMapper;
 import com.phm.manage.domain.DataDownResult;
+import com.phm.manage.mapper.DataDownResultMapper;
 import com.phm.manage.service.IDataDownResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 数据下载Service业务层处理
- * 
+ *
  * @author phm
  * @date 2023-08-24
  */
 @Service
-public class DataDownResultServiceImpl implements IDataDownResultService 
-{
+public class DataDownResultServiceImpl implements IDataDownResultService {
     @Autowired
     private DataDownResultMapper dataDownResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据下载
-     * 
+     *
      * @param id 数据下载主键
      * @return 数据下载
      */
     @Override
-    public DataDownResult selectDataDownResultById(Long id)
-    {
+    public DataDownResult selectDataDownResultById(Long id) {
         return dataDownResultMapper.selectDataDownResultById(id);
     }
 
     /**
      * 查询数据下载列表
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 数据下载
      */
     @Override
-    public List<DataDownResult> selectDataDownResultList(DataDownResult dataDownResult)
-    {
+    public List<DataDownResult> selectDataDownResultList(DataDownResult dataDownResult) {
         return dataDownResultMapper.selectDataDownResultList(dataDownResult);
     }
 
     /**
      * 新增数据下载
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 结果
      */
     @Override
-    public int insertDataDownResult(DataDownResult dataDownResult)
-    {
+    public int insertDataDownResult(DataDownResult dataDownResult) {
         dataDownResult.setCreateTime(DateUtils.getNowDate());
+        dataDownResult.setId(snowFlakeIdGenerator.nextId());
         return dataDownResultMapper.insertDataDownResult(dataDownResult);
     }
 
     /**
      * 修改数据下载
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 结果
      */
     @Override
-    public int updateDataDownResult(DataDownResult dataDownResult)
-    {
+    public int updateDataDownResult(DataDownResult dataDownResult) {
         dataDownResult.setUpdateTime(DateUtils.getNowDate());
         return dataDownResultMapper.updateDataDownResult(dataDownResult);
     }
 
     /**
      * 批量删除数据下载
-     * 
+     *
      * @param ids 需要删除的数据下载主键
      * @return 结果
      */
     @Override
-    public int deleteDataDownResultByIds(Long[] ids)
-    {
+    public int deleteDataDownResultByIds(Long[] ids) {
         return dataDownResultMapper.deleteDataDownResultByIds(ids);
     }
 
     /**
      * 删除数据下载信息
-     * 
+     *
      * @param id 数据下载主键
      * @return 结果
      */
     @Override
-    public int deleteDataDownResultById(Long id)
-    {
+    public int deleteDataDownResultById(Long id) {
         return dataDownResultMapper.deleteDataDownResultById(id);
     }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DeepIsolationModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.DeepIsolationModel;
 import com.phm.manage.mapper.DeepIsolationModelMapper;
 import com.phm.manage.service.IDeepIsolationModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class DeepIsolationModelServiceImpl implements IDeepIsolationModelService
     @Autowired
     private DeepIsolationModelMapper deepIsolationModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询深度隔离模型
      *
@@ -49,6 +53,7 @@ public class DeepIsolationModelServiceImpl implements IDeepIsolationModelService
      */
     @Override
     public int insertDeepIsolationModel(DeepIsolationModel deepIsolationModel) {
+        deepIsolationModel.setId(snowFlakeIdGenerator.nextId());
         return deepIsolationModelMapper.insertDeepIsolationModel(deepIsolationModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DeriveParameterServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.DeriveParameter;
 import com.phm.manage.mapper.DeriveParameterMapper;
 import com.phm.manage.service.IDeriveParameterService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class DeriveParameterServiceImpl implements IDeriveParameterService {
     @Autowired
     private DeriveParameterMapper deriveParameterMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询衍生参数信息
      *
@@ -49,6 +53,7 @@ public class DeriveParameterServiceImpl implements IDeriveParameterService {
      */
     @Override
     public int insertDeriveParameter(DeriveParameter deriveParameter) {
+        deriveParameter.setId(snowFlakeIdGenerator.nextId());
         return deriveParameterMapper.insertDeriveParameter(deriveParameter);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DiagnoseResultServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.DiagnoseResult;
 import com.phm.manage.mapper.DiagnoseResultMapper;
 import com.phm.manage.service.IDiagnoseResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class DiagnoseResultServiceImpl implements IDiagnoseResultService {
     @Autowired
     private DiagnoseResultMapper diagnoseResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询诊断结果
      *
@@ -50,6 +54,7 @@ public class DiagnoseResultServiceImpl implements IDiagnoseResultService {
      */
     @Override
     public int insertDiagnoseResult(DiagnoseResult diagnoseResult) {
+        diagnoseResult.setId(snowFlakeIdGenerator.nextId());
         diagnoseResult.setCreateTime(DateUtils.getNowDate());
         return diagnoseResultMapper.insertDiagnoseResult(diagnoseResult);
     }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ExternalInterfaceLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ExternalInterfaceLog;
 import com.phm.manage.mapper.ExternalInterfaceLogMapper;
 import com.phm.manage.service.IExternalInterfaceLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class ExternalInterfaceLogServiceImpl implements IExternalInterfaceLogSer
     @Autowired
     private ExternalInterfaceLogMapper externalInterfaceLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询外部接口日志
      *
@@ -49,6 +53,7 @@ public class ExternalInterfaceLogServiceImpl implements IExternalInterfaceLogSer
      */
     @Override
     public int insertExternalInterfaceLog(ExternalInterfaceLog externalInterfaceLog) {
+        externalInterfaceLog.setId(snowFlakeIdGenerator.nextId());
         return externalInterfaceLogMapper.insertExternalInterfaceLog(externalInterfaceLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FalseAlarmRestrainModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FalseAlarmRestrainModel;
 import com.phm.manage.mapper.FalseAlarmRestrainModelMapper;
 import com.phm.manage.service.IFalseAlarmRestrainModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class FalseAlarmRestrainModelServiceImpl implements IFalseAlarmRestrainMo
     @Autowired
     private FalseAlarmRestrainModelMapper falseAlarmRestrainModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询虚警抑制模型
      *
@@ -49,6 +53,7 @@ public class FalseAlarmRestrainModelServiceImpl implements IFalseAlarmRestrainMo
      */
     @Override
     public int insertFalseAlarmRestrainModel(FalseAlarmRestrainModel falseAlarmRestrainModel) {
+        falseAlarmRestrainModel.setId(snowFlakeIdGenerator.nextId());
         return falseAlarmRestrainModelMapper.insertFalseAlarmRestrainModel(falseAlarmRestrainModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FaultAnalyzeResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FaultAnalyzeResult;
 import com.phm.manage.mapper.FaultAnalyzeResultMapper;
 import com.phm.manage.service.IFaultAnalyzeResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FaultAnalyzeResultServiceImpl implements IFaultAnalyzeResultService
     @Autowired
     private FaultAnalyzeResultMapper faultAnalyzeResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询故障分析结果
      *
@@ -49,6 +52,7 @@ public class FaultAnalyzeResultServiceImpl implements IFaultAnalyzeResultService
      */
     @Override
     public int insertFaultAnalyzeResult(FaultAnalyzeResult faultAnalyzeResult) {
+        faultAnalyzeResult.setId(snowFlakeIdGenerator.nextId());
         return faultAnalyzeResultMapper.insertFaultAnalyzeResult(faultAnalyzeResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FaultCaseServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FaultCase;
 import com.phm.manage.mapper.FaultCaseMapper;
 import com.phm.manage.service.IFaultCaseService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FaultCaseServiceImpl implements IFaultCaseService {
     @Autowired
     private FaultCaseMapper faultCaseMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询故障案例信息
      *
@@ -49,6 +52,7 @@ public class FaultCaseServiceImpl implements IFaultCaseService {
      */
     @Override
     public int insertFaultCase(FaultCase faultCase) {
+        faultCase.setId(snowFlakeIdGenerator.nextId());
         return faultCaseMapper.insertFaultCase(faultCase);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FeedbackRawDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FeedbackRawData;
 import com.phm.manage.mapper.FeedbackRawDataMapper;
 import com.phm.manage.service.IFeedbackRawDataService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class FeedbackRawDataServiceImpl implements IFeedbackRawDataService {
     @Autowired
     private FeedbackRawDataMapper feedbackRawDataMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询反馈的源数据
      *
@@ -49,6 +53,7 @@ public class FeedbackRawDataServiceImpl implements IFeedbackRawDataService {
      */
     @Override
     public int insertFeedbackRawData(FeedbackRawData feedbackRawData) {
+        feedbackRawData.setId(snowFlakeIdGenerator.nextId());
         return feedbackRawDataMapper.insertFeedbackRawData(feedbackRawData);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FleetServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Fleet;
 import com.phm.manage.mapper.FleetMapper;
 import com.phm.manage.service.IFleetService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FleetServiceImpl implements IFleetService {
     @Autowired
     private FleetMapper fleetMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询机队信息
      *
@@ -49,6 +52,7 @@ public class FleetServiceImpl implements IFleetService {
      */
     @Override
     public int insertFleet(Fleet fleet) {
+        fleet.setId(snowFlakeIdGenerator.nextId());
         return fleetMapper.insertFleet(fleet);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ForecastModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ForecastModel;
 import com.phm.manage.mapper.ForecastModelMapper;
 import com.phm.manage.service.IForecastModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class ForecastModelServiceImpl implements IForecastModelService {
     @Autowired
     private ForecastModelMapper forecastModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询预测模型信息
      *
@@ -49,6 +52,7 @@ public class ForecastModelServiceImpl implements IForecastModelService {
      */
     @Override
     public int insertForecastModel(ForecastModel forecastModel) {
+        forecastModel.setId(snowFlakeIdGenerator.nextId());
         return forecastModelMapper.insertForecastModel(forecastModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ForecastResultServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.ForecastResult;
 import com.phm.manage.mapper.ForecastResultMapper;
 import com.phm.manage.service.IForecastResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class ForecastResultServiceImpl implements IForecastResultService {
     @Autowired
     private ForecastResultMapper forecastResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询预测结果
      *
@@ -51,6 +55,7 @@ public class ForecastResultServiceImpl implements IForecastResultService {
     @Override
     public int insertForecastResult(ForecastResult forecastResult) {
         forecastResult.setCreateTime(DateUtils.getNowDate());
+        forecastResult.setId(snowFlakeIdGenerator.nextId());
         return forecastResultMapper.insertForecastResult(forecastResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/GlobalIdRegisterServiceImpl.java

@@ -0,0 +1,90 @@
+package com.phm.manage.service.impl;
+
+import com.phm.common.utils.ip.IpUtils;
+import com.phm.manage.domain.GlobalIdRegister;
+import com.phm.manage.mapper.GlobalIdRegisterMapper;
+import com.phm.manage.service.IGlobalIdRegisterService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 全局机器ID注册Service业务层处理
+ *
+ * @author phm
+ * @date 2023-09-08
+ */
+@Service
+public class GlobalIdRegisterServiceImpl implements IGlobalIdRegisterService {
+    @Autowired
+    private GlobalIdRegisterMapper globalIdRegisterMapper;
+
+    /**
+     * 查询全局机器ID注册
+     *
+     * @param id 全局机器ID注册主键
+     * @return 全局机器ID注册
+     */
+    @Override
+    public GlobalIdRegister selectGlobalIdRegisterById(Long id) {
+        return globalIdRegisterMapper.selectGlobalIdRegisterById(id);
+    }
+
+    /**
+     * 查询全局机器ID注册列表
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 全局机器ID注册
+     */
+    @Override
+    public List<GlobalIdRegister> selectGlobalIdRegisterList(GlobalIdRegister globalIdRegister) {
+        return globalIdRegisterMapper.selectGlobalIdRegisterList(globalIdRegister);
+    }
+
+    /**
+     * 新增全局机器ID注册
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    @Override
+    public int insertGlobalIdRegister(GlobalIdRegister globalIdRegister) {
+        return globalIdRegisterMapper.insertGlobalIdRegister(globalIdRegister);
+    }
+
+    /**
+     * 修改全局机器ID注册
+     *
+     * @param globalIdRegister 全局机器ID注册
+     * @return 结果
+     */
+    @Override
+    public int updateGlobalIdRegister(GlobalIdRegister globalIdRegister) {
+        return globalIdRegisterMapper.updateGlobalIdRegister(globalIdRegister);
+    }
+
+    /**
+     * 批量删除全局机器ID注册
+     *
+     * @param ids 需要删除的全局机器ID注册主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGlobalIdRegisterByIds(Long[] ids) {
+        return globalIdRegisterMapper.deleteGlobalIdRegisterByIds(ids);
+    }
+
+    /**
+     * 删除全局机器ID注册信息
+     *
+     * @param id 全局机器ID注册主键
+     * @return 结果
+     */
+    @Override
+    public int deleteGlobalIdRegisterById(Long id) {
+        return globalIdRegisterMapper.deleteGlobalIdRegisterById(id);
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/GroundDiagnosisModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.GroundDiagnosisModel;
 import com.phm.manage.mapper.GroundDiagnosisModelMapper;
 import com.phm.manage.service.IGroundDiagnosisModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class GroundDiagnosisModelServiceImpl implements IGroundDiagnosisModelSer
     @Autowired
     private GroundDiagnosisModelMapper groundDiagnosisModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询地面诊断模型信息
      *
@@ -49,6 +53,7 @@ public class GroundDiagnosisModelServiceImpl implements IGroundDiagnosisModelSer
      */
     @Override
     public int insertGroundDiagnosisModel(GroundDiagnosisModel groundDiagnosisModel) {
+        groundDiagnosisModel.setId(snowFlakeIdGenerator.nextId());
         return groundDiagnosisModelMapper.insertGroundDiagnosisModel(groundDiagnosisModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ImportExportLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ImportExportLog;
 import com.phm.manage.mapper.ImportExportLogMapper;
 import com.phm.manage.service.IImportExportLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class ImportExportLogServiceImpl implements IImportExportLogService {
     @Autowired
     private ImportExportLogMapper importExportLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询导入导出日志;
      *
@@ -49,6 +53,7 @@ public class ImportExportLogServiceImpl implements IImportExportLogService {
      */
     @Override
     public int insertImportExportLog(ImportExportLog importExportLog) {
+        importExportLog.setId(snowFlakeIdGenerator.nextId());
         return importExportLogMapper.insertImportExportLog(importExportLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/InstructionInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.InstructionInfo;
 import com.phm.manage.mapper.InstructionInfoMapper;
 import com.phm.manage.service.IInstructionInfoService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class InstructionInfoServiceImpl implements IInstructionInfoService {
     @Autowired
     private InstructionInfoMapper instructionInfoMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询指令信息
      *
@@ -49,6 +53,7 @@ public class InstructionInfoServiceImpl implements IInstructionInfoService {
      */
     @Override
     public int insertInstructionInfo(InstructionInfo instructionInfo) {
+        instructionInfo.setId(snowFlakeIdGenerator.nextId());
         return instructionInfoMapper.insertInstructionInfo(instructionInfo);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/LifePartConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.LifePartConfig;
 import com.phm.manage.mapper.LifePartConfigMapper;
 import com.phm.manage.service.ILifePartConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class LifePartConfigServiceImpl implements ILifePartConfigService {
     @Autowired
     private LifePartConfigMapper lifePartConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询寿命件配置库信息
      *
@@ -49,6 +53,7 @@ public class LifePartConfigServiceImpl implements ILifePartConfigService {
      */
     @Override
     public int insertLifePartConfig(LifePartConfig lifePartConfig) {
+        lifePartConfig.setId(snowFlakeIdGenerator.nextId());
         return lifePartConfigMapper.insertLifePartConfig(lifePartConfig);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MaintenanceServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Maintenance;
 import com.phm.manage.mapper.MaintenanceMapper;
 import com.phm.manage.service.IMaintenanceService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MaintenanceServiceImpl implements IMaintenanceService {
     @Autowired
     private MaintenanceMapper maintenanceMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维护信息
      *
@@ -49,6 +53,7 @@ public class MaintenanceServiceImpl implements IMaintenanceService {
      */
     @Override
     public int insertMaintenance(Maintenance maintenance) {
+        maintenance.setId(snowFlakeIdGenerator.nextId());
         return maintenanceMapper.insertMaintenance(maintenance);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MaintenanceTestControlServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.MaintenanceTestControl;
 import com.phm.manage.mapper.MaintenanceTestControlMapper;
 import com.phm.manage.service.IMaintenanceTestControlService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MaintenanceTestControlServiceImpl implements IMaintenanceTestContro
     @Autowired
     private MaintenanceTestControlMapper maintenanceTestControlMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维修测试控制
      *
@@ -49,6 +53,7 @@ public class MaintenanceTestControlServiceImpl implements IMaintenanceTestContro
      */
     @Override
     public int insertMaintenanceTestControl(MaintenanceTestControl maintenanceTestControl) {
+        maintenanceTestControl.setId(snowFlakeIdGenerator.nextId());
         return maintenanceTestControlMapper.insertMaintenanceTestControl(maintenanceTestControl);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MonitorParameterConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.MonitorParameterConfig;
 import com.phm.manage.mapper.MonitorParameterConfigMapper;
 import com.phm.manage.service.IMonitorParameterConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MonitorParameterConfigServiceImpl implements IMonitorParameterConfi
     @Autowired
     private MonitorParameterConfigMapper monitorParameterConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询状态监控参数配置信息
      *
@@ -49,6 +53,7 @@ public class MonitorParameterConfigServiceImpl implements IMonitorParameterConfi
      */
     @Override
     public int insertMonitorParameterConfig(MonitorParameterConfig monitorParameterConfig) {
+        monitorParameterConfig.setId(snowFlakeIdGenerator.nextId());
         return monitorParameterConfigMapper.insertMonitorParameterConfig(monitorParameterConfig);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/OrderConfigServiceImpl.java

@@ -0,0 +1,101 @@
+package com.phm.manage.service.impl;
+
+import com.phm.common.utils.DateUtils;
+import com.phm.manage.domain.OrderConfig;
+import com.phm.manage.mapper.OrderConfigMapper;
+import com.phm.manage.service.IOrderConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 指令配置Service业务层处理
+ *
+ * @author phm
+ * @date 2023-10-07
+ */
+@Service
+public class OrderConfigServiceImpl implements IOrderConfigService {
+    @Autowired
+    private OrderConfigMapper orderConfigMapper;
+
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
+    /**
+     * 查询指令配置
+     *
+     * @param id 指令配置主键
+     * @return 指令配置
+     */
+    @Override
+    public OrderConfig selectOrderConfigById(Long id) {
+        return orderConfigMapper.selectOrderConfigById(id);
+    }
+
+    @Override
+    public OrderConfig selectOrderConfigByCode(String code) {
+        return orderConfigMapper.selectOrderConfigByCode(code);
+    }
+
+    /**
+     * 查询指令配置列表
+     *
+     * @param orderConfig 指令配置
+     * @return 指令配置
+     */
+    @Override
+    public List<OrderConfig> selectOrderConfigList(OrderConfig orderConfig) {
+        return orderConfigMapper.selectOrderConfigList(orderConfig);
+    }
+
+    /**
+     * 新增指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    @Override
+    public int insertOrderConfig(OrderConfig orderConfig) {
+        orderConfig.initCreatInfo();
+        orderConfig.setId(snowFlakeIdGenerator.nextId());
+        return orderConfigMapper.insertOrderConfig(orderConfig);
+    }
+
+    /**
+     * 修改指令配置
+     *
+     * @param orderConfig 指令配置
+     * @return 结果
+     */
+    @Override
+    public int updateOrderConfig(OrderConfig orderConfig) {
+        orderConfig.initUpdateInfo();
+        orderConfig.setUpdateTime(DateUtils.getNowDate());
+        return orderConfigMapper.updateOrderConfig(orderConfig);
+    }
+
+    /**
+     * 批量删除指令配置
+     *
+     * @param ids 需要删除的指令配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderConfigByIds(Long[] ids) {
+        return orderConfigMapper.deleteOrderConfigByIds(ids);
+    }
+
+    /**
+     * 删除指令配置信息
+     *
+     * @param id 指令配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderConfigById(Long id) {
+        return orderConfigMapper.deleteOrderConfigById(id);
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/OrderInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.OrderInfo;
 import com.phm.manage.mapper.OrderInfoMapper;
 import com.phm.manage.service.IOrderInfoService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
     @Autowired
     private OrderInfoMapper orderInfoMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询系统指令信息
      *
@@ -51,6 +55,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
     @Override
     public int insertOrderInfo(OrderInfo orderInfo) {
         orderInfo.initCreatInfo();
+        orderInfo.setId(snowFlakeIdGenerator.nextId());
         return orderInfoMapper.insertOrderInfo(orderInfo);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/PerformanceMonitorModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.PerformanceMonitorModel;
 import com.phm.manage.mapper.PerformanceMonitorModelMapper;
 import com.phm.manage.service.IPerformanceMonitorModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class PerformanceMonitorModelServiceImpl implements IPerformanceMonitorMo
     @Autowired
     private PerformanceMonitorModelMapper performanceMonitorModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询性能监测模型信息
      *
@@ -49,6 +53,7 @@ public class PerformanceMonitorModelServiceImpl implements IPerformanceMonitorMo
      */
     @Override
     public int insertPerformanceMonitorModel(PerformanceMonitorModel performanceMonitorModel) {
+        performanceMonitorModel.setId(snowFlakeIdGenerator.nextId());
         return performanceMonitorModelMapper.insertPerformanceMonitorModel(performanceMonitorModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/PreHandleResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.PreHandleResult;
 import com.phm.manage.mapper.PreHandleResultMapper;
 import com.phm.manage.service.IPreHandleResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class PreHandleResultServiceImpl implements IPreHandleResultService {
     @Autowired
     private PreHandleResultMapper preHandleResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据预处理结果
      *
@@ -49,6 +53,7 @@ public class PreHandleResultServiceImpl implements IPreHandleResultService {
      */
     @Override
     public int insertPreHandleResult(PreHandleResult preHandleResult) {
+        preHandleResult.setId(snowFlakeIdGenerator.nextId());
         return preHandleResultMapper.insertPreHandleResult(preHandleResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ProductServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.Product;
 import com.phm.manage.mapper.ProductMapper;
 import com.phm.manage.service.IProductService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +22,8 @@ public class ProductServiceImpl implements IProductService {
     @Autowired
     private ProductMapper productMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询产品树信息
      *
@@ -58,6 +61,7 @@ public class ProductServiceImpl implements IProductService {
             product.setAncestors(pr.getAncestors() + "," + product.getParentId());
         }
         product.initCreatInfo();
+        product.setId(snowFlakeIdGenerator.nextId());
         return productMapper.insertProduct(product);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SoftwareConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.SoftwareConfig;
 import com.phm.manage.mapper.SoftwareConfigMapper;
 import com.phm.manage.service.ISoftwareConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class SoftwareConfigServiceImpl implements ISoftwareConfigService {
     @Autowired
     private SoftwareConfigMapper softwareConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询软件配置库信息
      *
@@ -49,6 +53,7 @@ public class SoftwareConfigServiceImpl implements ISoftwareConfigService {
      */
     @Override
     public int insertSoftwareConfig(SoftwareConfig softwareConfig) {
+        softwareConfig.setId(snowFlakeIdGenerator.nextId());
         return softwareConfigMapper.insertSoftwareConfig(softwareConfig);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SortieServiceImpl.java

@@ -1,13 +1,12 @@
 package com.phm.manage.service.impl;
 
-import com.phm.common.core.domain.entity.SysUser;
 import com.phm.common.exception.ServiceException;
-import com.phm.common.utils.SecurityUtils;
 import com.phm.common.utils.StringUtils;
 import com.phm.common.utils.bean.BeanValidators;
 import com.phm.manage.domain.Sortie;
 import com.phm.manage.mapper.SortieMapper;
 import com.phm.manage.service.ISortieService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +31,9 @@ public class SortieServiceImpl implements ISortieService {
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询架次信息
      *
@@ -63,6 +65,7 @@ public class SortieServiceImpl implements ISortieService {
     @Override
     public int insertSortie(Sortie sortie) {
         sortie.initCreatInfo();
+        sortie.setId(snowFlakeIdGenerator.nextId());
         return sortieMapper.insertSortie(sortie);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/JaxbUtil.java

@@ -0,0 +1,49 @@
+package com.phm.manage.util;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+
+/**
+ * @Description JaxbUtil
+ * @Author WGK
+ * @Date 2023/10/11 21:35
+ */
+public class JaxbUtil {
+    public static final String DEFAULT_ENCODING = "UTF-8";
+    private static final Marshaller.Listener MAR_LISTENER = new Marshaller.Listener() {
+        @Override
+        public void beforeMarshal(Object source) {
+            Field[] fields = source.getClass().getDeclaredFields();
+            for (Field f : fields) {
+                f.setAccessible(true);
+                try {
+                    // 对象为空且类型为String时候设置空值
+                    if (f.getType() == String.class && f.get(source) == null) {
+                        f.set(source, "");
+                    }
+                } catch (IllegalAccessException exception) {
+                    exception.printStackTrace();
+                }
+            }
+        }
+    };
+
+    public static String convertToXml(Object obj) throws Exception {
+        return convertToXml(obj, DEFAULT_ENCODING);
+    }
+
+    public static String convertToXml(Object obj, String encoding) throws Exception {
+        JAXBContext context = JAXBContext.newInstance(obj.getClass());
+        Marshaller marshaller = context.createMarshaller();
+        // 指定是否使用换行和缩排对已编组 XML 数据进行格式化的属性名称。
+        marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+        marshaller.setProperty(Marshaller.JAXB_ENCODING, encoding);
+        marshaller.setListener(MAR_LISTENER);
+        StringWriter writer = new StringWriter();
+        marshaller.marshal(obj, writer);
+        return writer.toString();
+    }
+
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/JsonToObject.java

@@ -0,0 +1,9 @@
+package com.phm.manage.util;
+
+/**
+ * @Description JsonToObject
+ * @Author WGK
+ * @Date 2023/10/7 14:20
+ */
+public class JsonToObject {
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/SnowFlakeIdGenerator.java

@@ -0,0 +1,94 @@
+package com.phm.manage.util;
+
+
+/**
+ * @Description 雪花算法生成ID
+ * @Author WGK
+ * @Date 2023/9/8 9:35
+ */
+public class SnowFlakeIdGenerator {
+    /**
+     * 起始的时间戳
+     */
+    private final static long START_STAMP = 1480166465631L;
+
+    /**
+     * 每一部分占用的位数
+     */
+    private final static long SEQUENCE_BIT = 12; //序列号占用的位数
+    private final static long MACHINE_BIT = 5;   //机器标识占用的位数
+    private final static long DATACENTER_BIT = 5;//数据中心占用的位数
+
+    /**
+     * 每一部分的最大值
+     */
+    public final static long MAX_DATACENTER_NUM = ~(-1L << DATACENTER_BIT);
+    public final static long MAX_MACHINE_NUM = ~(-1L << MACHINE_BIT);
+    private final static long MAX_SEQUENCE = ~(-1L << SEQUENCE_BIT);
+
+    /**
+     * 每一部分向左的位移
+     */
+    private final static long MACHINE_LEFT = SEQUENCE_BIT;
+    private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT;
+    private final static long TIMESTAMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT;
+
+    private final long datacenterId;  //数据中心
+    private final long machineId;     //机器标识
+    private long sequence = 0L; //序列号
+    private long lastTimestamp = -1L;//上一次时间戳
+
+    public SnowFlakeIdGenerator(long datacenterId, long machineId) {
+        if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0) {
+            throw new IllegalArgumentException("datacenterId can't be greater than MAX_DATACENTER_NUM or less than 0");
+        }
+        if (machineId > MAX_MACHINE_NUM || machineId < 0) {
+            throw new IllegalArgumentException("machineId can't be greater than MAX_MACHINE_NUM or less than 0");
+        }
+        this.datacenterId = datacenterId;
+        this.machineId = machineId;
+    }
+
+    /**
+     * 产生下一个ID
+     *
+     * @return id
+     */
+    public synchronized long nextId() {
+        long currStmp = getNewTimestamp();
+        if (currStmp < lastTimestamp) {
+            throw new RuntimeException("Clock moved backwards.  Refusing to generate id");
+        }
+
+        if (currStmp == lastTimestamp) {
+            //相同毫秒内，序列号自增
+            sequence = (sequence + 1) & MAX_SEQUENCE;
+            //同一毫秒的序列数已经达到最大
+            if (sequence == 0L) {
+                currStmp = getNextMill();
+            }
+        } else {
+            //不同毫秒内，序列号置为0
+            sequence = 0L;
+        }
+
+        lastTimestamp = currStmp;
+
+        return (currStmp - START_STAMP) << TIMESTAMP_LEFT //时间戳部分
+                | datacenterId << DATACENTER_LEFT       //数据中心部分
+                | machineId << MACHINE_LEFT             //机器标识部分
+                | sequence;                             //序列号部分
+    }
+
+    private long getNextMill() {
+        long mill = getNewTimestamp();
+        while (mill <= lastTimestamp) {
+            mill = getNewTimestamp();
+        }
+        return mill;
+    }
+
+    private long getNewTimestamp() {
+        return System.currentTimeMillis();
+    }
+}

PHM-admin/phm-manage/src/main/java/com/phm/manage/util/XMLParserWithJAXB.java

@@ -0,0 +1,37 @@
+package com.phm.manage.util;
+
+import com.phm.manage.domain.common.OrderXmlVO;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import java.io.StringReader;
+
+/**
+ * @Description XMLParserWithJAXB
+ * @Author WGK
+ * @Date 2023/9/22 15:13
+ */
+@Slf4j
+public class XMLParserWithJAXB {
+    public static OrderXmlVO xmlToObject(String xmlString) {
+        OrderXmlVO xmlVO = null;
+        log.error(xmlString);
+        // 创建JAXB上下文
+        try {
+            JAXBContext context = JAXBContext.newInstance(OrderXmlVO.class);
+            // 创建Unmarshaller
+            Unmarshaller unmarshaller = context.createUnmarshaller();
+            // 解析XML字符串并将其转换为Java对象
+            xmlVO = (OrderXmlVO) unmarshaller.unmarshal(new StringReader(xmlString));
+
+            // 现在您可以使用yourObject对象
+            System.out.println("Type: " + xmlVO.getType());
+            System.out.println("Name: " + xmlVO.getName());
+        } catch (JAXBException exception) {
+            log.error(exception.getMessage());
+        }
+        return xmlVO;
+    }
+}

PHM-admin/phm-manage/src/main/resources/mapper/manage/AfterAnalysisResultMapper.xml

@@ -1,61 +1,63 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.phm.manage.mapper.AfterAnalysisResultMapper">
-    
+
     <resultMap type="AfterAnalysisResult" id="AfterAnalysisResultResult">
-        <result property="id"    column="id"    />
-        <result property="remark"    column="remark"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="createdBy"    column="created_by"    />
-        <result property="createdTime"    column="created_time"    />
-        <result property="updatedBy"    column="updated_by"    />
-        <result property="updatedTime"    column="updated_time"    />
+        <result property="id" column="id"/>
+        <result property="remark" column="remark"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectAfterAnalysisResultVo">
-        select id, is_delete, created_by, created_time, updated_by, updated_time from phm_after_analysis_result
+        select id, remark, is_delete, create_by, create_time, update_by, update_time
+        from PHM.PHM_AFTER_ANALYSIS_RESULT
     </sql>
 
-    <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult" resultMap="AfterAnalysisResultResult">
+    <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult"
+            resultMap="AfterAnalysisResultResult">
         <include refid="selectAfterAnalysisResultVo"/>
-        <where>  
-            <if test="remark != null "> and remark = #{remark}</if>
-            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-            <if test="createdTime != null "> and created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+        <where>
+            <if test="isDelete != null ">and is_delete = #{isDelete}</if>
         </where>
     </select>
-    
+
     <select id="selectAfterAnalysisResultById" parameterType="Long" resultMap="AfterAnalysisResultResult">
         <include refid="selectAfterAnalysisResultVo"/>
         where id = #{id}
     </select>
-        
-    <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult" useGeneratedKeys="true" keyProperty="id">
-        insert into phm_after_analysis_result
+
+    <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult">
+        insert into PHM.PHM_AFTER_ANALYSIS_RESULT
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="remark != null">remark,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createdBy != null">created_by,</if>
             <if test="createdTime != null">created_time,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createdBy != null">#{createdBy},</if>
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateAfterAnalysisResult" parameterType="AfterAnalysisResult">
-        update phm_after_analysis_result
+        update PHM.PHM_AFTER_ANALYSIS_RESULT
         <trim prefix="SET" suffixOverrides=",">
+            <if test="remark != null">remark = #{remark},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createdBy != null">created_by = #{createdBy},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>
@@ -66,11 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteAfterAnalysisResultById" parameterType="Long">
-        delete from phm_after_analysis_result where id = #{id}
+        delete
+        from PHM.PHM_AFTER_ANALYSIS_RESULT
+        where id = #{id}
     </delete>
 
     <delete id="deleteAfterAnalysisResultByIds" parameterType="String">
-        delete from phm_after_analysis_result where id in 
+        delete from PHM.PHM_AFTER_ANALYSIS_RESULT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml

@@ -5,29 +5,39 @@
 <mapper namespace="com.phm.manage.mapper.AircraftMapper">
 
     <resultMap type="Aircraft" id="AircraftResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="number"    column="number"    />
-        <result property="fleetId"    column="fleet_id"    />
-        <result property="aircraftTypeId"    column="aircraft_type_id"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="number" column="number"/>
+        <result property="fleetId" column="fleet_id"/>
+        <result property="aircraftTypeId" column="aircraft_type_id"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectAircraftVo">
-        select id, name, number, fleet_id, aircraft_type_id, is_delete, create_by, create_time, update_by, update_time from phm_aircraft
+        select id,
+               name,
+               number,
+               fleet_id,
+               aircraft_type_id,
+               is_delete,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from PHM.PHM_AIRCRAFT
     </sql>
 
     <select id="selectAircraftList" parameterType="Aircraft" resultMap="AircraftResult">
         <include refid="selectAircraftVo"/>
         <where>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="number != null  and number != ''"> and number like concat('%', #{number}, '%')</if>
-            <if test="fleetId != null  and fleetId != ''"> and fleet_id = #{fleetId}</if>
-            <if test="aircraftTypeId != null  and aircraftTypeId != ''"> and aircraft_type_id = #{aircraftTypeId}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="number != null  and number != ''">and number like concat('%', #{number}, '%')</if>
+            <if test="fleetId != null  and fleetId != ''">and fleet_id = #{fleetId}</if>
+            <if test="aircraftTypeId != null  and aircraftTypeId != ''">and aircraft_type_id = #{aircraftTypeId}</if>
         </where>
     </select>
 
@@ -36,9 +46,10 @@
         where id = #{id}
     </select>
 
-    <insert id="insertAircraft" parameterType="Aircraft" useGeneratedKeys="true" keyProperty="id">
-        insert into phm_aircraft
+    <insert id="insertAircraft" parameterType="Aircraft">
+        insert into PHM.PHM_AIRCRAFT
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="number != null">number,</if>
             <if test="fleetId != null">fleet_id,</if>
@@ -50,6 +61,7 @@
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="number != null">#{number},</if>
             <if test="fleetId != null">#{fleetId},</if>
@@ -63,7 +75,7 @@
     </insert>
 
     <update id="updateAircraft" parameterType="Aircraft">
-        update phm_aircraft
+        update PHM.PHM_AIRCRAFT
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="number != null">number = #{number},</if>
@@ -80,12 +92,12 @@
 
     <delete id="deleteAircraftById" parameterType="Long">
         delete
-        from phm_aircraft
+        from PHM.PHM_AIRCRAFT
         where id = #{id}
     </delete>
 
     <delete id="deleteAircraftByIds" parameterType="String">
-        delete from phm_aircraft where id in
+        delete from PHM.PHM_AIRCRAFT where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>