wms / wms4_foshansanji · Commits

Commit d96586ecb7047a66fe2d6963c634b8dd388caabb

Authored by 谭毅彬
1 parent 9a1f3ee5
develop

操作日志 操作人记录优化 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
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
  View file @d96586e
... ... @@ -43,14 +43,12 @@ public class AcsController extends HuahengBaseController {
43 43 // @ApiLogger(apiName = "API接口第三方Token校验测试", from = "TEST")
44 44 @ResponseBody
45 45 @PostMapping(value = "/testTokenCheck")
46   - @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
47   - operatorId = "#username", recordReturnValue = true)
  46 + @OperationLog(bizType = "'物料追踪'", tag = "'入库完成'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
48 47 public Result<?> testTokenCheck(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
49 48 // String audience = ApiAuthentication.getInstance().getAudience();
50 49 // String url = "http://localhost:8080/wms/api/wms/acs/testTokenCheck";
51 50 // String body = OkHttpUtils.sendPostByJsonStr(url, JSON.toJSONString(paramMap));
52 51 // String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_AGV_TASK_ASSIGN);
53   - LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
54 52 return Result.ok();
55 53 }
56 54  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/controller/TestController.java
  View file @d96586e
... ... @@ -52,8 +52,7 @@ public class TestController extends HuahengBaseController {
52 52 // @AutoLog(value = "TestController-testRedis")
53 53 @ResponseBody
54 54 @PostMapping(value = "/test/testRedis")
55   - @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'",
56   - operatorId = "#username", recordReturnValue = true)
  55 + @OperationLog(bizType = "'物料追踪'", tag = "'分配库位'", bizId = "#paramMap.get('bizId')",extra = "#jsonString", msg = "'测试操作日志'", recordReturnValue = true)
57 56 public Result<?> testRedis(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws InterruptedException {
58 57 Result result = new Result<>();
59 58 String testString = "我是testString1";
... ... @@ -71,7 +70,6 @@ public class TestController extends HuahengBaseController {
71 70 Map<String, ReceiptHeader> value = redisUtil.getAndSet(key, receiptHeaderMap, new TypeReference<Map<String, ReceiptHeader>>() {}, 10);
72 71 Long rxpireTime = redisUtil.getExpire(key);
73 72 log.info("redisUtil.getAndSet {} -> {} rxpireTime -> {}", key, JSON.toJSONString(value), rxpireTime);
74   - LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
75 73 // result.setSuccess(false);
76 74 // LogRecordContext.putVariable("isSuccess", result.isSuccess());
77 75  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperatorIdGetServiceImpl.java 0 → 100644
  View file @d96586e
  1 +package org.jeecg.modules.wms.monitor.operation.service.impl;
  2 +
  3 +import org.jeecg.utils.HuahengJwtUtil;
  4 +import org.springframework.stereotype.Component;
  5 +
  6 +import cn.monitor4all.logRecord.service.IOperatorIdGetService;
  7 +
  8 +@Component
  9 +public class OperatorIdGetServiceImpl implements IOperatorIdGetService {
  10 +
  11 + @Override
  12 + public String getOperatorId() throws Exception {
  13 + return HuahengJwtUtil.getCurrentOperator();
  14 + }
  15 +
  16 +}
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/IReceiptContainerHeaderService.java
  View file @d96586e
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
4 4 import org.jeecg.common.api.vo.Result;
5 5 import org.jeecg.modules.wms.config.container.entity.Container;
6 6 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
  7 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
7 8 import org.springframework.beans.factory.annotation.Autowired;
8 9 import java.io.Serializable;
9 10 import java.util.Collection;
... ... @@ -29,7 +30,7 @@ public interface IReceiptContainerHeaderService extends IService&lt;ReceiptContaine
29 30  
30 31 ReceiptContainerHeader getUnCompleteReceiptContainerByCode(String containerCode, String warehouseCode);
31 32  
32   - public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
  33 + public Result<TaskHeader> createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode);
33 34  
34 35 boolean updateStatusById(int status, int id);
35 36  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @d96586e
... ... @@ -111,13 +111,12 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
111 111 @ApiOperation(value = "入库表主表-添加", notes = "入库表主表-添加")
112 112 @PostMapping(value = "/add")
113 113 @RequiresPermissions("receiptHeader:add")
114   - public Result<String> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
  114 + public Result<ReceiptHeader> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
115 115 String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
116 116 if (StringUtils.isNotEmpty(warehouseCode)) {
117 117 receiptHeader.setWarehouseCode(warehouseCode);
118 118 }
119   - Result result = receiptHeaderService.saveReceiptHeader(receiptHeader);
120   - return result;
  119 + return receiptHeaderService.saveReceiptHeader(receiptHeader);
121 120 }
122 121  
123 122 /**
... ... @@ -225,9 +224,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
225 224 @ApiOperation(value = "入库单详情-添加", notes = "入库单详情-添加")
226 225 @PostMapping(value = "/addReceiptDetail")
227 226 @RequiresPermissions("receiptDetail:add")
228   - public Result<String> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
229   - Result result = receiptDetailService.saveReceiptDetail(receiptDetail);
230   - return result;
  227 + public Result<?> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
  228 + return receiptDetailService.saveReceiptDetail(receiptDetail);
231 229 }
232 230  
233 231 /**
... ... @@ -370,9 +368,8 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
370 368 @ApiOperation(value = "回传入库单", notes = "回传入库单")
371 369 @RequiresPermissions("receiptHeader:back")
372 370 @RequestMapping(value = "/backErpReceipt", method = {RequestMethod.PUT, RequestMethod.POST})
373   - public Result<String> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
374   - Result result = erpService.backReceipt(receiptHeader);
375   - return result;
  371 + public Result<?> backErpReceipt(@RequestBody ReceiptHeader receiptHeader) {
  372 + return erpService.backReceipt(receiptHeader);
376 373 }
377 374  
378 375 @AutoLog(value = "PDA入库-快速入库")
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptDetailServiceImpl.java
  View file @d96586e
... ... @@ -50,7 +50,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
50 50 }
51 51  
52 52 @Override
53   - @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", operatorId = "#username", recordReturnValue = true)
  53 + @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库详情添加'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
54 54 public Result saveReceiptDetail(ReceiptDetail receiptDetail) {
55 55 ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
56 56 if (receiptHeader == null) {
... ... @@ -91,7 +91,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
91 91 // 操作日志收集
92 92 List<ReceiptDetail> receiptDetailList = new ArrayList<ReceiptDetail>();
93 93 receiptDetailList.add(receiptDetail);
94   - LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
95 94 LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptDetailList));
96 95 return Result.OK("添加成功！");
97 96 }
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
  View file @d96586e
... ... @@ -64,12 +64,14 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
64 64 */
65 65 @Override
66 66 @Transactional
67   - public boolean delMain(String id,String reason) {
  67 + @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单删除'",
  68 + msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
  69 + public boolean delMain(String id, String reason) {
68 70 ReceiptHeader receiptHeader = getById(id);
69 71 if (receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
70 72 throw new ServiceException("不能删除非新建状态单据");
71 73 }
72   - receiptHeaderHistoryService.saveById(id,reason);
  74 + receiptHeaderHistoryService.saveById(id, reason);
73 75 boolean success = receiptDetailMapper.deleteByMainId(id);
74 76  
75 77 if (!success) {
... ... @@ -95,7 +97,7 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
95 97 @Override
96 98 @Transactional
97 99 @OperationLog(bizId = "#receiptHeader.getCode()", bizType = "'入库单追踪'", tag = "'入库单生成'",
98   - msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", operatorId = "#username", recordReturnValue = true)
  100 + msg = "'上游单号：'+ #receiptHeader.getReferCode() + '，仓库编码：' + #receiptHeader.getWarehouseCode()", recordReturnValue = true)
99 101 public Result<ReceiptHeader> saveReceiptHeader(ReceiptHeader receiptHeader) {
100 102 LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
101 103 lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getType()).eq(ReceiptType::getWarehouseCode, receiptHeader.getWarehouseCode());
... ... @@ -114,7 +116,6 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
114 116 if (!success) {
115 117 return Result.OK("添加失败！");
116 118 }
117   - LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
118 119 return Result.OK("添加成功！", receiptHeader);
119 120 }
120 121  
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
  View file @d96586e
... ... @@ -88,8 +88,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
88 88 */
89 89 @Override
90 90 @Transactional(rollbackFor = ServiceException.class)
91   - @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''",
92   - operatorId = "#username", recordReturnValue = true)
  91 + @OperationLog(bizId = "''", bizType = "'物料追踪'", tag = "'入库组盘'", extra = "#extraJsonString", msg = "''", recordReturnValue = true)
93 92 public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
94 93 boolean result = false;
95 94 if (receiveList == null || receiveList.size() == 0) {
... ... @@ -237,7 +236,6 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; impl
237 236 throw new ServiceException("保存入库组盘详情失败");
238 237 }
239 238 }
240   - LogRecordContext.putVariable("username", HuahengJwtUtil.getCurrentOperator());
241 239 LogRecordContext.putVariable("extraJsonString", JSON.toJSONString(receiptContainerDetailList));
242 240 return Result.OK("收货成功", receiptContainerHeader);
243 241 }
... ...