删除多余的代码

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      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
-
   cloud:
     stream:
       bindings:
@@ -65,32 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false

config-server/src/main/resources/shared/triage-service-local.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      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
-
   cloud:
     stream:
       bindings:
@@ -65,32 +18,3 @@ spring:
     password: guest
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      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
-
   cloud:
     stream:
       bindings:
@@ -65,32 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false

config-server/src/main/resources/shared/triage-service-test.yml

@@ -3,53 +3,6 @@ server:
 
 # 驱动配置信息
 spring:
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
-      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
-
   cloud:
     stream:
       bindings:
@@ -65,32 +18,3 @@ spring:
     password: lantone
     publisher-confirms: true
     virtual-host: /
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.diagbot.entity
-  global-config:
-    #刷新mapper 调试神器
-    db-config:
-      #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
-      id-type: id_worker
-      #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
-      field-strategy: not_empty
-      #驼峰下划线转换
-      column-underline: true
-      #数据库大写下划线转换
-      #capital-mode: true
-      #刷新mapper 调试神器
-      refresh-mapper: true
-      #逻辑删除配置
-      logic-delete-value: 0
-      logic-not-delete-value: 1
-      #自定义填充策略接口实现
-      #meta-object-handler: com.baomidou.springboot.xxx
-      #自定义SQL注入器
-      #sql-injector: com.baomidou.springboot.xxx
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false

triage-service/pom.xml

@@ -89,12 +89,6 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
-        <!--database-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <!--security-->
         <dependency>
@@ -124,31 +118,6 @@
             <artifactId>spring-cloud-starter-bus-amqp</artifactId>
         </dependency>
 
-        <!-- mybatis-plus begin -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-        </dependency>
-        <!-- mybatis-plus end -->
-
-        <!-- 阿里巴巴druid数据库连接池 -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- springboot整合mybatis（核心就这一个） -->
-        <!-- 注意顺序，这个一定要放在最下面 -->
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>

triage-service/src/main/java/com/diagbot/client/AIServiceClient.java

@@ -1,24 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.client.bean.SearchData;
-import com.diagbot.client.hystrix.AIServiceHystrix;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @Description: 人工智能服务客服端
- * @author: gaodm
- * @time: 2018/10/25 9:56
- */
-//@FeignClient(name = "AI", url = "${ai.server.address}", fallback = AIServiceHystrix.class)
-public interface AIServiceClient {
-
-   /* @PostMapping(value = "/web/doc/algorithm/neural")
-    Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);*/
-}
-
-
-

triage-service/src/main/java/com/diagbot/client/hystrix/AIServiceHystrix.java

@@ -1,24 +0,0 @@
-package com.diagbot.client.hystrix;
-
-
-import com.diagbot.client.AIServiceClient;
-import com.diagbot.client.bean.Response;
-import com.diagbot.client.bean.ResponseData;
-import com.diagbot.client.bean.SearchData;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 人工智能服务客服端 （请求失败熔断）
- * @author: gaodm
- * @time: 2018/10/25 9:56
- */
-@Component
-@Slf4j
-public class AIServiceHystrix implements AIServiceClient {
-   /* @Override
-    public Response<ResponseData> bayesPageData(SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "bayesPageData");
-        return null;
-    }*/
-}

triage-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,29 +0,0 @@
-package com.diagbot.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-/**
- * @Description: MybatisPlus配置类
- * @author: gaodm
- * @time: 2018/8/2 13:39
- */
-@EnableTransactionManagement
-@Configuration
-@MapperScan("com.diagbot.mapper*")//这个注解，作用相当于下面的@Bean MapperScannerConfigurer，2者配置1份即可
-public class MybatisPlusConfigurer {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档：http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        return paginationInterceptor;
-    }
-
-}

triage-service/src/main/java/com/diagbot/dto/SymptomSearchDTO.java

@@ -1,21 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description: 部位症状关联信息
- * @Author: ztg
- * @Date: 2018/10/24 16:11
- */
-@Getter
-@Setter
-public class SymptomSearchDTO {
-
-    private Long id;// id
-    private String remark;//备注
-    private String name;//症状名称
-    private String searchName;//检索名称
-    private Integer showType; //显示类型 1:本体，2：同义词
-    private String showTypeCn; //显示类型中文 1:本体，2：同义词
-}

triage-service/src/main/java/com/diagbot/entity/Part.java

