소스 검색

Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

zhoutg 6 년 전
부모
커밋
551f3499d0
65개의 변경된 파일176개의 추가작업 그리고 1199개의 파일을 삭제
  1. 1 1
      aipt-service/pom.xml
  2. 1 1
      aipt-service/src/main/java/com/diagbot/AiptServiceApplication.java
  3. 14 0
      aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java
  4. 0 25
      aipt-service/src/main/java/com/diagbot/client/UserServiceClient.java
  5. 1 1
      aipt-service/src/main/java/com/diagbot/client/AlgorithmClassify.java
  6. 1 1
      aipt-service/src/main/java/com/diagbot/client/Feature.java
  7. 0 2
      aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java
  8. 16 0
      aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java
  9. 0 23
      aipt-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java
  10. 0 142
      aipt-service/src/main/java/com/diagbot/entity/User.java
  11. 0 13
      aipt-service/src/main/java/com/diagbot/facade/SysLogFacade.java
  12. 0 16
      aipt-service/src/main/java/com/diagbot/mapper/SysLogMapper.java
  13. 0 15
      aipt-service/src/main/java/com/diagbot/service/SysLogService.java
  14. 0 19
      aipt-service/src/main/java/com/diagbot/service/impl/SysLogServiceImpl.java
  15. 1 1
      aipt-service/src/main/java/com/diagbot/vo/SearchVo.java
  16. 0 21
      aipt-service/src/main/java/com/diagbot/vo/SysLogVo.java
  17. 1 2
      aipt-service/src/main/java/com/diagbot/web/ClinicalController.java
  18. 0 110
      aipt-service/src/main/java/com/diagbot/web/SysLogController.java
  19. 0 23
      aipt-service/src/main/java/com/diagbot/web/TestController.java
  20. 0 22
      aipt-service/src/main/resources/mapper/SysLogMapper.xml
  21. 0 76
      config-server/src/main/resources/shared/data-service-dev.yml
  22. 0 77
      config-server/src/main/resources/shared/data-service-local.yml
  23. 0 76
      config-server/src/main/resources/shared/data-service-pro.yml
  24. 0 76
      config-server/src/main/resources/shared/data-service-test.yml
  25. 0 31
      data-service/pom.xml
  26. 14 0
      data-service/src/main/java/com/diagbot/client/AiptServiceClient.java
  27. 0 25
      data-service/src/main/java/com/diagbot/client/UserServiceClient.java
  28. 15 0
      data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
  29. 0 23
      data-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java
  30. 0 29
      data-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  31. 0 4
      data-service/src/main/java/com/diagbot/entity/SysLog.java
  32. 0 6
      data-service/src/main/java/com/diagbot/entity/User.java
  33. 1 2
      data-service/src/main/java/com/diagbot/facade/SysLogFacade.java
  34. 0 16
      data-service/src/main/java/com/diagbot/mapper/SysLogMapper.java
  35. 0 15
      data-service/src/main/java/com/diagbot/service/SysLogService.java
  36. 0 19
      data-service/src/main/java/com/diagbot/service/impl/SysLogServiceImpl.java
  37. 0 89
      data-service/src/main/java/com/diagbot/web/SysLogController.java
  38. 0 22
      data-service/src/main/resources/mapper/SysLogMapper.xml
  39. 0 83
      data-service/src/test/java/com/diagbot/CodeGeneration.java
  40. 2 2
      icss-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java
  41. 2 2
      icss-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java
  42. 2 2
      icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java
  43. 4 5
      icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java
  44. 2 1
      icss-service/src/main/java/com/diagbot/facade/TranFieldInfoFacade.java
  45. 1 0
      icss-service/src/main/java/com/diagbot/web/CalculateController.java
  46. 1 1
      icss-service/src/main/java/com/diagbot/web/DisScaleController.java
  47. 3 3
      icss-service/src/main/java/com/diagbot/web/EMRController.java
  48. 2 2
      icss-service/src/main/java/com/diagbot/web/IndexConfigController.java
  49. 3 3
      icss-service/src/main/java/com/diagbot/web/IndexDataController.java
  50. 3 3
      icss-service/src/main/java/com/diagbot/web/InquiryInfoController.java
  51. 4 4
      icss-service/src/main/java/com/diagbot/web/IntroduceInfoController.java
  52. 2 2
      icss-service/src/main/java/com/diagbot/web/ModuleInfoController.java
  53. 2 2
      icss-service/src/main/java/com/diagbot/web/PatientInfoController.java
  54. 2 2
      icss-service/src/main/java/com/diagbot/web/PushController.java
  55. 2 2
      icss-service/src/main/java/com/diagbot/web/QuestionUsualController.java
  56. 2 2
      icss-service/src/main/java/com/diagbot/web/RetrievalController.java
  57. 14 0
      ltapi-service/src/main/java/com/diagbot/client/AiptServiceClient.java
  58. 0 25
      ltapi-service/src/main/java/com/diagbot/client/UserServiceClient.java
  59. 15 0
      ltapi-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
  60. 0 23
      ltapi-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java
  61. 14 0
      triage-service/src/main/java/com/diagbot/client/AiptServiceClient.java
  62. 15 0
      triage-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java
  63. 4 3
      triage-service/src/main/java/com/diagbot/web/AIController.java
  64. 4 1
      triage-service/src/main/java/com/diagbot/web/PartController.java
  65. 5 2
      triage-service/src/main/java/com/diagbot/web/SymptomController.java

