lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java

@@ -13,7 +13,7 @@
    public static final String DB_TYPE_ORACLE = "ORACLE";

    /**达梦数据库*/
    public static final String DB_TYPE_DM = "DM";
    public static final String DB_TYPE_DM = "dm dbms";

    /**postgreSQL达梦数据库*/
    public static final String DB_TYPE_POSTGRESQL = "POSTGRESQL";

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -88,14 +88,6 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**使用部门编码*/
//    @TableField(exist = false)
    private String useDepartNum;

    /**维修部门编码*/
//    @TableField(exist = false)
    private String repairDepartNum;

    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids
    /**部门负责人的ids*/
    @TableField(exist = false)
@@ -139,8 +131,6 @@
                Objects.equals(createBy, depart.createBy) &&
                Objects.equals(createTime, depart.createTime) &&
                Objects.equals(updateBy, depart.updateBy) &&
                Objects.equals(useDepartNum, depart.useDepartNum) &&
                Objects.equals(repairDepartNum, depart.repairDepartNum) &&
                Objects.equals(updateTime, depart.updateTime);
    }

@@ -153,6 +143,6 @@
        return Objects.hash(super.hashCode(), id, parentId, departName,
                departNameEn, departNameAbbr, departOrder, description,orgCategory,
                orgType, orgCode, mobile, fax, address, memo, status,
                delFlag, createBy, createTime, updateBy, updateTime,useDepartNum,repairDepartNum);
                delFlag, createBy, createTime, updateBy, updateTime);
    }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java

@@ -76,12 +76,6 @@

    private Date updateTime;

    /**使用部门编码*/
    private String useDepartNum;

    /**维修部门编码*/
    private String repairDepartNum;

    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段部门负责人ids
    /**部门负责人ids*/
    private String directorUserIds;
@@ -122,8 +116,6 @@
        this.updateBy = sysDepart.getUpdateBy();
        this.updateTime = sysDepart.getUpdateTime();
        this.directorUserIds = sysDepart.getDirectorUserIds();
        this.useDepartNum = sysDepart.getUseDepartNum();
        this.repairDepartNum = sysDepart.getRepairDepartNum();
        this.entity = sysDepart;
    }

@@ -358,22 +350,6 @@
        this.directorUserIds = directorUserIds;
    }

    public String getUseDepartNum() {
        return useDepartNum;
    }

    public void setUseDepartNum(String useDepartNum) {
        this.useDepartNum = useDepartNum;
    }

    public String getRepairDepartNum() {
        return repairDepartNum;
    }

    public void setRepairDepartNum(String repairDepartNum) {
        this.repairDepartNum = repairDepartNum;
    }

    public ScopedSlots getScopedSlots(){return scopedSlots;}

    public void  setScopedSlots(ScopedSlots scopedSlots){this.scopedSlots = scopedSlots;}
@@ -418,8 +394,6 @@
                Objects.equals(updateBy, model.updateBy) &&
                Objects.equals(updateTime, model.updateTime) &&
                Objects.equals(directorUserIds, model.directorUserIds) &&
                Objects.equals(useDepartNum, model.useDepartNum) &&
                Objects.equals(repairDepartNum, model.repairDepartNum) &&
                Objects.equals(children, model.children);
    }

@@ -432,7 +406,7 @@
        return Objects.hash(id, parentId, departName, departNameEn, departNameAbbr,
                departOrder, description, orgCategory, orgType, orgCode, mobile, fax, address,
                memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime,
                children,directorUserIds,useDepartNum,repairDepartNum);
                children,directorUserIds);
    }

}

 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml

@@ -38,39 +38,19 @@
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
    initialize-schema: embedded
    #定时任务启动开关，true-开  false-关
    jdbc:
      initialize-schema: never
    auto-startup: true
    #延迟1秒启动定时任务
    startup-delay: 1s
    #启动时更新己存在的Job
    overwrite-existing-jobs: true
    properties:
      org:
        quartz:
          scheduler:
            instanceName: MyScheduler
            instanceId: AUTO
          jobStore:
            selectWithLockSQL: SELECT* FROM {0}LOCKS UPDLOCK WHERE LOCK_NAME = ?
            # class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
            # driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
            # tablePrefix: QRTZ_
            # isClustered: true
            # misfireThreshold: 12000
            # clusterCheckinInterval: 15000
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10
            threadPriority: 5
            threadsInheritContextClassLoaderOfInitializingThread: true
  #json 时间戳统一转换
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss
    time-zone: GMT+8
  jpa:
    open-in-view: false
    database-platform: org.hibernate.dialect.SQLServerDialect
    properties:
      hibernate:
        dialect: org.hibernate.dialect.Oracle8iDialect
  aop:
    proxy-target-class: true
  #配置freemarker
@@ -95,55 +75,15 @@
      matching-strategy: ant_path_matcher
  resource:
    static-locations: classpath:/static/,classpath:/public/
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
#  autoconfigure:
#    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
      stat-view-servlet:
        enabled: true
        loginUsername: admin
        loginPassword: 123456
        allow:
      web-stat-filter:
        enabled: true
    dynamic:
      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
        # 连接池的配置信息
        # 初始化大小，最小，最大
        initial-size: 5
        min-idle: 5
        maxActive: 20
        # 配置获取连接等待超时的时间
        maxWait: 60000
        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
        timeBetweenEvictionRunsMillis: 60000
        # 配置一个连接在池中最小生存的时间，单位是毫秒
        minEvictableIdleTimeMillis: 300000
        validationQuery: SELECT 1
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        # 打开PSCache，并且指定每个连接上PSCache的大小
        poolPreparedStatements: true
        maxPoolPreparedStatementPerConnectionSize: 20
        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
        filters: stat,wall,slf4j
        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:sqlserver://192.168.124.118:1433;databasename=LXZN_TEST_430
#          url: jdbc:sqlserver://localhost:1433;databasename=LXZN_TEST_430
#          url: jdbc:sqlserver://192.168.124.118:1433;databasename=EAM_430_TEST
          username: sa
          password: 123
          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
        # 多数据源配置
        #multi-datasource1:
        #  url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
        #  username: sa
        #  password: 123
        #  driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
      driverClassName: dm.jdbc.driver.DmDriver
      url: jdbc:dm://192.168.124.118:5236/?LXZN_TEST_420&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
      username: LXZN_TEST_420
      password: LXZN@1688
  #redis 配置
  redis:
    database: 0

 lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml

@@ -135,18 +135,7 @@
          url: jdbc:sqlserver://195.0.1.10:1433;databasename=SSGX_kns
          username: sa
          password: Sa123456789
          #password: 123
          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
          #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          #username: root
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
        # 多数据源配置
        #multi-datasource1:
        #  url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
        #  username: sa
        #  password: 123
        #  driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
  #redis 配置
  redis:
    database: 0