Browse Source

知识库标准化

gaodm 6 years ago
parent
commit
42d1f580cc

+ 76 - 76
aipt-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -1,76 +1,76 @@
-package com.diagbot.aop;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.entity.SysLog;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.GsonUtil;
-import com.diagbot.util.HttpUtils;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.UserUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.Date;
-
-/**
- * @Description: 日志拦截切面
- * @author: gaodm
- * @time: 2018/8/2 13:36
- */
-@Aspect
-@Component
-public class SysLoggerAspect {
-    @Autowired
-    private MySender mySender;
-
-    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
-    public void loggerPointCut() {
-
-    }
-
-    @Before("loggerPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-
-        SysLog sysLog = new SysLog();
-        SysLogger sysLogger = method.getAnnotation(SysLogger.class);
-        if (sysLogger != null) {
-            //注解上的描述
-            sysLog.setOperation(sysLogger.value());
-        }
-        //请求的方法名
-        String className = joinPoint.getTarget().getClass().getName();
-        String methodName = signature.getName();
-        sysLog.setMethod(className + "." + methodName + "()");
-        //请求的参数
-        Object[] args = joinPoint.getArgs();
-        String params = "";
-        for (Object o : args) {
-            params += GsonUtil.toJson(o);
-        }
-        if (!StringUtil.isEmpty(params)) {
-            sysLog.setParams(params);
-        }
-        //设置IP地址
-        sysLog.setIp(HttpUtils.getIpAddress());
-        //用户名
-        String username = UserUtils.getCurrentPrinciple();
-        if (!StringUtil.isEmpty(username)) {
-            sysLog.setUsername(username);
-        }
-        sysLog.setGmtCreate(new Date());
-        sysLog.setSysType(SysTypeEnum.AIPT_SERVICE.getKey());
-        //保存系统日志
-        mySender.outputLogSend(sysLog);
-    }
-
-}
-
+//package com.diagbot.aop;
+//
+//import com.diagbot.annotation.SysLogger;
+//import com.diagbot.entity.SysLog;
+//import com.diagbot.enums.SysTypeEnum;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.GsonUtil;
+//import com.diagbot.util.HttpUtils;
+//import com.diagbot.util.StringUtil;
+//import com.diagbot.util.UserUtils;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.lang.reflect.Method;
+//import java.util.Date;
+//
+///**
+// * @Description: 日志拦截切面
+// * @author: gaodm
+// * @time: 2018/8/2 13:36
+// */
+//@Aspect
+//@Component
+//public class SysLoggerAspect {
+//    @Autowired
+//    private MySender mySender;
+//
+//    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
+//    public void loggerPointCut() {
+//
+//    }
+//
+//    @Before("loggerPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) {
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        Method method = signature.getMethod();
+//
+//        SysLog sysLog = new SysLog();
+//        SysLogger sysLogger = method.getAnnotation(SysLogger.class);
+//        if (sysLogger != null) {
+//            //注解上的描述
+//            sysLog.setOperation(sysLogger.value());
+//        }
+//        //请求的方法名
+//        String className = joinPoint.getTarget().getClass().getName();
+//        String methodName = signature.getName();
+//        sysLog.setMethod(className + "." + methodName + "()");
+//        //请求的参数
+//        Object[] args = joinPoint.getArgs();
+//        String params = "";
+//        for (Object o : args) {
+//            params += GsonUtil.toJson(o);
+//        }
+//        if (!StringUtil.isEmpty(params)) {
+//            sysLog.setParams(params);
+//        }
+//        //设置IP地址
+//        sysLog.setIp(HttpUtils.getIpAddress());
+//        //用户名
+//        String username = UserUtils.getCurrentPrinciple();
+//        if (!StringUtil.isEmpty(username)) {
+//            sysLog.setUsername(username);
+//        }
+//        sysLog.setGmtCreate(new Date());
+//        sysLog.setSysType(SysTypeEnum.AIPT_SERVICE.getKey());
+//        //保存系统日志
+//        mySender.outputLogSend(sysLog);
+//    }
+//
+//}
+//

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

@@ -31,7 +31,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/clinicaldata")
 @Api(value = "临床数据处理API", tags = { "临床数据处理API" })
-
+@SuppressWarnings("unchecked")
 public class ClinicalController {
     @Autowired
     private ClinicalFacade clinicalFacade;

+ 1 - 0
aipt-service/src/main/java/com/diagbot/web/NLPController.java

@@ -22,6 +22,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/nlpService")
 @Api(value = "NLP相关API", tags = { "NLP相关API" })
+@SuppressWarnings("unchecked")
 public class NLPController {
     @Autowired
     NLPFacade nlpFacade;

+ 1 - 1
aipt-service/src/test/java/com/diagbot/BiServiceApplicationTests.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class BiServiceApplicationTests {
+public class AiptServiceApplicationTests {
 
     @Test
     public void contextLoads() {

+ 5 - 5
aipt-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -27,7 +27,7 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//biservice");
+        gc.setOutputDir("E://code//aiptservice");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
@@ -48,15 +48,15 @@ public class CodeGeneration {
         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");
+        dsc.setPassword("diagbot@20180822");
+        dsc.setUrl("jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-//        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_log" }); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_concept" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

+ 2 - 2
config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -7,9 +7,9 @@ spring:
     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
+      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: diagbot@20180822
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5

+ 2 - 2
config-server/src/main/resources/shared/aipt-service-local.yml

@@ -7,9 +7,9 @@ spring:
     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
+      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: diagbot@20180822
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5