+ 1 - 1
aipt-service/pom.xml

@@ -10,7 +10,7 @@
     <packaging>jar</packaging>
 
     <name>aipt-service</name>
-    <description>AI pre-treatment Service for Spring Boot</description>
+    <description>AI and Knowledge Service for Spring Boot</description>
 
     <parent>
         <groupId>com.diagbot</groupId>

+ 1 - 1
aipt-service/src/main/java/com/diagbot/AiptServiceApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboar
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
- * @Description: BI服务启动文件
+ * @Description: 知识库服务启动文件
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */

+ 14 - 0
aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -0,0 +1,14 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.TranServiceHystrix;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description: 调用信息对接层服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
+public interface TranServiceClient {
+
+}

+ 0 - 25
aipt-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -1,25 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.UserServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
-public interface UserServiceClient {
-
-    @PostMapping(value = "/user/{username}")
-    RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
-}
-
-
-

+ 1 - 1
aipt-service/src/main/java/com/diagbot/client/AlgorithmClassify.java

@@ -1,4 +1,4 @@
-package com.diagbot.client;
+package com.diagbot.client.bean;
 
 /**
  * @Auther: fyeman

+ 1 - 1
aipt-service/src/main/java/com/diagbot/client/Feature.java

@@ -1,4 +1,4 @@
-package com.diagbot.client;
+package com.diagbot.client.bean;
 
 import java.io.Serializable;
 

+ 0 - 2
aipt-service/src/main/java/com/diagbot/client/bean/SearchData.java

@@ -1,7 +1,5 @@
 package com.diagbot.client.bean;
 
-import com.diagbot.client.AlgorithmClassify;
-import com.diagbot.client.Feature;
 import com.diagbot.dto.LisResult;
 import lombok.Getter;
 import lombok.Setter;

+ 16 - 0
aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -0,0 +1,16 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.TranServiceClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 调用信息对接层服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@Component
+@Slf4j
+public class TranServiceHystrix implements TranServiceClient {
+
+}

+ 0 - 23
aipt-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -1,23 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-public class UserServiceHystrix implements UserServiceClient {
-
-    @Override
-    public RespDTO<User> getUser(String token, String username) {
-        System.out.println(token);
-        System.out.println(username);
-        return null;
-    }
-}

+ 0 - 142
aipt-service/src/main/java/com/diagbot/entity/User.java

@@ -1,142 +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 java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 系统用户表
- * </p>
- *
- * @author gaodm
- * @since 2018-08-30
- */
-@TableName("sys_user")
-public class User implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除,Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人,0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    @Override
-    public String toString() {
-        return "User{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", password=" + password +
-                ", username=" + username +
-                "}";
-    }
-}

+ 0 - 13
aipt-service/src/main/java/com/diagbot/facade/SysLogFacade.java

@@ -1,13 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.service.impl.SysLogServiceImpl;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 用户日志业务层
- * @author: gaodm
- * @time: 2018/8/6 9:11
- */
-@Component
-public class SysLogFacade extends SysLogServiceImpl {
-}

+ 0 - 16
aipt-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> {
-
-}

+ 0 - 15
aipt-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> {
-}

+ 0 - 19
aipt-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 {
-}

+ 1 - 1
aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -4,7 +4,7 @@ import com.diagbot.dto.LisResult;
 import lombok.Getter;
 import lombok.Setter;
 
-import com.diagbot.client.Feature;
+import com.diagbot.client.bean.Feature;
 
 import java.util.List;
 import java.util.Map;

+ 0 - 21
aipt-service/src/main/java/com/diagbot/vo/SysLogVo.java

@@ -1,21 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-/**
- * @Description:
- * @author: gaodm
- * @time: 2018/8/6 10:16
- */
-@Getter
-@Setter
-public class SysLogVo {
-    private Date createDate;
-    private String ip;
-    private String method;
-    private String operation;
-    private String params;
-}

+ 1 - 2
aipt-service/src/main/java/com/diagbot/web/ClinicalController.java

@@ -1,7 +1,6 @@
 package com.diagbot.web;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.GdbResponse;
@@ -22,7 +21,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Mark Huang

