!236 add resp body log

Merge pull request !236 from Admin/LTL_20220314

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;
 import net.lab1024.smartadmin.common.domain.ResponseDTO;
+import net.lab1024.smartadmin.common.heartbeat.IpUtil;
 import net.lab1024.smartadmin.common.heartbeat.StringUtil;
 import net.lab1024.smartadmin.constant.SwaggerTagConst;
 import net.lab1024.smartadmin.module.system.royalcanin.coupon.*;
@@ -283,6 +284,8 @@ public class TransitionController {
         royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg")== null ?"":jsonObject.getString("msg"));
         royalcaninOperateLogEntity.setParams(params);
         royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
+        royalcaninOperateLogEntity.setData(jsonObject.getString("data") == null?"" : jsonObject.getString("data"));
+        royalcaninOperateLogEntity.setAccountIp(IpUtil.getLocalIP() == null ?"":IpUtil.getLocalIP());
             royalcaninOperateLogService.add(royalcaninOperateLogEntity);
         return ResponseDTO.succ();
     }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/domain/RoyalcaninOperateLogEntity.java

@@ -31,4 +31,8 @@ public class RoyalcaninOperateLogEntity {
     private String code;
 
     private String msg;
+
+    private String accountIp;
+
+    private String data;
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java

@@ -2,11 +2,15 @@ package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;
 import net.lab1024.smartadmin.common.constant.ResponseCodeConst;
 import net.lab1024.smartadmin.common.domain.ResponseDTO;
+import net.lab1024.smartadmin.common.heartbeat.IpUtil;
 import net.lab1024.smartadmin.common.heartbeat.StringUtil;
 import net.lab1024.smartadmin.constant.SwaggerTagConst;
 import net.lab1024.smartadmin.module.system.royalcanin.domain.RoyalcaninOperateLogEntity;
@@ -20,6 +24,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service.
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
 import net.lab1024.smartadmin.util.SmartJWTUtil;
+import net.lab1024.smartadmin.util.SmartStringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -124,7 +129,7 @@ public class GoodController {
             long acceptTime = System.currentTimeMillis() ;
             long elapsedTime = acceptTime - startTime;
             //记录服务响应时间
-            addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
+            addOperatreFullData("royalcanin/h5/product/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL",result);
             return result;
         }catch (Exception e){
             System.out.println(e.getMessage());
@@ -143,7 +148,7 @@ public class GoodController {
         long acceptTime = System.currentTimeMillis() ;
         long elapsedTime = acceptTime - startTime;
         //记录服务响应时间
-        addOperatreFullData("royalcanin/h5/productMaster/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
+        addOperatreFullData("royalcanin/h5/productMaster/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL",result);
         return result;
     }
 
@@ -158,7 +163,7 @@ public class GoodController {
          goodService.remoteGetProductSearchTagData();
     }
 
-    public ResponseDTO<String> addOperatreFullData(String type, String params, Long startTime, Long elapsedTime, Long acceptTime,String code,String msg)throws Exception{
+    public ResponseDTO<String> addOperatreFullData(String type, String params, Long startTime, Long elapsedTime, Long acceptTime,String code,String msg,String result)throws Exception{
         SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         RoyalcaninOperateLogEntity royalcaninOperateLogEntity = new RoyalcaninOperateLogEntity();
         royalcaninOperateLogEntity.setElapsedTime(StringUtil.toString(elapsedTime));
@@ -168,6 +173,14 @@ public class GoodController {
         royalcaninOperateLogEntity.setMsg(msg);
         royalcaninOperateLogEntity.setParams(params);
         royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
+        String data = "";
+        if(SmartStringUtil.isNotBlank(result)){
+            JSONObject jsonObj = JSONObject.parseArray(result).getJSONObject(0);
+            jsonObj.remove("productAttachmentList");
+            data = jsonObj.toString();
+        }
+        royalcaninOperateLogEntity.setData(data);
+        royalcaninOperateLogEntity.setAccountIp(IpUtil.getLocalIP() == null ?"":IpUtil.getLocalIP());
         royalcaninOperateLogService.add(royalcaninOperateLogEntity);
         return ResponseDTO.succ();
     }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java

@@ -3,6 +3,7 @@ package net.lab1024.smartadmin.module.system.royalcanin.good.service;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.lab1024.smartadmin.common.domain.ResponseDTO;
+import net.lab1024.smartadmin.common.heartbeat.IpUtil;
 import net.lab1024.smartadmin.common.heartbeat.StringUtil;
 import net.lab1024.smartadmin.module.system.royalcanin.CouponService;
 import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponCancelEntity;
@@ -293,6 +294,8 @@ public class OrderService {
         royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg")== null ?"":jsonObject.getString("msg"));
         royalcaninOperateLogEntity.setParams(params);
         royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
+        royalcaninOperateLogEntity.setData(jsonObject.getString("data") == null?"" : jsonObject.getString("data"));
+        royalcaninOperateLogEntity.setAccountIp(IpUtil.getLocalIP() == null ?"":IpUtil.getLocalIP());
         royalcaninOperateLogService.add(royalcaninOperateLogEntity);
         return ResponseDTO.succ();