Browse Source

申诉驳回v2.2.0相关配置

songxinlu 3 năm trước cách đây
mục cha
commit
2efb50f3a0
59 tập tin đã thay đổi với 1786 bổ sung384 xóa
  1. 43 0
      common/src/main/java/com/lantone/common/dto/RespDTO.java
  2. 18 0
      common/src/main/java/com/lantone/common/vo/appeal/MedAppealInfoVO.java
  3. 15 0
      config-center/src/main/resources/shared/report-service-debug.yml
  4. 15 0
      config-center/src/main/resources/shared/report-service-inner.yml
  5. 15 0
      config-center/src/main/resources/shared/report-service-local.yml
  6. 15 0
      config-center/src/main/resources/shared/report-service-outer.yml
  7. 15 0
      config-center/src/main/resources/shared/report-service-test.yml
  8. 60 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DB2DruidConfig.java
  9. 20 4
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java
  10. 97 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/AppealExamineInfo.java
  11. 145 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/AppealInfo.java
  12. 79 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowInfo.java
  13. 109 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowLink.java
  14. 85 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowNode.java
  15. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/AppealExamineInfoFacade.java
  16. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/AppealInfoFacade.java
  17. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowInfoFacade.java
  18. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowLinkFacade.java
  19. 14 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowNodeFacade.java
  20. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/AppealExamineInfoMapper.java
  21. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/AppealInfoMapper.java
  22. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowInfoMapper.java
  23. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowLinkMapper.java
  24. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowNodeMapper.java
  25. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/AppealExamineInfoService.java
  26. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/AppealInfoService.java
  27. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowInfoService.java
  28. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowLinkService.java
  29. 13 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowNodeService.java
  30. 17 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/AppealExamineInfoServiceImpl.java
  31. 17 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/AppealInfoServiceImpl.java
  32. 17 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowInfoServiceImpl.java
  33. 17 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowLinkServiceImpl.java
  34. 17 0
      dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowNodeServiceImpl.java
  35. 89 42
      dblayer-mbg/src/main/resources/application-debug.yml
  36. 89 42
      dblayer-mbg/src/main/resources/application-inner.yml
  37. 89 42
      dblayer-mbg/src/main/resources/application-local.yml
  38. 89 42
      dblayer-mbg/src/main/resources/application-outer.yml
  39. 89 42
      dblayer-mbg/src/main/resources/application-test.yml
  40. 5 0
      dblayer-mbg/src/main/resources/mapperdb2/AppealExamineInfoMapper.xml
  41. 5 0
      dblayer-mbg/src/main/resources/mapperdb2/AppealInfoMapper.xml
  42. 5 0
      dblayer-mbg/src/main/resources/mapperdb2/WorkFlowInfoMapper.xml
  43. 5 0
      dblayer-mbg/src/main/resources/mapperdb2/WorkFlowLinkMapper.xml
  44. 5 0
      dblayer-mbg/src/main/resources/mapperdb2/WorkFlowNodeMapper.xml
  45. 21 0
      dblayer-mbg/src/main/resources/mapperdb2/base/BaseAppealExamineInfoMapper.xml
  46. 29 0
      dblayer-mbg/src/main/resources/mapperdb2/base/BaseAppealInfoMapper.xml
  47. 18 0
      dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowInfoMapper.xml
  48. 23 0
      dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowLinkMapper.xml
  49. 19 0
      dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowNodeMapper.xml
  50. 7 36
      dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java
  51. 12 12
      dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java
  52. 19 0
      document/docker/docker-compose-debug.yml
  53. 8 1
      gateway-service/src/main/resources/bootstrap.yml
  54. 1 0
      pom.xml
  55. 15 5
      report-service/pom.xml
  56. 23 0
      report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java
  57. 39 0
      report-service/src/main/java/com/lantone/report/web/MedAppealInfoManagementController.java
  58. 13 14
      report-service/src/main/resources/bootstrap.yml
  59. 53 102
      report-service/src/main/resources/logback-spring.xml

+ 43 - 0
common/src/main/java/com/lantone/common/dto/RespDTO.java

@@ -0,0 +1,43 @@
+package com.lantone.common.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author songxl
+ * @Date 2022/1/13
+ */
+public class RespDTO<T> implements Serializable {
+    public String code = "0";
+    public String msg = "";
+    public T data;
+
+    public RespDTO() {
+    }
+
+    public static RespDTO onSuc(Object data) {
+        RespDTO resp = new RespDTO();
+        resp.data = data;
+        return resp;
+    }
+
+    public static RespDTO onSucBoth(String code, String msg, Object data) {
+        RespDTO resp = new RespDTO();
+        resp.code = code;
+        resp.msg = msg;
+        resp.data = data;
+        return resp;
+    }
+
+    public static RespDTO onError(String errMsg) {
+        RespDTO resp = new RespDTO();
+        resp.code = "-1";
+        resp.msg = errMsg;
+        return resp;
+    }
+
+    public String toString() {
+        return "RespDTO{code='" + this.code + '\'' + ", msg='" + this.msg + '\'' + ", data=" + this.data + '}';
+    }
+}
+

