统计基础类调整

common/src/main/java/com/diagbot/util/AopUtil.java

@@ -53,7 +53,7 @@ public class AopUtil {
         Object[] args = joinPoint.getArgs();
         String params = "";
         for (Object o : args) {
-            params += GsonUtil.toJson(o);
+            params += FastJsonUtils.getBeanToJson(o);
         }
         if (!StringUtil.isEmpty(params)) {
             sysLog.setParams(params);
@@ -94,7 +94,7 @@ public class AopUtil {
         Object[] args = joinPoint.getArgs();
         String params = "";
         for (Object o : args) {
-            params += GsonUtil.toJson(o);
+            params += FastJsonUtils.getBeanToJson(o);
             break;
         }
         if (!StringUtil.isEmpty(params)) {
@@ -127,7 +127,7 @@ public class AopUtil {
         }
         //出参设置
         String result = "";
-        result = GsonUtil.toJson(keys);
+        result = FastJsonUtils.getBeanToJson(keys);
         if (!StringUtil.isEmpty(result)) {
             biRecord.setResult(result);
         }
@@ -150,7 +150,7 @@ public class AopUtil {
         }
         //出参设置
         String result = "";
-        result = GsonUtil.toJson(handleException((Exception) ex));
+        result = FastJsonUtils.getBeanToJson(handleException((Exception) ex));
         biRecord.setResult(result);
         biRecord.setSuccessFlag(0);
         return biRecord;
@@ -177,9 +177,9 @@ public class AopUtil {
             rs.code = respDTO.code;
             rs.msg = respDTO.msg;
             rs.data = new Object();
-            result = GsonUtil.toJson(rs);
+            result = FastJsonUtils.getBeanToJson(rs);
         } else {
-            result = GsonUtil.toJson(keys);
+            result = FastJsonUtils.getBeanToJson(keys);
         }
         if (!StringUtil.isEmpty(result)) {
             biRecord.setResult(result);
@@ -203,7 +203,7 @@ public class AopUtil {
         }
         //出参设置
         String result = "";
-        result = GsonUtil.toJson(handleException((Exception) ex));
+        result = FastJsonUtils.getBeanToJson(handleException((Exception) ex));
         biRecord.setResult(result);
         biRecord.setSuccessFlag(0);
         return biRecord;
@@ -227,12 +227,17 @@ public class AopUtil {
             if (o instanceof BaseBiVO) {
                 BaseBiVO baseBiVO = (BaseBiVO) o;
                 if (StringUtil.isBlank(baseBiVO.getHospitalCode())) {
-                    return false;
+                    if (StringUtil.isNotBlank(baseBiVO.getHosCode())) {
+                        BeanUtil.copyProperties(baseBiVO, biRecord);
+                        biRecord.setHospitalCode(baseBiVO.getHosCode());
+                    } else {
+                        return false;
+                    }
                 } else {
                     BeanUtil.copyProperties(baseBiVO, biRecord);
                 }
             }
-            params += GsonUtil.toJson(o);
+            params += FastJsonUtils.getBeanToJson(o);
         }
         if (!StringUtil.isEmpty(params)) {
             biRecord.setParams(params);
@@ -274,7 +279,7 @@ public class AopUtil {
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
                 stringMap.put(fieldError.getField(), fieldError.getDefaultMessage());
             }
-            String msg = GsonUtil.toJson(stringMap);
+            String msg = FastJsonUtils.getBeanToJson(stringMap);
             resp.code = CommonErrorCode.PARAM_ERROR.getCode();
             resp.msg = msg;
             return resp;
@@ -285,7 +290,7 @@ public class AopUtil {
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
                 stringMap.put(fieldError.getField(), fieldError.getDefaultMessage());
             }
-            String msg = GsonUtil.toJson(stringMap);
+            String msg = FastJsonUtils.getBeanToJson(stringMap);
             resp.code = CommonErrorCode.PARAM_ERROR.getCode();
             resp.msg = msg;
             return resp;
@@ -294,7 +299,7 @@ public class AopUtil {
             MissingServletRequestParameterException ex = (MissingServletRequestParameterException) e;
             Map<String, String> stringMap = new HashMap<>();
             stringMap.put(ex.getParameterName(), "不能为null");
-            String msg = GsonUtil.toJson(stringMap);
+            String msg = FastJsonUtils.getBeanToJson(stringMap);
             resp.code = CommonErrorCode.PARAM_ERROR.getCode();
             resp.msg = msg;
             return resp;

common/src/main/java/com/diagbot/vo/BaseBiVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,4 +20,6 @@ public class BaseBiVO {
     private String deptCode;
     //医院患者编码
     private String patientCode;
+    //医院编码(不用传)
+    private String hosCode;
 }