操作日志操作人记录优化

Signed-off-by: TanYibin <5491541@qq.com>

操作日志操作人记录优化
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 9a1f3ee5
Showing 8 changed files with 33 additions and 25 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/acs/controller/AcsController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/TestController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperatorIdGetServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -43,14 +43,12 @@ public class AcsController extends HuahengBaseController {
 //    @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
     @ResponseBody
     @PostMapping(value = "/testTokenCheck")
-    @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
-    operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
     public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
 //        String audience = ApiAuthentication.getInstance().getAudience();
 //        String url = "http://localhost:8080/wms/api/wms/acs/testTokenCheck";
 //        String body = OkHttpUtils.sendPostByJsonStr(url, JSON.toJSONString(paramMap));
 //        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_AGV_TASK_ASSIGN);
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         return Result.ok();
     }
@@ -52,8 +52,7 @@ public class TestController extends HuahengBaseController {
 //    @AutoLog(value = "TestController-testRedis")
     @ResponseBody
     @PostMapping(value = "/test/testRedis")
-    @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
-        operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
     public Result<?> testRedis(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws InterruptedException {
         Result result = new Result<>();
         String testString = "我是testString1";
@@ -71,7 +70,6 @@ public class TestController extends HuahengBaseController {
         Map<String, ReceiptHeader> value = redisUtil.getAndSet(key, receiptHeaderMap, new TypeReference<Map<String, ReceiptHeader>>() {}, 10);
         Long rxpireTime = redisUtil.getExpire(key);
         log.info("redisUtil.getAndSet {} -> {} rxpireTime -> {}", key, JSON.toJSONString(value), rxpireTime);
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
 //        result.setSuccess(false);
 //        LogRecordContext.putVariable("isSuccess", result.isSuccess());
+package org.jeecg.modules.wms.monitor.operation.service.impl;
+
+import org.jeecg.utils.HuahengJwtUtil;
+import org.springframework.stereotype.Component;
+
+import cn.monitor4all.logRecord.service.IOperatorIdGetService;
+
+@Component
+public class OperatorIdGetServiceImpl implements IOperatorIdGetService {
+
+    @Override
+    public String getOperatorId() throws Exception {
+        return HuahengJwtUtil.getCurrentOperator();
+    }
+
+}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
 import org.springframework.beans.factory.annotation.Autowired;
 import java.io.Serializable;
 import java.util.Collection;
@@ -29,7 +30,7 @@ public interface IReceiptContainerHeaderService extends IService&lt;ReceiptContaine
     ReceiptContainerHeader getUnCompleteReceiptContainerByCode(String containerCode, String warehouseCode);
-    public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
+    public Result<TaskHeader> createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
     boolean updateStatusById(int status, int id);
@@ -111,13 +111,12 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "入库表主表-添加", notes = "入库表主表-添加")
     @PostMapping(value = "/add")
     @RequiresPermissions("receiptHeader:add")
-    public Result<String> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
+    public Result<ReceiptHeader> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         if (StringUtils.isNotEmpty(warehouseCode)) {
             receiptHeader.setWarehouseCode(warehouseCode);
         }
-        Result result = receiptHeaderService.saveReceiptHeader(receiptHeader);
-        return result;
+        return receiptHeaderService.saveReceiptHeader(receiptHeader);
     }
     /**
@@ -225,9 +224,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "入库单详情-添加", notes = "入库单详情-添加")
     @PostMapping(value = "/addReceiptDetail")
     @RequiresPermissions("receiptDetail:add")
-    public Result<String> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
-        Result result = receiptDetailService.saveReceiptDetail(receiptDetail);
-        return result;
+    public Result<?> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
+        return receiptDetailService.saveReceiptDetail(receiptDetail);
     }
     /**
@@ -370,9 +368,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @ApiOperation(value = "回传入库单", notes = "回传入库单")
     @RequiresPermissions("receiptHeader:back")
     @RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
-        Result result = erpService.backReceipt(receiptHeader);
-        return result;
+    public Result<?> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
+        return erpService.backReceipt(receiptHeader);
     }
     @AutoLog(value = "PDA入库-快速入库")
@@ -50,7 +50,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
         if (receiptHeader == null) {
@@ -91,7 +91,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         // 操作日志收集
         List<ReceiptDetail> receiptDetailList = new ArrayList<ReceiptDetail>();
         receiptDetailList.add(receiptDetail);
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptDetailList));
         return Result.OK("添加成功！");
     }
@@ -64,12 +64,14 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
      */
     @Override
     @Transactional
-    public boolean delMain(String id,String reason) {
+    @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单删除'",
+        msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
+    public boolean delMain(String id, String reason) {
         ReceiptHeader receiptHeader = getById(id);
         if (receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
             throw new ServiceException("不能删除非新建状态单据");
         }
-        receiptHeaderHistoryService.saveById(id,reason);
+        receiptHeaderHistoryService.saveById(id, reason);
         boolean success = receiptDetailMapper.deleteByMainId(id);
         if (!success) {
@@ -95,7 +97,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     @Override
     @Transactional
     @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单生成'", 
-    msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", operatorId = "#username", recordReturnValue = true)
+    msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
     public Result<ReceiptHeader> saveReceiptHeader(ReceiptHeader receiptHeader) {
         LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getType()).eq(ReceiptType::getWarehouseCode, receiptHeader.getWarehouseCode());
@@ -114,7 +116,6 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         if (!success) {
             return Result.OK("添加失败！");
         }
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         return Result.OK("添加成功！", receiptHeader);
     }
@@ -88,8 +88,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
      */
     @Override
     @Transactional(rollbackFor = ServiceException.class)
-    @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''",
-        operatorId = "#username", recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
     public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
         boolean result = false;
         if (receiveList == null || receiveList.size() == 0) {
@@ -237,7 +236,6 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
                 throw new ServiceException("保存入库组盘详情失败");
             }
         }
-        LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
         LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
         return Result.OK("收货成功", receiptContainerHeader);
     }