+ 18 - 0
common/src/main/java/com/lantone/common/vo/appeal/MedAppealInfoVO.java

@@ -0,0 +1,18 @@
+package com.lantone.common.vo.appeal;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author songxl
+ * @Date 2022/1/6
+ */
+@Data
+public class MedAppealInfoVO {
+    @ApiModelProperty(value = "编号",required = true)
+    @NotNull(message = "编号为空")
+    private Long id;
+}

+ 15 - 0
config-center/src/main/resources/shared/report-service-debug.yml

@@ -0,0 +1,15 @@
+spring:
+  redis:
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    password: emrais # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间(毫秒)
+
+swagger.show: true

+ 15 - 0
config-center/src/main/resources/shared/report-service-inner.yml

@@ -0,0 +1,15 @@
+spring:
+  redis:
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    password: emrais # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间(毫秒)
+
+swagger.show: false

+ 15 - 0
config-center/src/main/resources/shared/report-service-local.yml

@@ -0,0 +1,15 @@
+spring:
+  redis:
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    password: emrais # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间(毫秒)
+
+swagger.show: true

+ 15 - 0
config-center/src/main/resources/shared/report-service-outer.yml

@@ -0,0 +1,15 @@
+spring:
+  redis:
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    password: emrais # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间(毫秒)
+
+swagger.show: false

+ 15 - 0
config-center/src/main/resources/shared/report-service-test.yml

@@ -0,0 +1,15 @@
+spring:
+  redis:
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    password: emrais # Redis服务器连接密码(默认为空)
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
+        max-idle: 5 # 连接池中的最大空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 20000 # 连接超时时间(毫秒)
+
+swagger.show: true

+ 60 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DB2DruidConfig.java

