Merge branch 'dev/feignTimeout' into debug

src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.diagbot.config.mybatisLike.MybatisLikeSqlInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,4 +31,9 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
+    @Bean
+    public MybatisLikeSqlInterceptor mybatisSqlInterceptor() {
+        return new MybatisLikeSqlInterceptor();
+    }
+
 }

src/main/java/com/diagbot/config/mybatisLike/AbstractLikeSqlConverter.java

@@ -0,0 +1,223 @@
+package com.diagbot.config.mybatisLike;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Set;
+
+
+/**
+ * @Description: 包含like的SQL语句转义模板
+ * @author: gaodm
+ * @time: 2020/11/2 16:05
+ */
+@Slf4j
+public abstract class AbstractLikeSqlConverter<T> {
+
+    /**
+     * SQL语句like使用关键字%
+     */
+    private final static String LIKE_SQL_KEY = "%";
+
+    /**
+     * SQL语句需要转义的关键字
+     */
+    private final static String[] ESCAPE_CHAR = new String[] { LIKE_SQL_KEY, "_", "\\" };
+
+    /**
+     * mybatis-plus中like的SQL语句样式
+     */
+    private final static String MYBATIS_PLUS_LIKE_SQL = " like ?";
+
+    /**
+     * mybatis-plus中参数前缀
+     */
+    private final static String MYBATIS_PLUS_WRAPPER_PREFIX = "ew.paramNameValuePairs.";
+
+    /**
+     * mybatis-plus中参数键
+     */
+    final static String MYBATIS_PLUS_WRAPPER_KEY = "ew";
+
+    /**
+     * mybatis-plus中参数分隔符
+     */
+    final static String MYBATIS_PLUS_WRAPPER_SEPARATOR = ".";
+
+    /**
+     * mybatis-plus中参数分隔符替换器
+     */
+    final static String MYBATIS_PLUS_WRAPPER_SEPARATOR_REGEX = "\\.";
+
+    /**
+     * 已经替换过的标记
+     */
+    final static String REPLACED_LIKE_KEYWORD_MARK = "replaced.keyword";
+
+    /**
+     * 转义特殊字符
+     *
+     * @param sql       SQL语句
+     * @param fields    字段列表
+     * @param parameter 参数对象
+     */
+    public void convert(String sql, Set<String> fields, T parameter) {
+        for (String field : fields) {
+            if (this.hasMybatisPlusLikeSql(sql)) {
+                if (this.hasWrapper(field)) {
+                    // 第一种情况：在业务层进行条件构造产生的模糊查询关键字,使用QueryWrapper,LambdaQueryWrapper
+                    this.transferWrapper(field, parameter);
+                } else {
+                    // 第二种情况：未使用条件构造器，但是在service层进行了查询关键字与模糊查询符`%`手动拼接
+                    this.transferSelf(field, parameter);
+                }
+            } else {
+                // 第三种情况：在Mapper类的注解SQL中进行了模糊查询的拼接
+                this.transferSplice(field, parameter);
+            }
+        }
+    }
+
+    /**
+     * 转义条件构造的特殊字符
+     * 在业务层进行条件构造产生的模糊查询关键字,使用QueryWrapper,LambdaQueryWrapper
+     *
+     * @param field     字段名称
+     * @param parameter 参数对象
+     */
+    public abstract void transferWrapper(String field, T parameter);
+
+    /**
+     * 转义自定义条件拼接的特殊字符
+     * 未使用条件构造器，但是在service层进行了查询关键字与模糊查询符`%`手动拼接
+     *
+     * @param field     字段名称
+     * @param parameter 参数对象
+     */
+    public abstract void transferSelf(String field, T parameter);
+
+    /**
+     * 转义自定义条件拼接的特殊字符
+     * 在Mapper类的注解SQL中进行了模糊查询的拼接
+     *
+     * @param field     字段名称
+     * @param parameter 参数对象
+     */
+    public abstract void transferSplice(String field, T parameter);
+
+    /**
+     * 转义通配符
+     *
+     * @param before 待转义字符串
+     * @return 转义后字符串
+     */
+    String escapeChar(String before) {
+        if (StringUtils.isNotBlank(before)) {
+            before = before.replaceAll("\\\\", "\\\\\\\\");
+            before = before.replaceAll("_", "\\\\_");
+            before = before.replaceAll("%", "\\\\%");
+        }
+        return before;
+    }
+
+    /**
+     * 是否包含需要转义的字符
+     *
+     * @param obj 待判断的对象
+     * @return true/false
+     */
+    boolean hasEscapeChar(Object obj) {
+        if (!(obj instanceof String)) {
+            return false;
+        }
+        return this.hasEscapeChar((String) obj);
+    }
+
+    /**
+     * 处理对象like问题
+     *
+     * @param field     对象字段
+     * @param parameter 对象
+     */
+    void resolveObj(String field, Object parameter) {
+        if (parameter == null || StringUtils.isBlank(field)) {
+            return;
+        }
+        try {
+            PropertyDescriptor descriptor = new PropertyDescriptor(field, parameter.getClass());
+            Method readMethod = descriptor.getReadMethod();
+            Object param = readMethod.invoke(parameter);
+            if (this.hasEscapeChar(param)) {
+                Method setMethod = descriptor.getWriteMethod();
+                setMethod.invoke(parameter, this.escapeChar(param.toString()));
+            } else if (this.cascade(field)) {
+                int index = field.indexOf(MYBATIS_PLUS_WRAPPER_SEPARATOR) + 1;
+                this.resolveObj(field.substring(index), param);
+            }
+        } catch (IntrospectionException | IllegalAccessException | InvocationTargetException e) {
+            log.error("反射 {} 的 {} get/set方法出现异常", parameter, field, e);
+        }
+    }
+
+    /**
+     * 判断是否是级联属性
+     *
+     * @param field 字段名
+     * @return true/false
+     */
+    boolean cascade(String field) {
+        if (StringUtils.isBlank(field)) {
+            return false;
+        }
+        return field.contains(MYBATIS_PLUS_WRAPPER_SEPARATOR) && !this.hasWrapper(field);
+    }
+
+    /**
+     * 是否包含mybatis-plus的包含like的SQL语句格式
+     *
+     * @param sql 完整SQL语句
+     * @return true/false
+     */
+    private boolean hasMybatisPlusLikeSql(String sql) {
+        if (StringUtils.isBlank(sql)) {
+            return false;
+        }
+        return sql.toLowerCase().contains(MYBATIS_PLUS_LIKE_SQL);
+    }
+
+    /**
+     * 判断是否使用mybatis-plus条件构造器
+     *
+     * @param field 字段
+     * @return true/false
+     */
+    private boolean hasWrapper(String field) {
+        if (StringUtils.isBlank(field)) {
+            return false;
+        }
+        return field.contains(MYBATIS_PLUS_WRAPPER_PREFIX);
+    }
+
+    /**
+     * 判断字符串是否含有需要转义的字符
+     *
+     * @param str 待判断的字符串
+     * @return true/false
+     */
+    private boolean hasEscapeChar(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        for (String s : ESCAPE_CHAR) {
+            if (str.contains(s)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

src/main/java/com/diagbot/config/mybatisLike/MapLikeSqlConverter.java

@@ -0,0 +1,79 @@
+package com.diagbot.config.mybatisLike;
+
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @Description: 参数对象为Map的转换器
+ * @author: gaodm
+ * @time: 2020/11/2 16:07
+ */
+public class MapLikeSqlConverter extends AbstractLikeSqlConverter<Map> {
+
+    @Override
+    public void transferWrapper(String field, Map parameter) {
+        AbstractWrapper wrapper = (AbstractWrapper) parameter.get(MYBATIS_PLUS_WRAPPER_KEY);
+        parameter = wrapper.getParamNameValuePairs();
+        String[] keys = field.split(MYBATIS_PLUS_WRAPPER_SEPARATOR_REGEX);
+        // ew.paramNameValuePairs.param1，截取字符串之后，获取第三个，即为参数名
+        String paramName = keys[2];
+        String mapKey = String.format("%s.%s", REPLACED_LIKE_KEYWORD_MARK, paramName);
+        if (parameter.containsKey(mapKey) && Objects.equals(parameter.get(mapKey), true)) {
+            return;
+        }
+        if (this.cascade(field)) {
+            this.resolveCascadeObj(field, parameter);
+        } else {
+            Object param = parameter.get(paramName);
+            if (this.hasEscapeChar(param)) {
+                String paramStr = param.toString();
+                parameter.put(keys[2], String.format("%%%s%%", this.escapeChar(paramStr.substring(1, paramStr.length() - 1))));
+            }
+        }
+        parameter.put(mapKey, true);
+    }
+
+    @Override
+    public void transferSelf(String field, Map parameter) {
+        if (this.cascade(field)) {
+            this.resolveCascadeObj(field, parameter);
+            return;
+        }
+        Object param = parameter.get(field);
+        if (this.hasEscapeChar(param)) {
+            String paramStr = param.toString();
+            parameter.put(field, String.format("%%%s%%", this.escapeChar(paramStr.substring(1, paramStr.length() - 1))));
+        }
+    }
+
+    @Override
+    public void transferSplice(String field, Map parameter) {
+        if (this.cascade(field)) {
+            this.resolveCascadeObj(field, parameter);
+            return;
+        }
+        Object param = parameter.get(field);
+        if (this.hasEscapeChar(param)) {
+            parameter.put(field, this.escapeChar(param.toString()));
+        }
+    }
+
+    /**
+     * 处理级联属性
+     *
+     * @param field     级联字段名
+     * @param parameter 参数Map对象
+     */
+    private void resolveCascadeObj(String field, Map parameter) {
+        int index = field.indexOf(MYBATIS_PLUS_WRAPPER_SEPARATOR);
+        Object param = parameter.get(field.substring(0, index));
+        if (param == null) {
+            return;
+        }
+        this.resolveObj(field.substring(index + 1), param);
+    }
+
+}
+

src/main/java/com/diagbot/config/mybatisLike/MybatisLikeSqlInterceptor.java

@@ -0,0 +1,160 @@
+package com.diagbot.config.mybatisLike;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * @Description: mybatis/mybatis-plus模糊查询语句特殊字符转义拦截器
+ * @author: gaodm
+ * @time: 2020/11/2 16:04
+ */
+@Intercepts({ @Signature(type = Executor.class, method = "query", args = { MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class }) })
+@Slf4j
+public class MybatisLikeSqlInterceptor implements Interceptor {
+
+    /**
+     * SQL语句like
+     */
+    private final static String SQL_LIKE = " like ";
+
+    /**
+     * SQL语句占位符
+     */
+    private final static String SQL_PLACEHOLDER = "?";
+
+    /**
+     * SQL语句占位符分隔
+     */
+    private final static String SQL_PLACEHOLDER_REGEX = "\\?";
+
+    /**
+     * 所有的转义器
+     */
+    private static Map<Class, AbstractLikeSqlConverter> converterMap = new HashMap<>(4);
+
+    static {
+        converterMap.put(Map.class, new MapLikeSqlConverter());
+        converterMap.put(Object.class, new ObjectLikeSqlConverter());
+    }
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        Object[] args = invocation.getArgs();
+        MappedStatement statement = (MappedStatement) args[0];
+        Object parameterObject = args[1];
+        BoundSql boundSql = statement.getBoundSql(parameterObject);
+        String sql = boundSql.getSql();
+        this.transferLikeSql(sql, parameterObject, boundSql);
+        return invocation.proceed();
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties arg0) {
+
+    }
+
+    /**
+     * 修改包含like的SQL语句
+     *
+     * @param sql             SQL语句
+     * @param parameterObject 参数对象
+     * @param boundSql        绑定SQL对象
+     */
+    private void transferLikeSql(String sql, Object parameterObject, BoundSql boundSql) {
+        if (!isEscape(sql)) {
+            return;
+        }
+        sql = sql.replaceAll(" {2}", " ");
+        // 获取关键字的个数（去重）
+        Set<String> fields = this.getKeyFields(sql, boundSql);
+        if (fields == null) {
+            return;
+        }
+        // 此处可以增强,不止是支持Map对象,Map对象仅用于传入的条件为Map或者使用@Param传入的对象被Mybatis转为的Map
+        AbstractLikeSqlConverter converter;
+        // 对关键字进行特殊字符“清洗”，如果有特殊字符的，在特殊字符前添加转义字符（\）
+        if (parameterObject instanceof Map) {
+            converter = converterMap.get(Map.class);
+        } else {
+            converter = converterMap.get(Object.class);
+        }
+        converter.convert(sql, fields, parameterObject);
+    }
+
+    /**
+     * 是否需要转义
+     *
+     * @param sql SQL语句
+     * @return true/false
+     */
+    private boolean isEscape(String sql) {
+        return this.hasLike(sql) && this.hasPlaceholder(sql);
+    }
+
+    /**
+     * 判断SQL语句中是否含有like关键字
+     *
+     * @param str SQL语句
+     * @return true/false
+     */
+    private boolean hasLike(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        return str.toLowerCase().contains(SQL_LIKE);
+    }
+
+    /**
+     * 判断SQL语句中是否包含SQL占位符
+     *
+     * @param str SQL语句
+     * @return true/false
+     */
+    private boolean hasPlaceholder(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        return str.toLowerCase().contains(SQL_PLACEHOLDER);
+    }
+
+    /**
+     * 获取需要替换的所有字段集合
+     *
+     * @param sql      完整SQL语句
+     * @param boundSql 绑定的SQL对象
+     * @return 字段集合列表
+     */
+    private Set<String> getKeyFields(String sql, BoundSql boundSql) {
+        String[] params = sql.split(SQL_PLACEHOLDER_REGEX);
+        Set<String> fields = new HashSet<>();
+        for (int i = 0; i < params.length; i++) {
+            if (this.hasLike(params[i])) {
+                String field = boundSql.getParameterMappings().get(i).getProperty();
+                fields.add(field);
+            }
+        }
+        return fields;
+    }
+
+}

src/main/java/com/diagbot/config/mybatisLike/ObjectLikeSqlConverter.java

@@ -0,0 +1,28 @@
+package com.diagbot.config.mybatisLike;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @Description: 通用参数的转换器
+ * @author: gaodm
+ * @time: 2020/11/2 16:06
+ */
+@Slf4j
+public class ObjectLikeSqlConverter extends AbstractLikeSqlConverter<Object> {
+
+    @Override
+    public void transferWrapper(String field, Object parameter) {
+        // 尚未发现这种情况
+    }
+
+    @Override
+    public void transferSelf(String field, Object parameter) {
+        // 尚未发现这种情况
+    }
+
+    @Override
+    public void transferSplice(String field, Object parameter) {
+        this.resolveObj(field, parameter);
+    }
+
+}

src/main/java/com/diagbot/facade/LogTestFacade.java

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.CdssLogUtil;
-import com.diagbot.util.StringUtil;
 import com.diagbot.vo.LogTestVO;
 import org.springframework.stereotype.Component;
 
@@ -15,23 +14,33 @@ import org.springframework.stereotype.Component;
 @Component
 public class LogTestFacade {
     public Boolean logTest(LogTestVO logTestVO) {
-        CdssLogUtil.addBizHospitalId(logTestVO.getHospitalId());
-        if (StringUtil.isNotBlank(logTestVO.getPatientId())) {
-            CdssLogUtil.addBizPatientId(logTestVO.getPatientId());
-        }
-        if (StringUtil.isNotBlank(logTestVO.getSubHospitalName())) {
-            CdssLogUtil.addBizSubHospitalName(logTestVO.getSubHospitalName());
-        }
-        if (StringUtil.isNotBlank(logTestVO.getSubHospitalCode())) {
-            CdssLogUtil.addBizSubHospitalCode(logTestVO.getSubHospitalCode());
-        }
         if (logTestVO.getType().equals(1)) {
             //抛错
+            //测试数据
+            //            logTestVO.setHospitalId(-1L);
+            //            logTestVO.setSceneName("sceneName");
+            //            logTestVO.setPatientId("patientId");
+            //            logTestVO.setSubHospitalName("subHospitalName");
+            //            logTestVO.setSubHospitalCode("subHospitalCode");
+
+            //paramLog(logTestVO);
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         } else if (logTestVO.getType().equals(2)) {
+            //测试数据
+            //            logTestVO.setHospitalId(-1L);
+            //            logTestVO.setSceneName("sceneName");
+            //            logTestVO.setPatientId("patientId");
+            //            logTestVO.setSubHospitalName("subHospitalName");
+            //            logTestVO.setSubHospitalCode("subHospitalCode");
             paramLog(logTestVO);
         } else {
             /** DO NOTHING*/
+            //测试数据
+            //            logTestVO.setHospitalId(-1L);
+            //            logTestVO.setSceneName("sceneName");
+            //            logTestVO.setPatientId("patientId");
+            //            logTestVO.setSubHospitalName("subHospitalName");
+            //            logTestVO.setSubHospitalCode("subHospitalCode");
         }
         return true;
     }
@@ -51,8 +60,10 @@ public class LogTestFacade {
         CdssLogUtil.addBizReq(logTestVO);
         //出参设置
         CdssLogUtil.addBizResp(logTestVOResp);
-        CdssLogUtil.addBizResp(logTestVOResp);
-        CdssLogUtil.addBizResp(logTestVOResp);
+        LogTestVO logTestVORespE = new LogTestVO();
+        logTestVORespE.setMsg("返回参数最后");
+        logTestVORespE.setType(9);
+        CdssLogUtil.addBizResp(logTestVORespE);
         return logTestVOResp;
     }
 }

src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -1040,7 +1040,15 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             return list;
         }
         IndexByApprovalVO indexByApprovalVO = new IndexByApprovalVO();
-        indexByApprovalVO.setApprovalList(list.stream().map(MappingConfigWrapper::getApproval).collect(Collectors.toList()));
+        indexByApprovalVO.setApprovalList(list.stream()
+                .filter(i -> StringUtil.isNotBlank(i.getApproval()))
+                .map(MappingConfigWrapper::getApproval)
+                .distinct()
+                .collect(Collectors.toList()));
+
+        if(ListUtil.isEmpty(indexByApprovalVO.getApprovalList())){
+            return list;
+        }
 
         RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.indexByApproval(indexByApprovalVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");

src/main/java/com/diagbot/util/CdssLogUtil.java

@@ -4,6 +4,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TranLog;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.vo.CdssLogBaseVO;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.springframework.validation.BindException;
@@ -26,10 +27,10 @@ public class CdssLogUtil {
 
     private final static String CDSS_REQ = "Cdss_Req";
     private final static String CDSS_RESP = "Cdss_Resp";
-    private final static String CDSS_HOSPITAL_ID = "Cdss_Hospital_Id";
-    private final static String CDSS_SUB_HOSPITAL_NAME = "Cdss_Sub_Hospital_Name";
-    private final static String CDSS_SUB_HOSPITAL_CODE = "Cdss_Sub_Hospital_Code";
-    private final static String CDSS_PATIENT_ID = "Cdss_Patient_Id";
+    //    private final static String CDSS_HOSPITAL_ID = "Cdss_Hospital_Id";
+    //    private final static String CDSS_SUB_HOSPITAL_NAME = "Cdss_Sub_Hospital_Name";
+    //    private final static String CDSS_SUB_HOSPITAL_CODE = "Cdss_Sub_Hospital_Code";
+    //    private final static String CDSS_PATIENT_ID = "Cdss_Patient_Id";
     private final static String CDSS_LOG_SP = "→";
 
     /**
@@ -42,14 +43,10 @@ public class CdssLogUtil {
         //请求的参数
         Object[] args = joinPoint.getArgs();
         //请求的参数
-        String params = "";
         for (Object o : args) {
-            params += FastJsonUtils.getBeanToJson(o);
+            addBizReq(o);
             break;
         }
-        if (!StringUtil.isEmpty(params)) {
-            tranLog.setParams(params);
-        }
         return tranLog;
     }
 
@@ -62,6 +59,23 @@ public class CdssLogUtil {
      * @throws Throwable
      */
     public static TranLog tranLogRespAspect(Object proceed, TranLog tranLog, long start, ProceedingJoinPoint joinPoint) throws Throwable {
+        //请求的参数
+        Object[] args = joinPoint.getArgs();
+        for (Object o : args) {
+            //第一个参数继承基类
+            if (o instanceof CdssLogBaseVO) {
+                CdssLogBaseVO p = (CdssLogBaseVO) o;
+                tranLog.setPatientId(p.getPatientId());
+                tranLog.setHospitalId(p.getHospitalId());
+                tranLog.setSubHospitalCode(p.getSubHospitalCode());
+                tranLog.setSubHospitalName(p.getSubHospitalName());
+                if (StringUtil.isNotBlank(p.getSceneName())) {
+                    tranLog.setSceneName(p.getSceneName());
+                }
+            }
+            break;
+        }
+        //出参日志记录
         String result = "";
         result = FastJsonUtils.getBeanToJson(proceed);
         tranLog.setSuccessFlag(1);
@@ -93,14 +107,20 @@ public class CdssLogUtil {
         //请求的参数
         Object[] args = joinPoint.getArgs();
         //请求的参数
-        String params = "";
         for (Object o : args) {
-            params += FastJsonUtils.getBeanToJson(o);
+            //第一个参数继承基类
+            if (o instanceof CdssLogBaseVO) {
+                CdssLogBaseVO p = (CdssLogBaseVO) o;
+                tranLog.setPatientId(p.getPatientId());
+                tranLog.setHospitalId(p.getHospitalId());
+                tranLog.setSubHospitalCode(p.getSubHospitalCode());
+                tranLog.setSubHospitalName(p.getSubHospitalName());
+                if (StringUtil.isNotBlank(p.getSceneName())) {
+                    tranLog.setSceneName(p.getSceneName());
+                }
+            }
             break;
         }
-        if (!StringUtil.isEmpty(params)) {
-            tranLog.setParams(params);
-        }
         //出参设置
         String result = "";
         result = FastJsonUtils.getBeanToJson(handleException((Exception) ex));
@@ -188,7 +208,7 @@ public class CdssLogUtil {
         String resp = response.getHeader(CDSS_RESP);
         if (StringUtil.isNotBlank(resp)) {
             if (StringUtil.isNotBlank(result)) {
-                result += CDSS_LOG_SP + resp;
+                result = resp + CDSS_LOG_SP + result;
             } else {
                 result = resp;
             }
@@ -196,34 +216,32 @@ public class CdssLogUtil {
         }
         tranLog.setResult(result);
 
-        //todo 个性化处理
-
-        //设置医院id
-        Long hospitalId = tranLog.getHospitalId();
-        String hosId = response.getHeader(CDSS_HOSPITAL_ID);
-        if (StringUtil.isNotBlank(hosId)) {
-            hospitalId = Long.valueOf(hosId);
-            response.setHeader(CDSS_HOSPITAL_ID, "");
-        }
-        tranLog.setHospitalId(hospitalId);
-
-        //设置子医院名称
-        String subHospitalName = tranLog.getSubHospitalName();
-        String subHosName = response.getHeader(CDSS_SUB_HOSPITAL_NAME);
-        if (StringUtil.isNotBlank(subHosName)) {
-            subHospitalName = subHosName;
-            response.setHeader(CDSS_SUB_HOSPITAL_NAME, "");
-        }
-        tranLog.setSubHospitalName(subHospitalName);
-
-        //设置子医院编码
-        String subHospitalCode = tranLog.getSubHospitalCode();
-        String subHosCode = response.getHeader(CDSS_SUB_HOSPITAL_CODE);
-        if (StringUtil.isNotBlank(subHosCode)) {
-            subHospitalCode = subHosCode;
-            response.setHeader(CDSS_SUB_HOSPITAL_CODE, "");
-        }
-        tranLog.setSubHospitalCode(subHospitalCode);
+        //        //设置医院id
+        //        Long hospitalId = tranLog.getHospitalId();
+        //        String hosId = response.getHeader(CDSS_HOSPITAL_ID);
+        //        if (StringUtil.isNotBlank(hosId)) {
+        //            hospitalId = Long.valueOf(hosId);
+        //            response.setHeader(CDSS_HOSPITAL_ID, "");
+        //        }
+        //        tranLog.setHospitalId(hospitalId);
+        //
+        //        //设置子医院名称
+        //        String subHospitalName = tranLog.getSubHospitalName();
+        //        String subHosName = response.getHeader(CDSS_SUB_HOSPITAL_NAME);
+        //        if (StringUtil.isNotBlank(subHosName)) {
+        //            subHospitalName = subHosName;
+        //            response.setHeader(CDSS_SUB_HOSPITAL_NAME, "");
+        //        }
+        //        tranLog.setSubHospitalName(subHospitalName);
+        //
+        //        //设置子医院编码
+        //        String subHospitalCode = tranLog.getSubHospitalCode();
+        //        String subHosCode = response.getHeader(CDSS_SUB_HOSPITAL_CODE);
+        //        if (StringUtil.isNotBlank(subHosCode)) {
+        //            subHospitalCode = subHosCode;
+        //            response.setHeader(CDSS_SUB_HOSPITAL_CODE, "");
+        //        }
+        //        tranLog.setSubHospitalCode(subHospitalCode);
     }
 
 
@@ -245,41 +263,41 @@ public class CdssLogUtil {
         handleRespHeaderMap(CDSS_RESP, o);
     }
 
-    /**
-     * 设置医院id
-     *
-     * @param o
-     */
-    public static void addBizHospitalId(Object o) {
-        handleRespHeaderMap(CDSS_HOSPITAL_ID, o);
-    }
-
-    /**
-     * 设置子医院编码
-     *
-     * @param o
-     */
-    public static void addBizSubHospitalName(Object o) {
-        handleRespHeaderMap(CDSS_SUB_HOSPITAL_NAME, o);
-    }
-
-    /**
-     * 设置子医院名称
-     *
-     * @param o
-     */
-    public static void addBizSubHospitalCode(Object o) {
-        handleRespHeaderMap(CDSS_SUB_HOSPITAL_CODE, o);
-    }
-
-    /**
-     * 设置病人标识
-     *
-     * @param o
-     */
-    public static void addBizPatientId(Object o) {
-        handleRespHeaderMap(CDSS_PATIENT_ID, o);
-    }
+    //    /**
+    //     * 设置医院id
+    //     *
+    //     * @param o
+    //     */
+    //    public static void addBizHospitalId(Object o) {
+    //        handleRespHeaderMap(CDSS_HOSPITAL_ID, o);
+    //    }
+    //
+    //    /**
+    //     * 设置子医院编码
+    //     *
+    //     * @param o
+    //     */
+    //    public static void addBizSubHospitalName(Object o) {
+    //        handleRespHeaderMap(CDSS_SUB_HOSPITAL_NAME, o);
+    //    }
+    //
+    //    /**
+    //     * 设置子医院名称
+    //     *
+    //     * @param o
+    //     */
+    //    public static void addBizSubHospitalCode(Object o) {
+    //        handleRespHeaderMap(CDSS_SUB_HOSPITAL_CODE, o);
+    //    }
+    //
+    //    /**
+    //     * 设置病人标识
+    //     *
+    //     * @param o
+    //     */
+    //    public static void addBizPatientId(Object o) {
+    //        handleRespHeaderMap(CDSS_PATIENT_ID, o);
+    //    }
 
 
     private static void handleRespHeaderMap(String key, Object o) {

src/main/java/com/diagbot/vo/CdssLogBaseVO.java

@@ -0,0 +1,41 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2021/12/1 14:22
+ */
+@Getter
+@Setter
+public class CdssLogBaseVO {
+    /**
+     * 病人唯一标识（病人id、病历号等）
+     */
+    private String patientId;
+
+    /**
+     * 医院id
+     */
+    @NotNull(message = "请输入医院id")
+    private Long hospitalId;
+
+    /**
+     * 子医院编码
+     */
+    private String subHospitalCode;
+
+    /**
+     * 子医院名称
+     */
+    private String subHospitalName;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+}

src/main/java/com/diagbot/vo/LogTestVO.java

@@ -12,24 +12,9 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class LogTestVO {
+public class LogTestVO extends CdssLogBaseVO {
     private String msg;
     //0:正常，1:抛错，2:子方法放入参数
     @NotNull
     private Integer type = 0;
-    @NotNull(message = "请输入医院id")
-    private Long hospitalId;
-    /**
-     * 病人唯一标识（病人id、病历号等）
-     */
-    private String patientId;
-    /**
-     * 子医院编码
-     */
-    private String subHospitalCode;
-
-    /**
-     * 子医院名称
-     */
-    private String subHospitalName;
 }

src/main/resources/application-local.yml

@@ -40,6 +40,11 @@ feign:
     enabled: true
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
+  client:
+    config:
+      default:
+        connectTimeout: 10000  # 连接超时时间
+        readTimeout: 3600000     # 读超时时间设置
 
 management:
   endpoints:

src/main/resources/mapper/TranLogMapper.xml

@@ -54,6 +54,6 @@
             AND a.success_flag = #{tranLogPageVO.successFlag}
         </if>
         ORDER BY
-        a.gmt_modified
+        a.gmt_modified DESC
     </select>
 </mapper>