diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/HttpResult.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/HttpResult.java new file mode 100644 index 00000000..3d9c0c26 --- /dev/null +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/HttpResult.java @@ -0,0 +1,10 @@ +package com.bonus.sgzb.base.api.domain; + +import lombok.Data; + +@Data +public class HttpResult { + private int code; + private int data; + private String msg; +} diff --git a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java index 6cd9ebea..31d1335f 100644 --- a/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java +++ b/sgzb-common/sgzb-common-log/src/main/java/com/bonus/sgzb/common/log/aspect/LogAspect.java @@ -4,6 +4,7 @@ import java.util.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.base.api.domain.HttpResult; import com.bonus.sgzb.base.api.domain.MachIneDto; import com.bonus.sgzb.base.api.domain.SavePutInfoDto; import com.bonus.sgzb.common.core.constant.SecurityConstants; @@ -16,6 +17,7 @@ import com.bonus.sgzb.system.api.RemoteUserService; import com.bonus.sgzb.system.api.domain.BmNumLogs; import com.bonus.sgzb.system.api.domain.BmStorageLog; import com.bonus.sgzb.system.api.model.LoginUser; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.aspectj.lang.JoinPoint; @@ -62,6 +64,8 @@ public class LogAspect @Autowired private RemoteUserService remoteUserService; + private static ObjectMapper objectMapper = new ObjectMapper(); + /** * 处理请求前执行 */ @@ -180,6 +184,10 @@ public class LogAspect if (StringUtils.isNotNull(jsonResult)) { bmStorageLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000)); + HttpResult msgCode = objectMapper.readValue(bmStorageLog.getJsonResult(), HttpResult.class); + bmStorageLog.setResultCode(msgCode.getCode()); + bmStorageLog.setStatus(msgCode.getCode()==200 ? 0 : 1); + bmStorageLog.setResultMsg(msgCode.getMsg()); } } @@ -274,9 +282,12 @@ public class LogAspect if (StringUtils.isEmpty(paramsMap) && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))) { if (joinPoint.getArgs()[0] instanceof SavePutInfoDto) { SavePutInfoDto savePutInfoDto = (SavePutInfoDto) joinPoint.getArgs()[0]; - for (MachIneDto machIneDto : savePutInfoDto.getMachIneDtoList()) { + for (MachIneDto machineDto : savePutInfoDto.getMachIneDtoList()) { BmStorageLog bmStorageLog = new BmStorageLog(); - bmStorageLog.setInNum(machIneDto.getNum().intValue()); + bmStorageLog.setTypeId(Integer.parseInt(machineDto.getTypeId())); + bmStorageLog.setTypeName(machineDto.getMaCode()); + bmStorageLog.setPreStoreNum(machineDto.getNum().intValue()); + bmStorageLog.setInNum(machineDto.getPutInStoreNum().intValue()); bmStorageLogList.add(bmStorageLog); } } diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml index 4f5a8547..81c57780 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml @@ -12,15 +12,17 @@ - - - - - - - - + + + + + + + + + + @@ -35,28 +37,28 @@