@@ -1,69 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * @Description: 部位表
- * @Author: ztg
- * @Date: 2018/10/24 15:52
- */
-@TableName("triage_part")
-@Getter
-@Setter
-public class Part implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除 N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 上级部位
-     */
-    private Long parentId;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

triage-service/src/main/java/com/diagbot/entity/SymptomWrapper.java

@@ -1,85 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 症状信息扩展表
- * </p>
- *
- * @author zhoutg
- * @since 2018-09-17
- */
-@TableName("triage_symptom")
-@Getter
-@Setter
-public class SymptomWrapper implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除 N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 性别(1：男，2：女，3：共用)
-     */
-    private Integer sexType;
-
-    /**
-     * 最小年龄
-     */
-    private Integer ageBegin;
-
-    /**
-     * 最大年龄
-     */
-    private Integer ageEnd;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 部位id
-     */
-    private Long partId;
-
-}

triage-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -1,8 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -21,7 +18,6 @@ public class SysLog implements Serializable {
     /**
      * 日志ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

triage-service/src/main/java/com/diagbot/enums/ShowTypeEnum.java

@@ -1,50 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description:检索显示类型枚举类
- * @author: zhoutg
- * @Date: 2018/10/26 10:35
- */
-public enum ShowTypeEnum implements KeyedNamed {
-
-    ITSELF(1, "本体"),
-    SYNONYMS(2, "同义词");
-
-    @Setter
-    private Integer key;
-
-    @Setter
-    private String name;
-
-    ShowTypeEnum(Integer key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static ShowTypeEnum getEnum(Integer key) {
-        for (ShowTypeEnum item : ShowTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer key) {
-        ShowTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}

triage-service/src/main/java/com/diagbot/facade/SymptomFacade.java

@@ -5,8 +5,6 @@ import com.diagbot.dto.ConceptBaseDTO;
 import com.diagbot.dto.ConceptRetrievalDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Symptom;
-import com.diagbot.entity.SymptomWrapper;
-import com.diagbot.service.impl.SymptomServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.ConceptUsualVO;
@@ -18,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 症状
@@ -26,39 +23,28 @@ import java.util.Map;
  * @Date: 2018/10/23 16:33
  */
 @Component
-public class SymptomFacade extends SymptomServiceImpl{
+public class SymptomFacade {
     @Autowired
     AiptServiceClient aiptServiceClient;
 
     /**
-     *  获取常用症状
+     * 获取常用症状
      *
      * @return
      */
     public List<Symptom> getUsualFac(SymptomUsualVO symptomUsualVO) {
         ConceptUsualVO conceptUsualVO = new ConceptUsualVO();
-        BeanUtil.copyProperties(symptomUsualVO,conceptUsualVO);
+        BeanUtil.copyProperties(symptomUsualVO, conceptUsualVO);
         conceptUsualVO.setDeptName("全科");
         conceptUsualVO.setType(1);
         //从知识库获取常用标签
         RespDTO<List<ConceptBaseDTO>> conceptBaseDTORespDTO = aiptServiceClient.getConceptUsual(conceptUsualVO);
-        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO,"获取常用标签失败");
-        List<Symptom> symptomList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data,Symptom.class);
+        RespDTOUtil.respNGDeal(conceptBaseDTORespDTO, "获取常用标签失败");
+        List<Symptom> symptomList = BeanUtil.listCopyTo(conceptBaseDTORespDTO.data, Symptom.class);
         return symptomList;
     }
 
 
-    /**
-     * 根据部位partIds获取症状信息
-     *
-     * @param map 参数
-     * @return
-     */
-    public List<SymptomWrapper> getByPartIdsFac(Map map) {
-        return this.getByPartIds(map);
-    }
-
-
     /**
      * 症状检索
      *
@@ -72,8 +58,8 @@ public class SymptomFacade extends SymptomServiceImpl{
         retrievalVO.setInputStr(symptomSearchVO.getName());
         retrievalVO.setAge(symptomSearchVO.getAge());
         retrievalVO.setSexType(symptomSearchVO.getSexType());
-        RespDTO<List<ConceptRetrievalDTO>> condeptRerievalS =  aiptServiceClient.retrivelConceptInfo(retrievalVO);
-        RespDTOUtil.respNGDeal(condeptRerievalS,"获取标签失败");
+        RespDTO<List<ConceptRetrievalDTO>> condeptRerievalS = aiptServiceClient.retrivelConceptInfo(retrievalVO);
+        RespDTOUtil.respNGDeal(condeptRerievalS, "获取标签失败");
         List<Symptom> symptomList = new ArrayList<>();
         Symptom symptom = new Symptom();
         //封装

triage-service/src/main/java/com/diagbot/mapper/SymptomMapper.java

@@ -1,39 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.SymptomSearchDTO;
-import com.diagbot.entity.Symptom;
-import com.diagbot.entity.SymptomWrapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 部位mapper
- * @Author: ztg
- * @Date: 2018/10/24 15:55
- */
-public interface SymptomMapper extends BaseMapper<Symptom> {
-
-    /**
-     * 根据部位ids获取症状信息
-     * @param map
-     * @return
-     */
-    public List<SymptomWrapper> getByPartIds(Map map);
-
-
-    /**
-     * 获取常用症状
-     * @return 常用症状
-     */
-    public List<Symptom> getUsual(Map map);
-
-
-    /**
-     * 检索
-     * @param map
-     * @return
-     */
-    public List<SymptomSearchDTO> search(Map map);
-}

triage-service/src/main/java/com/diagbot/mapper/SysLogMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogMapper extends BaseMapper<SysLog> {
-
-}

triage-service/src/main/java/com/diagbot/service/SymptomService.java

@@ -1,44 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.SymptomSearchDTO;
-import com.diagbot.entity.Symptom;
-import com.diagbot.entity.SymptomWrapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SymptomService extends IService<Symptom> {
-
-
-    /**
-     * 根据部位ids获取症状信息
-     * @param map
-     * @return
-     */
-    public List<SymptomWrapper> getByPartIds(Map map);
-
-
-    /**
-     * 获取常用症状
-     * @return
-     */
-    public List<Symptom> getUsual(Map map);
-
-
-    /**
-     * 检索
-     * @param map
-     * @return 症状检索的信息
-     */
-    public List<SymptomSearchDTO> search(Map map);
-
-}

triage-service/src/main/java/com/diagbot/service/SysLogService.java

@@ -1,15 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.SysLog;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-public interface SysLogService extends IService<SysLog> {
-}

triage-service/src/main/java/com/diagbot/service/impl/SymptomServiceImpl.java

@@ -1,39 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.SymptomSearchDTO;
-import com.diagbot.entity.Symptom;
-import com.diagbot.entity.SymptomWrapper;
-import com.diagbot.mapper.SymptomMapper;
-import com.diagbot.service.SymptomService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class SymptomServiceImpl extends ServiceImpl<SymptomMapper, Symptom> implements SymptomService {
-
-    @Override
-    public List<SymptomWrapper> getByPartIds(Map map) {
-        return baseMapper.getByPartIds(map);
-    }
-
-    @Override
-    public List<Symptom> getUsual(Map map) {
-        return baseMapper.getUsual(map);
-    }
-
-    @Override
-    public List<SymptomSearchDTO> search(Map map) {
-        return baseMapper.search(map);
-    }
-}

triage-service/src/main/java/com/diagbot/service/impl/SysLogServiceImpl.java

@@ -1,19 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.SysLog;
-import com.diagbot.mapper.SysLogMapper;
-import com.diagbot.service.SysLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2018-08-02
- */
-@Service
-public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
-}

triage-service/src/main/resources/mapper/SymptomMapper.xml

@@ -1,73 +0,0 @@
-<?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.diagbot.mapper.SymptomMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Symptom">
-        <id column="id" property="id"/>
-        <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="name" property="name"/>
-        <result column="sex_type" property="sexType"/>
-        <result column="age_begin" property="ageBegin"/>
-        <result column="age_end" property="ageEnd"/>
-        <result column="remark" property="remark"/>
-    </resultMap>
-
-
-    <select id="getByPartIds" parameterType="java.util.Map" resultType="com.diagbot.entity.SymptomWrapper">
-        SELECT a.*, b.part_id FROM `triage_symptom` a, triage_part_symptom b where a.is_deleted = 'N' and b.is_deleted = 'N'
-        and b.symptom_id = a.id
-        and b.part_id in
-        <foreach collection="ids" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-        and a.sex_type in (3, #{sexType})
-        <if test="age != null">
-            <![CDATA[ and a.age_begin <= #{age} ]]>
-            <![CDATA[ and a.age_end >= #{age} ]]>
-        </if>
-        order by b.part_id, b.order_no
-    </select>
-
-    <select id="getUsual"  parameterType="java.util.Map" resultMap="BaseResultMap">
-        SELECT a.*  FROM `triage_symptom` a, triage_symptom_usual b where a.is_deleted = 'N' and b.is_deleted = 'N'
-        and b.symptom_id = a.id
-        and a.sex_type in (3, #{sexType})
-        <if test="age != null">
-            <![CDATA[ and a.age_begin <= #{age} ]]>
-            <![CDATA[ and a.age_end >= #{age} ]]>
-        </if>
-        order by b.order_no
-    </select>
-
-
-    <select id="search" parameterType="java.util.Map" resultType="com.diagbot.dto.SymptomSearchDTO">
-        select c.*,b.show_type,if(show_type=1, '本体', '同义词') show_type_cn,a.name search_name
-        from triage_retrieval a, triage_retrieval_mapping b, triage_symptom c
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and a.id = b.retrieval_id and b.item_id = c.id
-        and (a.`name` = #{name} or a.spell = #{name})
-        and c.sex_type in (3, #{sexType})
-        <if test="age != null">
-            <![CDATA[ and c.age_begin <= #{age} ]]>
-            <![CDATA[ and c.age_end >= #{age} ]]>
-        </if>
-
-        union
-
-        select c.*,b.show_type,if(show_type=1, '本体', '同义词') show_type_cn, a.name search_name from triage_retrieval a, triage_retrieval_mapping b, triage_symptom c
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and a.id = b.retrieval_id and b.item_id = c.id
-        and (a.`name` like concat('%',#{name} , '%') or a.spell like concat('%',#{name} , '%'))
-        and c.sex_type in (3, #{sexType})
-        <if test="age != null">
-            <![CDATA[ and c.age_begin <= #{age} ]]>
-            <![CDATA[ and c.age_end >= #{age} ]]>
-        </if>
-    </select>
-</mapper>

triage-service/src/main/resources/mapper/SysLogMapper.xml

@@ -1,22 +0,0 @@
-<?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.diagbot.mapper.SysLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
-        <id column="id" property="id"/>
-        <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="ip" property="ip"/>
-        <result column="sys_type" property="sysType"/>
-        <result column="method" property="method"/>
-        <result column="operation" property="operation"/>
-        <result column="params" property="params"/>
-        <result column="username" property="username"/>
-    </resultMap>
-
-</mapper>

triage-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -1,83 +0,0 @@
-package com.diagbot;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.generator.AutoGenerator;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-
-/**
- * @Description: 代码生成器
- * @author: gaodm
- * @time: 2018/8/2 10:15
- */
-public class CodeGeneration {
-
-    /**
-     *
-     * @Title: main
-     * @Description: 生成
-     * @param args
-     */
-    public static void main(String[] args) {
-        AutoGenerator mpg = new AutoGenerator();
-
-        // 全局配置
-        GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//triageservice");
-        gc.setFileOverride(true);
-        gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
-        gc.setEnableCache(false);// XML 二级缓存
-        gc.setBaseResultMap(true);// XML ResultMap
-        gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("zhoutg");// 作者
-
-        // 自定义文件命名，注意 %s 会自动填充表实体属性！
-        gc.setControllerName("%sController");
-        gc.setServiceName("%sService");
-        gc.setServiceImplName("%sServiceImpl");
-        gc.setMapperName("%sMapper");
-        gc.setXmlName("%sMapper");
-        mpg.setGlobalConfig(gc);
-
-        // 数据源配置
-        DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setDbType(DbType.MYSQL);
-        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUsername("root");
-        dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-triage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false");
-        mpg.setDataSource(dsc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
-        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "triage_symptom" }); // 需要生成的表
-
-        strategy.setSuperServiceClass(null);
-        strategy.setSuperServiceImplClass(null);
-        strategy.setSuperMapperClass(null);
-
-        mpg.setStrategy(strategy);
-
-        // 包配置
-        PackageConfig pc = new PackageConfig();
-        pc.setParent("com.diagbot");
-        pc.setController("web");
-        pc.setService("service");
-        pc.setServiceImpl("service.impl");
-        pc.setMapper("mapper");
-        pc.setEntity("entity");
-        pc.setXml("resources.mapper");
-        mpg.setPackageInfo(pc);
-
-        // 执行生成
-        mpg.setTemplateEngine(new FreemarkerTemplateEngine());
-        mpg.execute();
-
-    }
-}

triage-service/src/test/java/com/diagbot/TriageServiceApplicationTests.java

@@ -0,0 +1,16 @@
+package com.diagbot;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class TriageServiceApplicationTests {
+
+    @Test
+    public void contextLoads() {
+    }
+
+}