+ 0 - 110
aipt-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,110 +0,0 @@
-package com.diagbot.web;
-
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.SysLog;
-import com.diagbot.facade.SysLogFacade;
-import com.diagbot.vo.SysLogVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-
-/**
- * @Description: 日志操作控制层
- * @author: gaodm
- * @time: 2018/8/30 10:12
- */
-@RestController
-@RequestMapping("/log")
-public class SysLogController {
-
-    @Autowired
-    private SysLogFacade sysLogFacade;
-
-    /**
-     * 新增日志信息
-     *
-     * @param sysLogVo 新增日志输入参数
-     * @return 新增日志是否成功
-     */
-    @ApiOperation(value = "添加日志", notes = "添加日志")
-    @PostMapping("/add")
-    @SysLogger("postLog")
-    public RespDTO add(@RequestBody SysLogVo sysLogVo) {
-        //初始化新增日志信息
-        SysLog sysLog = new SysLog();
-        sysLog.setGmtCreate(new Date());
-        sysLog.setIp(sysLogVo.getIp());
-        sysLog.setMethod(sysLogVo.getMethod());
-        sysLog.setOperation(sysLogVo.getOperation());
-        sysLog.setParams(sysLogVo.getParams());
-        return RespDTO.onSuc(sysLogFacade.save(sysLog) ? "添加成功" : "添加失败");
-    }
-
-    /**
-     * 删除日志
-     *
-     * @param id 日志信息ID
-     * @return 删除是否成功
-     */
-    @ApiOperation(value = "删除日志", notes = "删除日志")
-    @DeleteMapping("/delete/{id}")
-    @SysLogger("deleteLog")
-    public RespDTO delete(@PathVariable(value = "id") Integer id) {
-        return RespDTO.onSuc(sysLogFacade.removeById(id) ? "删除成功" : "删除失败");
-    }
-
-    /**
-     * 修改日志
-     *
-     * @param sysLog 修改日志输入参数
-     * @return 修改是否成功
-     */
-    @ApiOperation(value = "修改日志", notes = "修改日志")
-    @PostMapping("/update")
-    @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog sysLog) {
-        return RespDTO.onSuc(sysLogFacade.updateById(sysLog) ? "修改成功" : "修改失败");
-    }
-
-    /**
-     * 获取日志列表
-     *
-     * @return 日志列信息
-     */
-    @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
-    @GetMapping("/list")
-    @SysLogger("listLog")
-    public RespDTO list() {
-        Wrapper<SysLog> wrapper = new QueryWrapper<>();
-        return RespDTO.onSuc(sysLogFacade.list(wrapper));
-    }
-
-    /**
-     * 获取日志翻页信息
-     *
-     * @return 日志翻页信息
-     */
-    @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
-    @GetMapping("/page")
-    @SysLogger("pageLog")
-    public RespDTO page() {
-        //初始化日志翻页参数
-        IPage<SysLog> wrapper = new Page<>();
-        return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
-    }
-}
-

+ 0 - 23
aipt-service/src/main/java/com/diagbot/web/TestController.java

@@ -1,23 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description:
- * @author: ztg
- * @time: 2019/2/27 9:58
- */
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-    @PostMapping("/list")
-    @SysLogger("list")
-    public RespDTO<String> list() {
-        return RespDTO.onSuc("OK");
-    }
-}

+ 0 - 22
aipt-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>

+ 0 - 76
config-server/src/main/resources/shared/data-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-log?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:
@@ -66,32 +19,3 @@ spring:
     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
-

+ 0 - 77
config-server/src/main/resources/shared/data-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-log?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,33 +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
-

+ 0 - 76
config-server/src/main/resources/shared/data-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-log?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:
@@ -66,32 +19,3 @@ spring:
     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
-

+ 0 - 76
config-server/src/main/resources/shared/data-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-log?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:
@@ -66,32 +19,3 @@ spring:
     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
-

+ 0 - 31
data-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>

+ 14 - 0
data-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -0,0 +1,14 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.AiptServiceHystrix;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
+public interface AiptServiceClient {
+
+}

+ 0 - 25
data-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -1,25 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.UserServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
-public interface UserServiceClient {
-
-    @PostMapping(value = "/user/{username}")
-    RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
-}
-
-
-

+ 15 - 0
data-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -0,0 +1,15 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.AiptServiceClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@Component
+@Slf4j
+public class AiptServiceHystrix implements AiptServiceClient {
+}

+ 0 - 23
data-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -1,23 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-public class UserServiceHystrix implements UserServiceClient {
-
-    @Override
-    public RespDTO<User> getUser(String token, String username) {
-        System.out.println(token);
-        System.out.println(username);
-        return null;
-    }
-}

+ 0 - 29
data-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;
-    }
-
-}

+ 0 - 4
data-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;
 
     /**

+ 0 - 6
data-service/src/main/java/com/diagbot/entity/User.java

@@ -1,9 +1,5 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,7 +11,6 @@ import java.util.Date;
  * @author gaodm
  * @since 2018-08-30
  */
