xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 02:36:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugger

Browse Source
This commit is contained in:
Carl 2021-12-28 16:38:04 +08:00
parent 7416626cf3
commit 5830f3a590
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java
View File

@ -18,7 +18,6 @@ public class CouponConfigService {
public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);
MapRemoveNullUtil.removeNullEntry(paramMap);
// net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
return SmartHttpUtil.sendPostForm(url+"get",paramMap,null);
}

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

@ -205,7 +205,6 @@ public class TransitionController {
public String transferOrderMaster(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
String result = "null";
long startTime = System.currentTimeMillis();
switch (type)
{
case "query":
@ -215,10 +214,6 @@ public class TransitionController {
result = orderService.addOrSave(objectMapper.convertValue(object, AddOrSaveEntity.class));
break;
}
long acceptTime = System.currentTimeMillis() ;
long elapsedTime = acceptTime - startTime;
//记录服务响应时间
addOperatreFullData(type,object.toString(),result, startTime,elapsedTime,acceptTime,request);
return result;
}
@ -235,8 +230,8 @@ public class TransitionController {
royalcaninOperateLogEntity.setElapsedTime(StringUtil.toString(elapsedTime));
royalcaninOperateLogEntity.setStartTime(dateformat.format(startTime));
royalcaninOperateLogEntity.setMethod(request.getServletPath()+"?"+type);
royalcaninOperateLogEntity.setCode(jsonObject.getString("code"));
royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg"));
royalcaninOperateLogEntity.setCode(jsonObject.getString("code") == null ?"":jsonObject.getString("code"));
royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg")== null ?"":jsonObject.getString("msg"));
royalcaninOperateLogEntity.setParams(params);
royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
royalcaninOperateLogService.add(royalcaninOperateLogEntity);

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

@ -13,6 +13,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderCouponEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
import net.lab1024.smartadmin.util.AESUtil;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil;
import net.sf.json.JSONArray;
@ -123,14 +124,16 @@ public class OrderService {
public String query(QueryEntity queryEntity)throws Exception{
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(queryEntity);
net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
MapRemoveNullUtil.removeNullEntry(paramMap);
long startTime = System.currentTimeMillis();
String result =SmartHttpUtil.httpPostRaw(url+"query",jsonObject.toString(),null,"utf-8");
String result =SmartHttpUtil.sendPostForm(url+"query",paramMap,null);
long acceptTime = System.currentTimeMillis() ;
long elapsedTime = acceptTime - startTime;
JSONObject jsonObject = JSONObject.parseObject(result);
String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
//记录服务响应时间
addOperatreFullData(url+"query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);
return result;
addOperatreFullData(url+"addOrSave",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);
return afterDecodeResult;
}
public ResponseDTO<String> addOperatreFullData(String type, String params, String result, Long startTime, Long elapsedTime, Long acceptTime){
@ -140,8 +143,8 @@ public class OrderService {
royalcaninOperateLogEntity.setElapsedTime(StringUtil.toString(elapsedTime));
royalcaninOperateLogEntity.setStartTime(dateformat.format(startTime));
royalcaninOperateLogEntity.setMethod(type);
royalcaninOperateLogEntity.setCode(jsonObject.getString("code"));
royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg"));
royalcaninOperateLogEntity.setCode(jsonObject.getString("code") == null ?"":jsonObject.getString("code"));
royalcaninOperateLogEntity.setMsg(jsonObject.getString("msg")== null ?"":jsonObject.getString("msg"));
royalcaninOperateLogEntity.setParams(params);
royalcaninOperateLogEntity.setAcceptTime(dateformat.format(acceptTime));
royalcaninOperateLogService.add(royalcaninOperateLogEntity);