@@ -0,0 +1,60 @@
+package com.lantone.dblayermbg.config;
+
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.sql.DataSource;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/4/8 21:41
+ */
+@EnableTransactionManagement
+@Configuration
+@MapperScan(basePackages = "com.lantone.dblayermbg.mapperdb2", sqlSessionFactoryRef = "db2sqlSessionFactory")
+public class DB2DruidConfig {
+
+    /**
+     * mybatis-plus分页插件<br>
+     * 文档:http://mp.baomidou.com<br>
+     */
+    @Bean(name = "db2PaginationInterceptor")
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
+        //paginationInterceptor.setOverflow(false);
+        // 设置最大单页限制数量,默认500条,-1不受限制
+        paginationInterceptor.setLimit(-1L);
+        return paginationInterceptor;
+    }
+
+    @Bean(name = "db2")
+    @ConfigurationProperties(prefix = "spring.datasource.druid.db2" )
+    public DataSource db2() {
+        return DruidDataSourceBuilder.create().build();
+    }
+
+    @Bean("db2sqlSessionFactory")
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("db2") DataSource db2) throws Exception {
+        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
+        sqlSessionFactory.setDataSource(db2);
+        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/mapperdb2/*.xml"));
+        return sqlSessionFactory.getObject();
+    }
+
+}

+ 20 - 4
dblayer-mbg/src/main/java/com/lantone/dblayermbg/config/DruidConfig.java

@@ -1,10 +1,9 @@
 package com.lantone.dblayermbg.config;
 
-import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -24,14 +23,15 @@ import javax.sql.DataSource;
  */
 @EnableTransactionManagement
 @Configuration
-@MapperScan(basePackages = "com.lantone.dblayermbg.mapper")
+@MapperScan(basePackages = "com.lantone.dblayermbg.mapper", sqlSessionFactoryRef = "db1sqlSessionFactory")
 public class DruidConfig {
 
     /**
      * mybatis-plus分页插件<br>
      * 文档:http://mp.baomidou.com<br>
      */
-    @Bean
+    @Bean(name = "db1PaginationInterceptor")
+    @Primary
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
@@ -41,4 +41,20 @@ public class DruidConfig {
         return paginationInterceptor;
     }
 
+    @Bean(name = "db1")
+    @ConfigurationProperties(prefix = "spring.datasource.druid.db1" )
+    @Primary
+    public DataSource db1() {
+        return DruidDataSourceBuilder.create().build();
+    }
+
+    @Bean("db1sqlSessionFactory")
+    @Primary
+    public SqlSessionFactory sqlSessionFactory(@Qualifier("db1") DataSource db1) throws Exception {
+        MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
+        sqlSessionFactory.setDataSource(db1);
+        sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:/mapper/*.xml"));
+        return sqlSessionFactory.getObject();
+    }
+
 }

+ 97 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/AppealExamineInfo.java

@@ -0,0 +1,97 @@
+package com.lantone.dblayermbg.entity.appeal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 申诉审批表 实体类
+ * </p>
+ */
+@Data
+@TableName("med_appeal_examine_info")
+public class AppealExamineInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申诉审批id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 申诉id
+     */
+    @TableField("appeal_info_id")
+    private Long appealInfoId;
+
+    /**
+     * 审核人id
+     */
+    @TableField("check_id")
+    private Long checkId;
+
+    /**
+     * 审核状态:0:驳回|1:通过
+     */
+    @TableField("example_status")
+    private String exampleStatus;
+
+    /**
+     * 审核处理方式: 1:修改|2:删除|3:新增已有|4:新增缺失
+     */
+    @TableField("example_operation")
+    private String exampleOperation;
+
+    /**
+     * 审核建议
+     */
+    @TableField("example_advise")
+    private String exampleAdvise;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

+ 145 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/AppealInfo.java

@@ -0,0 +1,145 @@
+package com.lantone.dblayermbg.entity.appeal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 申诉记录表 实体类
+ * </p>
+ */
+@Data
+@TableName("med_appeal_info")
+public class AppealInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院ID
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 质控缺陷id
+     */
+    @TableField("qcresult_detail_id")
+    private Long qcresultDetailId;
+
+    /**
+     * 质控缺陷内容
+     */
+    @TableField("qcresult_detail_msg")
+    private String qcresultDetailMsg;
+
+    /**
+     * 申诉模块id
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 模块名称
+     */
+    @TableField("mode_name")
+    private String modeName;
+
+    /**
+     * 缺陷内容
+     */
+    @TableField("defect_content")
+    private String defectContent;
+
+    /**
+     * 申诉人id
+     */
+    @TableField("claimant_id")
+    private Long claimantId;
+
+    /**
+     * 申诉类型(0:医生申诉|1:质控申诉)
+     */
+    @TableField("appeal_type")
+    private String appealType;
+
+    /**
+     * 申诉操作类型(0:删改|1:新增已有|2:新增缺失|3:恢复)
+     */
+    @TableField("appeal_operation_type")
+    private String appealOperationType;
+
+    /**
+     * 申诉说明
+     */
+    @TableField("appeal_explain")
+    private String appealExplain;
+
+    /**
+     * 审核人id
+     */
+    @TableField("check_id")
+    private Long checkId;
+
+    /**
+     * 当前工作流节点id
+     */
+    @TableField("work_flow_node_id")
+    private Long workFlowNodeId;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

+ 79 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowInfo.java

@@ -0,0 +1,79 @@
+package com.lantone.dblayermbg.entity.appeal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 流程表 实体类
+ * </p>
+ */
+@Data
+@TableName("med_work_flow_info")
+public class WorkFlowInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 医院ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 流程名称
+     */
+    @TableField("work_flow_name")
+    private String workFlowName;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

+ 109 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowLink.java

@@ -0,0 +1,109 @@
+package com.lantone.dblayermbg.entity.appeal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 流程线表 实体类
+ * </p>
+ */
+@Data
+@TableName("med_work_flow_link")
+public class WorkFlowLink implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 流程id
+     */
+    @TableField("work_flow_id")
+    private Long workFlowId;
+
+    /**
+     * 工作流id
+     */
+    @TableField("work_flow_link_id")
+    private Long workFlowLinkId;
+
+    /**
+     * 当前节点id
+     */
+    @TableField("work_link_now_node")
+    private Long workLinkNowNode;
+
+    /**
+     * 流程条件(流程线分叉,下一结点判断条件)
+     */
+    @TableField("work_link_condition")
+    private String workLinkCondition;
+
+    /**
+     * 下一节点id 0:表示结束
+     */
+    @TableField("work_link_next_node")
+    private Long workLinkNextNode;
+
+    /**
+     * 流程线内容
+     */
+    @TableField("work_link_name")
+    private String workLinkName;
+
+    /**
+     * 工作流状态
+     */
+    @TableField("work_link_status")
+    private String workLinkStatus;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

+ 85 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/entity/appeal/WorkFlowNode.java

@@ -0,0 +1,85 @@
+package com.lantone.dblayermbg.entity.appeal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 流程节点表 实体类
+ * </p>
+ */
+@Data
+@TableName("med_work_flow_node")
+public class WorkFlowNode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 流程id
+     */
+    @TableField("work_flow_id")
+    private Long workFlowId;
+
+    /**
+     * 工作节点id
+     */
+    @TableField("work_flow_node_id")
+    private Long workFlowNodeId;
+
+    /**
+     * 节点名称
+     */
+    @TableField("work_node_name")
+    private String workNodeName;
+
+    /**
+     * 是否删除,N:未删除,Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人,0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/AppealExamineInfoFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.appeal;
+
+import com.lantone.dblayermbg.service.impl.appeal.AppealExamineInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:med_appeal_examine_info 业务类
+ * </p>
+ */
+@Component
+public class AppealExamineInfoFacade extends AppealExamineInfoServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/AppealInfoFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.appeal;
+
+import com.lantone.dblayermbg.service.impl.appeal.AppealInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:med_appeal_info 业务类
+ * </p>
+ */
+@Component
+public class AppealInfoFacade extends AppealInfoServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowInfoFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.appeal;
+
+import com.lantone.dblayermbg.service.impl.appeal.WorkFlowInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:med_work_flow_info 业务类
+ * </p>
+ */
+@Component
+public class WorkFlowInfoFacade extends WorkFlowInfoServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowLinkFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.appeal;
+
+import com.lantone.dblayermbg.service.impl.appeal.WorkFlowLinkServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:med_work_flow_link 业务类
+ * </p>
+ */
+@Component
+public class WorkFlowLinkFacade extends WorkFlowLinkServiceImpl {
+
+}

+ 14 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/facade/appeal/WorkFlowNodeFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.dblayermbg.facade.appeal;
+
+import com.lantone.dblayermbg.service.impl.appeal.WorkFlowNodeServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名:med_work_flow_node 业务类
+ * </p>
+ */
+@Component
+public class WorkFlowNodeFacade extends WorkFlowNodeServiceImpl {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/AppealExamineInfoMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapperdb2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.appeal.AppealExamineInfo;
+
+/**
+ * <p>
+ * 表名:med_appeal_examine_info Mapper接口
+ * </p>
+ */
+public interface AppealExamineInfoMapper extends BaseMapper<AppealExamineInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/AppealInfoMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapperdb2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.appeal.AppealInfo;
+
+/**
+ * <p>
+ * 表名:med_appeal_info Mapper接口
+ * </p>
+ */
+public interface AppealInfoMapper extends BaseMapper<AppealInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowInfoMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapperdb2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowInfo;
+
+/**
+ * <p>
+ * 表名:med_work_flow_info Mapper接口
+ * </p>
+ */
+public interface WorkFlowInfoMapper extends BaseMapper<WorkFlowInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowLinkMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapperdb2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowLink;
+
+/**
+ * <p>
+ * 表名:med_work_flow_link Mapper接口
+ * </p>
+ */
+public interface WorkFlowLinkMapper extends BaseMapper<WorkFlowLink> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/mapperdb2/WorkFlowNodeMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.mapperdb2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowNode;
+
+/**
+ * <p>
+ * 表名:med_work_flow_node Mapper接口
+ * </p>
+ */
+public interface WorkFlowNodeMapper extends BaseMapper<WorkFlowNode> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/AppealExamineInfoService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.appeal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.appeal.AppealExamineInfo;
+
+/**
+ * <p>
+ * 申诉审批表 Service类
+ * </p>
+ */
+public interface AppealExamineInfoService extends IService<AppealExamineInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/AppealInfoService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.appeal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.appeal.AppealInfo;
+
+/**
+ * <p>
+ * 申诉记录表 Service类
+ * </p>
+ */
+public interface AppealInfoService extends IService<AppealInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowInfoService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.appeal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowInfo;
+
+/**
+ * <p>
+ * 流程表 Service类
+ * </p>
+ */
+public interface WorkFlowInfoService extends IService<WorkFlowInfo> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowLinkService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.appeal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowLink;
+
+/**
+ * <p>
+ * 流程线表 Service类
+ * </p>
+ */
+public interface WorkFlowLinkService extends IService<WorkFlowLink> {
+
+}

+ 13 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/appeal/WorkFlowNodeService.java

@@ -0,0 +1,13 @@
+package com.lantone.dblayermbg.service.appeal;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowNode;
+
+/**
+ * <p>
+ * 流程节点表 Service类
+ * </p>
+ */
+public interface WorkFlowNodeService extends IService<WorkFlowNode> {
+
+}

+ 17 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/AppealExamineInfoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.appeal;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.appeal.AppealExamineInfo;
+import com.lantone.dblayermbg.mapperdb2.AppealExamineInfoMapper;
+import com.lantone.dblayermbg.service.appeal.AppealExamineInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 申诉审批表 Service实现类
+ * </p>
+ */
+@Service
+public class AppealExamineInfoServiceImpl extends ServiceImpl<AppealExamineInfoMapper, AppealExamineInfo> implements AppealExamineInfoService {
+
+}

+ 17 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/AppealInfoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.appeal;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.appeal.AppealInfo;
+import com.lantone.dblayermbg.mapperdb2.AppealInfoMapper;
+import com.lantone.dblayermbg.service.appeal.AppealInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 申诉记录表 Service实现类
+ * </p>
+ */
+@Service
+public class AppealInfoServiceImpl extends ServiceImpl<AppealInfoMapper, AppealInfo> implements AppealInfoService {
+
+}

+ 17 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowInfoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.appeal;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowInfo;
+import com.lantone.dblayermbg.mapperdb2.WorkFlowInfoMapper;
+import com.lantone.dblayermbg.service.appeal.WorkFlowInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 流程表 Service实现类
+ * </p>
+ */
+@Service
+public class WorkFlowInfoServiceImpl extends ServiceImpl<WorkFlowInfoMapper, WorkFlowInfo> implements WorkFlowInfoService {
+
+}

+ 17 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowLinkServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.appeal;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowLink;
+import com.lantone.dblayermbg.mapperdb2.WorkFlowLinkMapper;
+import com.lantone.dblayermbg.service.appeal.WorkFlowLinkService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 流程线表 Service实现类
+ * </p>
+ */
+@Service
+public class WorkFlowLinkServiceImpl extends ServiceImpl<WorkFlowLinkMapper, WorkFlowLink> implements WorkFlowLinkService {
+
+}

+ 17 - 0
dblayer-mbg/src/main/java/com/lantone/dblayermbg/service/impl/appeal/WorkFlowNodeServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.dblayermbg.service.impl.appeal;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowNode;
+import com.lantone.dblayermbg.mapperdb2.WorkFlowNodeMapper;
+import com.lantone.dblayermbg.service.appeal.WorkFlowNodeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 流程节点表 Service实现类
+ * </p>
+ */
+@Service
+public class WorkFlowNodeServiceImpl extends ServiceImpl<WorkFlowNodeMapper, WorkFlowNode> implements WorkFlowNodeService {
+
+}

+ 89 - 42
dblayer-mbg/src/main/resources/application-debug.yml

@@ -1,46 +1,93 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+      # 数据库 1
+      db1:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库 2
+      db2:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root

+ 89 - 42
dblayer-mbg/src/main/resources/application-inner.yml

@@ -1,46 +1,93 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+      # 数据库 1
+      db1:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库 2
+      db2:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root

+ 89 - 42
dblayer-mbg/src/main/resources/application-local.yml

@@ -1,46 +1,93 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+      # 数据库 1
+      db1:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库 2
+      db2:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root

+ 89 - 42
dblayer-mbg/src/main/resources/application-outer.yml

@@ -1,46 +1,93 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+      # 数据库 1
+      db1:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库 2
+      db2:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root

+ 89 - 42
dblayer-mbg/src/main/resources/application-test.yml

@@ -1,46 +1,93 @@
 spring:
   datasource:
     druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      # 初始化大小,最小,最大
-      initialSize: 5
-      minIdle: 5
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间,单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      validationQuery: SELECT 1 FROM DUAL
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      # 打开PSCache,并且指定每个连接上PSCache的大小
-      poolPreparedStatements: true
-      maxPoolPreparedStatementPerConnectionSize: 20
-      # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-      filters.commons-log.connection-logger-name: wall,log4j
-      filter:
-        stat:
+      # 数据库 1
+      db1:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
           enabled: true
-          mergeSql: true
-          log-slow-sql: true
-          slow-sql-millis: 2000
-      #监控配置
-      web-stat-filter:
-        enabled: true
-        url-pattern: /*
-        exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
-      # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: root
-        login-password: root
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root
+      # 数据库 2
+      db2:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        platform: mysql
+        url: jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+        username: root
+        password: lantone
+        # 连接池的配置信息
+        # 初始化大小,最小,最大
+        initialSize: 5
+        minIdle: 5
+        maxActive: 20
+        # 配置获取连接等待超时的时间
+        maxWait: 60000
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        timeBetweenEvictionRunsMillis: 60000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: SELECT 1 FROM DUAL
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        # 打开PSCache,并且指定每个连接上PSCache的大小
+        poolPreparedStatements: true
+        maxPoolPreparedStatementPerConnectionSize: 20
+        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+        filters.commons-log.connection-logger-name: wall,log4j
+        filter:
+          stat:
+            enabled: true
+            mergeSql: true
+            log-slow-sql: true
+            slow-sql-millis: 2000
+        #监控配置
+        web-stat-filter:
+          enabled: true
+          url-pattern: /*
+          exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
+        # StatViewServlet配置,说明请参考Druid Wiki,配置_StatViewServlet配置
+        stat-view-servlet:
+          enabled: true
+          url-pattern: /druid/*
+          reset-enable: false
+          login-username: root
+          login-password: root

+ 5 - 0
dblayer-mbg/src/main/resources/mapperdb2/AppealExamineInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.AppealExamineInfoMapper">
+
+</mapper>

+ 5 - 0
dblayer-mbg/src/main/resources/mapperdb2/AppealInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.AppealInfoMapper">
+
+</mapper>

+ 5 - 0
dblayer-mbg/src/main/resources/mapperdb2/WorkFlowInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowInfoMapper">
+
+</mapper>

+ 5 - 0
dblayer-mbg/src/main/resources/mapperdb2/WorkFlowLinkMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowLinkMapper">
+
+</mapper>

+ 5 - 0
dblayer-mbg/src/main/resources/mapperdb2/WorkFlowNodeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowNodeMapper">
+
+</mapper>

+ 21 - 0
dblayer-mbg/src/main/resources/mapperdb2/base/BaseAppealExamineInfoMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.AppealExamineInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.appeal.AppealExamineInfo">
+        <id column="id" property="id"/>
+        <result column="appeal_info_id" property="appealInfoId"/>
+        <result column="check_id" property="checkId"/>
+        <result column="example_status" property="exampleStatus"/>
+        <result column="example_operation" property="exampleOperation"/>
+        <result column="example_advise" property="exampleAdvise"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

+ 29 - 0
dblayer-mbg/src/main/resources/mapperdb2/base/BaseAppealInfoMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.AppealInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.appeal.AppealInfo">
+        <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="qcresult_detail_id" property="qcresultDetailId"/>
+        <result column="qcresult_detail_msg" property="qcresultDetailMsg"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="mode_name" property="modeName"/>
+        <result column="defect_content" property="defectContent"/>
+        <result column="claimant_id" property="claimantId"/>
+        <result column="appeal_type" property="appealType"/>
+        <result column="appeal_operation_type" property="appealOperationType"/>
+        <result column="appeal_explain" property="appealExplain"/>
+        <result column="check_id" property="checkId"/>
+        <result column="work_flow_node_id" property="workFlowNodeId"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

+ 18 - 0
dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowInfoMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.appeal.WorkFlowInfo">
+        <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="work_flow_name" property="workFlowName"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

+ 23 - 0
dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowLinkMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowLinkMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.appeal.WorkFlowLink">
+        <id column="id" property="id"/>
+        <result column="work_flow_id" property="workFlowId"/>
+        <result column="work_flow_link_id" property="workFlowLinkId"/>
+        <result column="work_link_now_node" property="workLinkNowNode"/>
+        <result column="work_link_condition" property="workLinkCondition"/>
+        <result column="work_link_next_node" property="workLinkNextNode"/>
+        <result column="work_link_name" property="workLinkName"/>
+        <result column="work_link_status" property="workLinkStatus"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

+ 19 - 0
dblayer-mbg/src/main/resources/mapperdb2/base/BaseWorkFlowNodeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.dblayermbg.mapperdb2.WorkFlowNodeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.dblayermbg.entity.appeal.WorkFlowNode">
+        <id column="id" property="id"/>
+        <result column="work_flow_id" property="workFlowId"/>
+        <result column="work_flow_node_id" property="workFlowNodeId"/>
+        <result column="work_node_name" property="workNodeName"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

+ 7 - 36
dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -14,52 +14,23 @@ public class CodeAutoGenerator {
      */
     private static String username = "root";
     private static String password = "lantone";
-    private static String url = "jdbc:mysql://192.168.2.237:3306/emrais?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8";
+    private static String url = "jdbc:mysql://192.168.2.237:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8";
 
     /**
      * 表名
      */
     private static String[] TABLES = {
-            "sys_abnormal_log",
-            "sys_data_auth",
-            "sys_data_auth_detail",
-            "sys_dept",
-            "sys_dept_doctor",
-            "sys_dept_medoup",
-            "sys_dictionary_info",
-            "sys_doctor",
-            "sys_hospital",
-            "sys_hospital_set",
-            "sys_hospital_user",
-            "sys_login_log",
-            "sys_medoup",
-            "sys_medoup_doctor",
-            "sys_menu",
-            "sys_menu_resource",
-            "sys_operation_log",
-            "sys_region",
-            "sys_region_dept",
-            "sys_resource",
-            "sys_role",
-            "sys_role_software",
-            "sys_role_software_data_auth",
-            "sys_role_software_menu",
-            "sys_role_software_resource",
-            "sys_software",
-            "sys_software_data_auth",
-            "sys_software_menu",
-            "sys_software_resource",
-            "sys_user",
-            "sys_user_role",
-            "sys_dept_user",
-            "sys_notice",
-            "sys_notice_user"
+            "med_work_flow_info",
+            "med_work_flow_node",
+            "med_work_flow_link",
+            "med_appeal_info",
+            "med_appeal_examine_info"
     };
 
     /**
      * 生成的实体类忽略表前缀: 不需要则置空
      */
-    private static String[] ENTITY_IGNORE_PREFIX = { "sys_" };
+    private static String[] ENTITY_IGNORE_PREFIX = { "med_" };
 
     /**
      * 初次生成:entity.java、mapper.java、mapper.xml、baseMapper.xml、service.java、serviceImpl.java、facade.java

+ 12 - 12
dblayer-mbg/src/test/java/com/lantone/dblayermbg/GeneratorUtil.java

@@ -75,12 +75,12 @@ public class GeneratorUtil {
 
 
     // 各层包名
-    private static String ENTITY_PATH = "/entity/";
-    private static String FACADE_PATH = "/facade/";
-    private static String MAPPER_PATH = "/mapper/";
-    private static String XML_PATH = "/resources/mapper/";
-    private static String SERVICE_PATH = "/service/";
-    private static String SERVICE_IMPL_PATH = "/service/impl/";
+    private static String ENTITY_PATH = "/entity/appeal/";
+    private static String FACADE_PATH = "/facade/appeal/";
+    private static String MAPPER_PATH = "/mapperdb2/";
+    private static String XML_PATH = "/resources/mapperdb2/";
+    private static String SERVICE_PATH = "/service/appeal/";
+    private static String SERVICE_IMPL_PATH = "/service/impl/appeal/";
     private static String CONTROLLER_PATH = "/web/";
 
 
@@ -232,12 +232,12 @@ public class GeneratorUtil {
         return new PackageConfig()
                 // 父包名
                 .setParent(packageName)
-                .setEntity("entity")
-                .setMapper("mapper")
-                .setXml("resources.mapper")
-                .setService("service")
-                .setServiceImpl("service.impl")
-                .setController("facade");
+                .setEntity("entity.appeal")
+                .setMapper("mapperdb2")
+                .setXml("resources.mapperdb2")
+                .setService("service.appeal")
+                .setServiceImpl("service.impl.appeal")
+                .setController("facade.appeal");
     }
 
     /**

+ 19 - 0
document/docker/docker-compose-debug.yml

@@ -107,6 +107,25 @@ services:
       - config-center
     command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
   structure-center:
+    image: 192.168.2.125:4490/emrais.debug/structure-center:latest
+    container_name: report-service
+    ports:
+      - 8889:8889
+    environment:
+      - TZ=Asia/Shanghai
+      - eureka-addr=register-center
+      - eureka-port=6751
+      - spring.profiles.active=debug
+      - log-level=debug
+    volumes:
+      - /logs:/logs
+      - /etc/localtime:/etc/localtime
+    restart: always
+    depends_on:
+      - register-center
+      - config-center
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+  report-service:
     image: 192.168.2.125:4490/emrais.debug/structure-center:latest
     container_name: structure-center
     ports:

+ 8 - 1
gateway-service/src/main/resources/bootstrap.yml

@@ -39,6 +39,12 @@ spring:
             - Path=/message-service/**
           filters:
             - StripPrefix=1
+        - id: report-service
+          uri: lb://report-service
+          predicates:
+            - Path=/report-service/**
+          filters:
+            - StripPrefix=1
     config:
       discovery:
         enabled: true
@@ -86,4 +92,5 @@ secure:
       - "/security-center/userManage/close"
       - "/message-service/pageSample/sample"
       - "/message-service/backSample/sendToDefaultTopic"
-      - "/message-service/backSample/sendToTopic"
+      - "/message-service/backSample/sendToTopic"
+      - "/report-service/medAppealInfoManage/getWorkById"

+ 1 - 0
pom.xml

@@ -29,6 +29,7 @@
         <module>user-auth</module>
         <module>message-service</module>
         <module>bus-interceptor</module>
+        <module>report-service</module>
     </modules>
 
     <properties>

+ 15 - 5
report-service/pom.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>emrais</artifactId>
         <groupId>com.lantone</groupId>
+        <artifactId>emrais</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>report-service</artifactId>
     <name>report-service</name>
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.lantone</groupId>
+            <artifactId>bus-interceptor</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>dblayer-mbg</artifactId>
@@ -26,11 +31,16 @@
         <dependency>
             <groupId>io.github.lvyahui8</groupId>
             <artifactId>spring-boot-data-aggregator-starter</artifactId>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

+ 23 - 0
report-service/src/main/java/com/lantone/report/facade/MedAppealInfoManagementFacade.java

@@ -0,0 +1,23 @@
+package com.lantone.report.facade;
+
+
+import com.lantone.common.vo.appeal.MedAppealInfoVO;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowNode;
+import com.lantone.dblayermbg.facade.appeal.WorkFlowNodeFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:申诉审核管理
+ * @Author: songxl
+ * @Date 2022/1/5
+ */
+@Component
+public class MedAppealInfoManagementFacade {
+    @Autowired
+    private WorkFlowNodeFacade workFlowNodeFacade;
+
+    public WorkFlowNode getWorkById(MedAppealInfoVO medAppealInfoVO) {
+        return workFlowNodeFacade.getById(medAppealInfoVO.getId());
+    }
+}

+ 39 - 0
report-service/src/main/java/com/lantone/report/web/MedAppealInfoManagementController.java

@@ -0,0 +1,39 @@
+package com.lantone.report.web;
+
+
+import com.lantone.common.dto.RespDTO;
+import com.lantone.common.vo.appeal.MedAppealInfoVO;
+import com.lantone.dblayermbg.entity.appeal.WorkFlowNode;
+import com.lantone.report.facade.MedAppealInfoManagementFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 申诉审核 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2020-07-06
+ */
+@RestController
+@RequestMapping("/medAppealInfoManage")
+@Api(value = "申诉审核数据模块相关接口API", tags = { "申诉审核数据模块相关接口API" })
+public class MedAppealInfoManagementController {
+    @Autowired
+    MedAppealInfoManagementFacade medAppealInfoManagementFacade;
+
+    @ApiOperation(value = "通过id获取工作流[by:songxl]",
+            notes = "通过id获取工作流")
+    @PostMapping("/getWorkById")
+    public RespDTO<WorkFlowNode> getWorkById(@RequestBody MedAppealInfoVO medAppealInfoVO) {
+        WorkFlowNode workFlowInfo = medAppealInfoManagementFacade.getWorkById(medAppealInfoVO);
+        return RespDTO.onSuc(workFlowInfo);
+    }
+
+}

+ 13 - 14
report-service/src/main/resources/bootstrap.yml

@@ -4,27 +4,25 @@ server:
 spring:
   application:
     name: report-service
-  redis:
-    database: 12
-    host: 192.168.2.236 # Redis服务器地址
-    port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
-    password: lantone # Redis服务器连接密码(默认为空)
-    jedis:
-      pool:
-        max-active: 8 # 连接池最大连接数(使用负值表示没有限制)
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间(使用负值表示没有限制)
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间(毫秒)
+  cloud:
+    config:
+      discovery:
+        enabled: true
+        service-id: config-center
+  profiles:
+    active: debug
 
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:6751/eureka/
+      defaultZone: http://${eureka-addr:localhost}:${eureka-port:6751}/eureka/
 
 logging:
   config: classpath:logback-spring.xml
-  file: logs/report-service/log_info.log
+  level:
+    root: ${log-level:info}
+  file:
+    path: /logs/report-service
 
 management:
   endpoints:
@@ -49,6 +47,7 @@ ribbon:
 swagger.title: 报表管理服务
 swagger.des: 报表管理服务
 swagger.version: 0.0.1-SNAPSHOT
+swagger.show: true
 
 encrypt:
   enable: true

+ 53 - 102
report-service/src/main/resources/logback-spring.xml

@@ -1,61 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,如果设置为WARN,则低于WARN的信息都不会输出 -->
-<!-- scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true -->
-<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
-<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
-<configuration  scan="true" scanPeriod="10 seconds">
+<configuration scanPeriod="10 seconds">
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <property name="APP_NAME" value="report-service"/>
+    <contextName>${APP_NAME}</contextName>
+    <property name="LOG_FILE_PATH" value="/logs/${APP_NAME}"/>
+
+    <conversionRule conversionWord="clr"
+                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
-
-    <contextName>logback</contextName>
-    <!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
-    <property name="log.path" value="logs/report-service" />
-
-    <!-- 彩色日志 -->
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-
-    <!--输出到控制台-->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>info</level>
         </filter>
         <encoder>
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <!-- 设置字符集 -->
             <charset>UTF-8</charset>
         </encoder>
     </appender>
 
-
-    <!--输出到文件-->
-
-    <!-- 时间滚动输出 level为 DEBUG 日志 -->
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_debug.log</file>
-        <!--日志文件输出格式-->
+        <file>${LOG_FILE_PATH}/log_debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
         </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志归档 -->
-            <fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
+            <maxHistory>90</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文件只记录debug级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>debug</level>
             <onMatch>ACCEPT</onMatch>
@@ -63,26 +46,19 @@
         </filter>
     </appender>
 
-    <!-- 时间滚动输出 level为 INFO 日志 -->
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_info.log</file>
-        <!--日志文件输出格式-->
+        <file>${LOG_FILE_PATH}/log_info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
         </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 每天日志归档路径以及格式 -->
-            <fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
+            <maxHistory>90</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文件只记录info级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>info</level>
             <onMatch>ACCEPT</onMatch>
@@ -90,25 +66,19 @@
         </filter>
     </appender>
 
-    <!-- 时间滚动输出 level为 WARN 日志 -->
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_warn.log</file>
-        <!--日志文件输出格式-->
+        <file>${LOG_FILE_PATH}/log_warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
         </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
+            <maxHistory>90</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文件只记录warn级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>warn</level>
             <onMatch>ACCEPT</onMatch>
@@ -116,67 +86,48 @@
         </filter>
     </appender>
 
-
-    <!-- 时间滚动输出 level为 ERROR 日志 -->
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!-- 正在记录的日志文件的路径及文件名 -->
-        <file>${log.path}/log_error.log</file>
-        <!--日志文件输出格式-->
+        <file>${LOG_FILE_PATH}/log_error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+            <charset>UTF-8</charset>
         </encoder>
-        <!-- 日志记录器的滚动策略,按日期,按大小记录 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_FILE_PATH}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
+            <maxHistory>90</maxHistory>
         </rollingPolicy>
-        <!-- 此日志文件只记录ERROR级别的 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
+            <level>error</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
 
-    <!--
-        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
-        以及指定<appender>。<logger>仅有一个name属性,
-        一个可选的level和一个可选的addtivity属性。
-        name:用来指定受此logger约束的某一个包或者具体的某一个类。
-        level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
-              还有一个特俗值INHERITED或者同义词NULL,代表强制执行上级的级别。
-              如果未设置此属性,那么当前logger将会继承上级的级别。
-        addtivity:是否向上级logger传递打印信息。默认是true。
-    -->
-    <!--<logger name="org.springframework.web" level="info"/>-->
-    <!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->
-    <!--
-        使用mybatis的时候,sql语句是debug下才会打印,而这里我们只配置了info,所以想要查看sql语句的话,有以下两种操作:
-        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql,不过这样日志那边会出现很多其他消息
-        第二种就是单独给dao下目录配置debug模式,代码如下,这样配置sql语句会打印,其他还是正常info级别:
-     -->
-
-
-    <!--
-        root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性
-        level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
-        不能设置为INHERITED或者同义词NULL。默认是DEBUG
-        可以包含零个或多个元素,标识这个appender将会添加到这个logger。
-    -->
-
-    <!--开发环境:打印控制台-->
-    <springProfile name="dev">
-        <logger name="org.lantone.qc" level="debug"/>
-    </springProfile>
+    <appender name="ALL_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_FILE_PATH}/spring.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_FILE_PATH}/all/spring-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>90</maxHistory>
+        </rollingPolicy>
+    </appender>
 
-    <root level="info">
+    <root>
         <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="INFO_FILE" />
-        <appender-ref ref="ERROR_FILE" />
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+        <appender-ref ref="ALL_FILE"/>
     </root>
+
 </configuration>