-@TableName("sys_user")
 public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -23,7 +18,6 @@ public class User implements Serializable {
     /**
      * 用户ID
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

+ 1 - 2
data-service/src/main/java/com/diagbot/facade/SysLogFacade.java

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import com.diagbot.service.impl.SysLogServiceImpl;
 import org.springframework.stereotype.Component;
 
 /**
@@ -9,5 +8,5 @@ import org.springframework.stereotype.Component;
  * @time: 2018/8/6 9:11
  */
 @Component
-public class SysLogFacade extends SysLogServiceImpl {
+public class SysLogFacade {
 }

+ 0 - 16
data-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> {
-
-}

+ 0 - 15
data-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> {
-}

+ 0 - 19
data-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 {
-}

+ 0 - 89
data-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -1,27 +1,11 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.SysLog;
 import com.diagbot.facade.SysLogFacade;
-import com.diagbot.vo.SysLogVo;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-
 /**
  * @Description: 日志操作控制层
  * @author: gaodm
@@ -33,78 +17,5 @@ public class SysLogController {
 
     @Autowired
     private SysLogFacade sysLogFacade;
-
-    /**
-     * 新增日志信息
-     *
-     * @param sysLogVo 新增日志输入参数
-     * @return 新增日志是否成功
-     */
-    @ApiOperation(value = "添加日志", notes = "添加日志")
-    @PostMapping("/add")
-    @SysLogger("postLog")
-    public RespDTO add(@RequestBody SysLogVo sysLogVo) {
-        //初始化新增日志信息
-        SysLog sysLog = new SysLog();
-        sysLog.setGmtCreate(new Date());
-        sysLog.setIp(sysLogVo.getIp());
-        sysLog.setMethod(sysLogVo.getMethod());
-        sysLog.setOperation(sysLogVo.getOperation());
-        sysLog.setParams(sysLogVo.getParams());
-        return RespDTO.onSuc(sysLogFacade.save(sysLog) ? "添加成功" : "添加失败");
-    }
-
-    /**
-     * 删除日志
-     *
-     * @param id 日志信息ID
-     * @return 删除是否成功
-     */
-    @ApiOperation(value = "删除日志", notes = "删除日志")
-    @DeleteMapping("/delete/{id}")
-    @SysLogger("deleteLog")
-    public RespDTO delete(@PathVariable(value = "id") Integer id) {
-        return RespDTO.onSuc(sysLogFacade.removeById(id) ? "删除成功" : "删除失败");
-    }
-
-    /**
-     * 修改日志
-     *
-     * @param sysLog 修改日志输入参数
-     * @return 修改是否成功
-     */
-    @ApiOperation(value = "修改日志", notes = "修改日志")
-    @PostMapping("/update")
-    @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog sysLog) {
-        return RespDTO.onSuc(sysLogFacade.updateById(sysLog) ? "修改成功" : "修改失败");
-    }
-
-    /**
-     * 获取日志列表
-     *
-     * @return 日志列信息
-     */
-    @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
-    @GetMapping("/list")
-    @SysLogger("listLog")
-    public RespDTO list() {
-        Wrapper<SysLog> wrapper = new QueryWrapper<>();
-        return RespDTO.onSuc(sysLogFacade.list(wrapper));
-    }
-
-    /**
-     * 获取日志翻页信息
-     *
-     * @return 日志翻页信息
-     */
-    @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
-    @GetMapping("/page")
-    @SysLogger("pageLog")
-    public RespDTO page() {
-        //初始化日志翻页参数
-        IPage<SysLog> wrapper = new Page<>();
-        return RespDTO.onSuc(sysLogFacade.page(wrapper, null));
-    }
 }
 

+ 0 - 22
data-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>

+ 0 - 83
data-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//dataservice");
-        gc.setFileOverride(true);
-        gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
-        gc.setEnableCache(false);// XML 二级缓存
-        gc.setBaseResultMap(true);// XML ResultMap
-        gc.setBaseColumnList(false);// XML columList
-        gc.setAuthor("gaodm");// 作者
-
-        // 自定义文件命名,注意 %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("root");
-        dsc.setUrl("jdbc:mysql://127.0.0.1:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
-        mpg.setDataSource(dsc);
-
-        // 策略配置
-        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
-        strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_log" }); // 需要生成的表
-
-        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();
-
-    }
-}

+ 2 - 2
icss-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.DeptInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +37,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         HospitalDeptInfoVO hospitalDeptInfoVO = new HospitalDeptInfoVO();
         BeanUtil.copyProperties(deptInfoVO,hospitalDeptInfoVO);
         RespDTO<HospitalDeptInfoDTO> hospitalDeptInfoDTORespDTO = tranServiceClient.getHospitalDeptInfo(hospitalDeptInfoVO);
-        if (hospitalDeptInfoDTORespDTO == null
-                || !CommonErrorCode.OK.getCode().equals(hospitalDeptInfoDTORespDTO.code)) {
+        if (RespDTOUtil.respIsNG(hospitalDeptInfoDTORespDTO)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取科室信息失败");
         }

+ 2 - 2
icss-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import java.util.List;
 import java.util.Map;
 
+import com.diagbot.util.RespDTOUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,8 +32,7 @@ public class DoctorInfoFacade {
      */
     public List<DoctorInfoDTO> getDoctorInfo(DoctorInfoVO doctorInfoVo) {
         RespDTO<List<DoctorInfoDTO>> doctorInfoDTOList = tranServiceClient.getDoctorInfo(doctorInfoVo);
-        if (doctorInfoDTOList == null
-                || !CommonErrorCode.OK.getCode().equals(doctorInfoDTOList.code)) {
+        if (RespDTOUtil.respIsNG(doctorInfoDTOList)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医生信息失败");
         }

+ 2 - 2
icss-service/src/main/java/com/diagbot/facade/HospitalInfoFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,8 +31,7 @@ public class HospitalInfoFacade {
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         RespDTO<List<HospitalInfoDTO>> hospitalInfoDTOList = tranServiceClient.getHospitalInfo(hospitalInfoVO);
-        if (hospitalInfoDTOList == null
-                || !CommonErrorCode.OK.getCode().equals(hospitalInfoDTOList.code)) {
+        if (RespDTOUtil.respIsNG(hospitalInfoDTOList)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医院信息失败");
         }

+ 4 - 5
icss-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,8 +44,7 @@ public class PatientInfoFacade {
      */
     public PatientInfoDTO getPatientInfo(PatientInfoVO patientInfoVO) {
         RespDTO<PatientInfoDTO> patientInfoDTO = tranServiceClient.getPatientInfo(patientInfoVO);
-        if (patientInfoDTO == null
-                || !CommonErrorCode.OK.getCode().equals(patientInfoDTO.code)) {
+        if (RespDTOUtil.respIsNG(patientInfoDTO)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取患者信息失败");
         }
@@ -59,7 +59,7 @@ public class PatientInfoFacade {
      */
     public GetTopPatientInfoDTO getTopPatientInfo(@RequestBody GetTopPatientInfoVO getTopPatientInfoVO) {
         RespDTO<GetTopPatientInfoDTO> respDTO = tranServiceClient.getTopPatientInfo(getTopPatientInfoVO);
-        if (respDTO == null || !"0".equals(respDTO.code)) {
+        if (RespDTOUtil.respIsNG(respDTO)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "页面顶部病人医生科室信息");
         }
@@ -94,8 +94,7 @@ public class PatientInfoFacade {
      */
     public Map<Long, PatientInfo> patientInfoMapByIds(List<Long> ids) {
         RespDTO<Map<Long, PatientInfo>> retData = tranServiceClient.patientInfoMapByIds(ids);
-        if (retData == null
-                || !CommonErrorCode.OK.getCode().equals(retData.code)) {
+        if (RespDTOUtil.respIsNG(retData)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取患者信息失败");
         }

+ 2 - 1
icss-service/src/main/java/com/diagbot/facade/TranFieldInfoFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.TranFieldInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -30,7 +31,7 @@ public class TranFieldInfoFacade {
      */
     public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info) {
         RespDTO<List<TranFieldInfoDTO>> tranFieldInfoDTOList = tranServiceClient.getInfoByUuid(info);
-        if (tranFieldInfoDTOList == null || !CommonErrorCode.OK.getCode().equals(tranFieldInfoDTOList.code)) {
+        if (RespDTOUtil.respIsNG(tranFieldInfoDTOList)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取医生信息失败");
         }

+ 1 - 0
icss-service/src/main/java/com/diagbot/web/CalculateController.java

@@ -24,6 +24,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/calc")
 @Api(value = "计算相关API", tags = { "2期-计算相关API" })
+@SuppressWarnings("unchecked")
 public class CalculateController {
     @Autowired
     CalculateFacade calculateFacade;

+ 1 - 1
icss-service/src/main/java/com/diagbot/web/DisScaleController.java

@@ -47,7 +47,7 @@ public class DisScaleController {
     }
 
 
-    @ApiOperation(value = "2期-获取量表内容[by:zhoutg]",notes = "")
+    @ApiOperation(value = "知识库标准化-获取量表内容[by:zhoutg]",notes = "")
     @PostMapping("/getContent")
     @ApiIgnore
     public RespDTO<List<ScaleContent>> getContent(@RequestBody PushVO pushVO) {

+ 3 - 3
icss-service/src/main/java/com/diagbot/web/EMRController.java

@@ -26,7 +26,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/emr")
-@Api(value = "电子病历评级相关API", tags = { "电子病历评级相关API" })
+@Api(value = "电子病历评级相关API", tags = { "知识库标准化-电子病历评级相关API" })
 @SuppressWarnings("unchecked")
 public class EMRController {
     @Autowired
@@ -34,7 +34,7 @@ public class EMRController {
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "电子病历解读[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-电子病历解读[by:zhaops]",
             notes = "hosCode: 医院编码,必填,String<br>" +
                     "type: 检验检查类型,5-检验,6-检查,7-诊断,单选必填,Integer<br>" +
                     "name: 名称(检验检查诊断),必填,String<br>" +
@@ -48,7 +48,7 @@ public class EMRController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "推理[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-推理[by:zhaops]",
             notes = "hosCode: 医院编码(必填)<br>" +
                     "age: 年龄(必填)<br>" +
                     "sex:性别(必填),1:男,2:女<br>" +

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/IndexConfigController.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/indexConfig")
-@Api(value = "指标配置API[by:wangfeng]", tags = { "WF-2期-指标配置API" })
+@Api(value = "指标配置API[by:wangfeng]", tags = { "知识库标准化-指标配置API" })
 @SuppressWarnings("unchecked")
 @ApiIgnore
 public class IndexConfigController {
@@ -35,7 +35,7 @@ public class IndexConfigController {
     @Autowired
     IndexConfigFacade indexConfigFacade;
 
-    @ApiOperation(value = "2期-根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
+    @ApiOperation(value = "知识库标准化-根据疾病Id获取指标配置[by:wangfeng]", notes = "根据疾病Id获取指标配置")
     @PostMapping("/getindexConfigs")
     @SysLogger("getindexConfigs")
     public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {

+ 3 - 3
icss-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -31,14 +31,14 @@ import springfox.documentation.annotations.ApiIgnore;
 
 @RestController
 @RequestMapping("/indexData")
-@Api(value = "指标数据API[by:wangfeng]", tags = { "WF-2期-指标数据API" })
+@Api(value = "指标数据API[by:wangfeng]", tags = { "知识库标准化-指标数据API" })
 @SuppressWarnings("unchecked")
 public class IndexDataController {
 
     @Autowired
     IndexDataFacade indexDataFacade;
 
-    @ApiOperation(value = "2期-根据疾病Id获取指标数据[by:wangfeng]", notes = "diseaseId:疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @ApiOperation(value = "知识库标准化-根据疾病Id获取指标数据[by:wangfeng]", notes = "diseaseId:疾病Id 必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
     @PostMapping("/getIndexDatas")
     @SysLogger("getIndexDatas")
     public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
@@ -48,7 +48,7 @@ public class IndexDataController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "2期-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode :就诊号  必填<br> doctorId:医生id必填<br> IndexData:{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode :就诊号  必填<br> doctorId:医生id必填<br> IndexData:{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
     @PostMapping("/saveIndexDatas")
     @SysLogger("saveIndexDatas")
     @Transactional

+ 3 - 3
icss-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -39,14 +39,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/inquiryInfo")
-@Api(value = "问诊记录API", tags = { "2期-问诊记录API" })
+@Api(value = "问诊记录API", tags = { "知识库标准化-问诊记录API" })
 @SuppressWarnings("unchecked")
 public class InquiryInfoController {
 
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-    @ApiOperation(value = "2期-问诊记录保存[by:rengb]")
+    @ApiOperation(value = "知识库标准化-问诊记录保存[by:rengb]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
@@ -54,7 +54,7 @@ public class InquiryInfoController {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
 
-    @ApiOperation(value = "2期-问诊记录回显[by:rengb]")
+    @ApiOperation(value = "知识库标准化-问诊记录回显[by:rengb]")
     @PostMapping("/readInquiry")
     @SysLogger("readInquiry")
     public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {

+ 4 - 4
icss-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -26,14 +26,14 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/introduceInfo")
-@Api(value = "提示信息相关API", tags = { "提示信息相关API" })
+@Api(value = "提示信息相关API", tags = { "知识库标准化-提示信息相关API" })
 @SuppressWarnings("unchecked")
 public class IntroduceInfoController {
 
     @Autowired
     IntroduceInfoFacade introduceInfoFacade;
 
-    @ApiOperation(value = "根据标签id获取提示信息[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-根据标签id获取提示信息[by:zhaops]",
             notes = "questionId: 标签id,必填<br>" +
                     "type:标签类型,必填<br>" +
                     "position:展示位置(1-推送展示,2-更多展示,3-一般治疗展示,4-手术治疗展示),必填")
@@ -43,7 +43,7 @@ public class IntroduceInfoController {
         return RespDTO.onSuc(introduceDTO);
     }
 
-    @ApiOperation(value = "根据标签名称获取提示信息[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-根据标签名称获取提示信息[by:zhaops]",
             notes = "tagName: 标签名称,必填<br>" +
                     "type:标签类型,必填<br>" +
                     "position:展示位置(1-推送展示,2-更多展示,3-一般治疗展示,4-手术治疗展示),必填")
@@ -53,7 +53,7 @@ public class IntroduceInfoController {
         return RespDTO.onSuc(introduceDTO);
     }
 
-    @ApiOperation(value = "根据id获取提示信息[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-根据id获取提示信息[by:zhaops]",
             notes = "id: 提示信息id,必填<br>")
     @PostMapping("/getRecordById")
     public RespDTO<IntroduceDTO> getRecordById(@RequestParam Long id) {

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/ModuleInfoController.java

@@ -25,14 +25,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/moduleInfo")
-@Api(value = "模型相关API", tags = { "2期-模型相关API" })
+@Api(value = "模型相关API", tags = { "知识库标准化-模型相关API" })
 @SuppressWarnings("unchecked")
 public class ModuleInfoController {
 
     @Autowired
     ModuleFacade moduleFacade;
 
-    @ApiOperation(value = "2期-返回所有的模型数据[by:wangyu]",
+    @ApiOperation(value = "知识库标准化-返回所有的模型数据[by:wangyu]",
             notes = "moduleType: 模板类型(0.通用 1.根据科室划分 2.慢病)<br>" +
                     "relationId: 关联id,当moduleType为0时传0,当moduleType为1时,传科室id,当moduleType为2时传疾病id<br>" +
                     "<br>")

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/PatientInfoController.java

@@ -29,7 +29,7 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/patientInfo")
-@Api(value = "患者信息API", tags = { "患者信息API" })
+@Api(value = "患者信息API", tags = { "知识库标准化-患者信息API" })
 @SuppressWarnings("unchecked")
 public class PatientInfoController {
     @Autowired
@@ -48,7 +48,7 @@ public class PatientInfoController {
     }
 
 
-    @ApiOperation(value = "页面顶部病人医生科室信息——查询[by:rengb]",
+    @ApiOperation(value = "知识库标准化-页面顶部病人医生科室信息——查询[by:rengb]",
             notes = "hospitalCode:医院编号,必填<br>" +
                     "hospitalDeptCode:医院科室编号,必填<br>" +
                     "doctorCode:医院医生编号,必填<br>" +

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -32,14 +32,14 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/push")
-@Api(value = "推理相关API", tags = { "2期-推理相关API" })
+@Api(value = "推理相关API", tags = { "知识库标准化-推理相关API" })
 @SuppressWarnings("unchecked")
 public class PushController {
 
     @Autowired
     PushFacade pushFacade;
 
-    @ApiOperation(value = "2期-推理接口(半结构化)[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-推理接口(半结构化)[by:zhaops]",
             notes = "age: 年龄(必填)<br>" +
                     "sex:性别(必填),1:男,2:女<br>" +
                     "symptom:症状,String<br>" +

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -27,14 +27,14 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/questionUsual")
-@Api(value = "常用标签检索API", tags = { "2期-常用标签API" })
+@Api(value = "常用标签检索API", tags = { "知识库标准化-常用标签API" })
 @SuppressWarnings("unchecked")
 public class QuestionUsualController {
 
     @Autowired
     private QuestionUsualFacade questionUsualFacade;
 
-    @ApiOperation(value = "2期-常用标签——根据科室获取常用标签[by:wangyu]",
+    @ApiOperation(value = "知识库标准化-常用标签——根据科室获取常用标签[by:wangyu]",
             notes = "deptCode:科室id<br>" +
                     "age:年龄<br>" +
                     "sexType: 性别<br>" +

+ 2 - 2
icss-service/src/main/java/com/diagbot/web/RetrievalController.java

@@ -27,13 +27,13 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/retrieval")
-@Api(value = "页面检索API", tags = { "页面检索API" })
+@Api(value = "页面检索API", tags = { "知识库标准化-页面检索API" })
 @SuppressWarnings("unchecked")
 public class RetrievalController {
     @Autowired
     private RetrievalFacade retrievalFacade;
 
-    @ApiOperation(value = "页面检索——查询[by:wangyu]",
+    @ApiOperation(value = "知识库标准化-页面检索——查询[by:wangyu]",
             notes = "type:类型(1:症状 3:其他史 4:查体,5:化验 6:辅检 7:诊断),必填<br>" +
                     "age:年龄,必填<br>" +
                     "inputStr:检索内容,必填<br>" +

+ 14 - 0
ltapi-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -0,0 +1,14 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.AiptServiceHystrix;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
+public interface AiptServiceClient {
+
+}

+ 0 - 25
ltapi-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -1,25 +0,0 @@
-package com.diagbot.client;
-
-import com.diagbot.client.hystrix.UserServiceHystrix;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
-public interface UserServiceClient {
-
-    @PostMapping(value = "/user/{username}")
-    RespDTO<User> getUser(@RequestHeader(value = "Authorization") String token, @PathVariable("username") String username);
-}
-
-
-

+ 15 - 0
ltapi-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -0,0 +1,15 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.AiptServiceClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@Component
+@Slf4j
+public class AiptServiceHystrix implements AiptServiceClient {
+}

+ 0 - 23
ltapi-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -1,23 +0,0 @@
-package com.diagbot.client.hystrix;
-
-import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.User;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @Description: 调用用户服务
- * @author: gaodm
- * @time: 2018/8/6 9:52
- */
-@Component
-public class UserServiceHystrix implements UserServiceClient {
-
-    @Override
-    public RespDTO<User> getUser(String token, String username) {
-        System.out.println(token);
-        System.out.println(username);
-        return null;
-    }
-}

+ 14 - 0
triage-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -0,0 +1,14 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.AiptServiceHystrix;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@FeignClient(value = "aipt-service", fallback = AiptServiceHystrix.class)
+public interface AiptServiceClient {
+
+}

+ 15 - 0
triage-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -0,0 +1,15 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.AiptServiceClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 调用知识库服务
+ * @author: gaodm
+ * @time: 2019/2/1 17:00
+ */
+@Component
+@Slf4j
+public class AiptServiceHystrix implements AiptServiceClient {
+}

+ 4 - 3
triage-service/src/main/java/com/diagbot/web/AIController.java

@@ -23,7 +23,8 @@ import javax.validation.Valid;
  */
 @RestController
 @RequestMapping("/ai")
-@Api(value = "AIAPI", tags = { "AIAPI" })
+@Api(value = "AIAPI", tags = { "知识库标准化-AIAPI" })
+@SuppressWarnings("unchecked")
 public class AIController {
 
     @Autowired
@@ -35,7 +36,7 @@ public class AIController {
      * @param aivo ai输入参数
      * @return 症状相关数据
      */
-    @ApiOperation(value = "症状推理症状接口[by:gaodm]",
+    @ApiOperation(value = "知识库标准化-症状推理症状接口[by:zhaops]",
             notes = "age: 年龄(必填)<br>" +
                     "sex:性别,1:男,2:女(必填)<br>" +
                     "symptom:症状自然文本描述(必填)")
@@ -51,7 +52,7 @@ public class AIController {
      * @param aivo ai输入参数
      * @return 疾病相关数据
      */
-    @ApiOperation(value = "症状推理疾病接口[by:gaodm]",
+    @ApiOperation(value = "知识库标准化-症状推理疾病接口[by:zhaops]",
             notes = "age: 年龄(必填)<br>" +
                     "sex:性别,1:男,2:女(必填)<br>" +
                     "symptom:症状自然文本描述(必填)")

+ 4 - 1
triage-service/src/main/java/com/diagbot/web/PartController.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.PartSymptomDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PartFacade;
 import com.diagbot.vo.PartSymptomVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -21,13 +22,15 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/part")
+@Api(value = "部位API", tags = { "知识库标准化-部位API" })
+@SuppressWarnings("unchecked")
 public class PartController {
 
     @Autowired
     PartFacade partFacade;
 
 
-    @ApiOperation(value = "根据已选部位返回对应的症状[by:zhoutg]",
+    @ApiOperation(value = "知识库标准化-根据已选部位返回对应的症状[by:zhoutg]",
             notes = "partIds: 部位的id,数组<br>" +
                     "sexType:性别,1:男,2:女<br>" +
                     "age:年龄")

+ 5 - 2
triage-service/src/main/java/com/diagbot/web/SymptomController.java

@@ -7,6 +7,7 @@ import com.diagbot.entity.Symptom;
 import com.diagbot.facade.SymptomFacade;
 import com.diagbot.vo.SymptomSearchVO;
 import com.diagbot.vo.SymptomUsualVO;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,13 +25,15 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/symptom")
+@Api(value = "症状API", tags = { "知识库标准化-症状API" })
+@SuppressWarnings("unchecked")
 public class SymptomController {
 
     @Autowired
     SymptomFacade symptomFacade;
 
 
-    @ApiOperation(value = "获取常用症状[by:zhoutg]",
+    @ApiOperation(value = "知识库标准化-获取常用症状[by:wangyu]",
             notes = "sexType:性别,1:男,2:女<br>" +
                     "age:年龄")
     @PostMapping("/getUsual")
@@ -39,7 +42,7 @@ public class SymptomController {
     }
 
 
-    @ApiOperation(value = "搜索症状[by:zhoutg]",
+    @ApiOperation(value = "知识库标准化-搜索症状[by:wangyu]",
             notes = "name: 输入内容<br>" +
                     "sexType:性别,1:男,2:女<br>" +
                     "age:年龄")