多仓支持提交（2）

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

多仓支持提交（2）
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent e4ec0bad
Showing 7 changed files with 39 additions and 42 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/customer/controller/CustomerController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/shipmentType/controller/ShipmentTypeController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeaderHistory/controller/ShipmentHeaderHistoryController.java
huaheng-wms-core/src/main/resources/log4jdbc.properties
@@ -34,9 +34,9 @@ public class LogRecordAspect {
         // 获取请求的request
         HttpServletRequest request = attributes.getRequest();
         String url = request.getRequestURL().toString();
-        String queryString = request.getQueryString();
-        log.info("[Controller start] {}{}[{}][{}]", url, StringUtils.isEmpty(queryString) ? "" : "?" + queryString, request.getMethod(),
-            ApiLoggerAspect.getIpAddr(request));
+        String className = point.getTarget().getClass().getName();
+        String methodName = point.getSignature().getName();
+        log.info("[Controller start] {}[{}][{}]\r\n{}.{}", url, request.getMethod(), ApiLoggerAspect.getIpAddr(request), className, methodName);
         // result的值就是被拦截方法的返回值
         Object result = point.proceed();
         long callTime = System.currentTimeMillis() - startTime;
@@ -72,8 +72,7 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
     @GetMapping(value = "/list")
     public Result<IPage<Customer>> queryPageList(Customer customer, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        customer.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, customer);
         QueryWrapper<Customer> queryWrapper = QueryGenerator.initQueryWrapper(customer, req.getParameterMap());
         Page<Customer> page = new Page<Customer>(pageNo, pageSize);
         IPage<Customer> pageList = customerService.page(page, queryWrapper);
@@ -90,10 +89,7 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
     @PostMapping(value = "/add")
     @RequiresPermissions("customer:add")
     public Result<String> add(@RequestBody Customer customer, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        if (StringUtils.isNotEmpty(warehouseCode)) {
-            customer.setWarehouseCode(warehouseCode);
-        }
+        HuahengJwtUtil.setWarehouseCode(req, customer);
         customerService.save(customer);
         return Result.OK("添加成功！");
     }
@@ -183,9 +179,8 @@ public class CustomerController extends JeecgController&lt;Customer, ICustomerServi
      */
     @RequestMapping(value = "/getCustomerList")
     public Result<?> getCustomerList(HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         LambdaQueryWrapper<Customer> customerLambdaQueryWrapper = Wrappers.lambdaQuery();
-        customerLambdaQueryWrapper.eq(Customer::getWarehouseCode, warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(customerLambdaQueryWrapper, Customer.class, req);
         List<Customer> customerList = customerService.list(customerLambdaQueryWrapper);
         return Result.OK(customerList);
     }
@@ -86,10 +86,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
     @RequiresPermissions("shipmentType:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ShipmentType shipmentType, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        if (StringUtils.isNotEmpty(warehouseCode)) {
-            shipmentType.setWarehouseCode(warehouseCode);
-        }
+        HuahengJwtUtil.setWarehouseCode(req, shipmentType);
         shipmentTypeService.save(shipmentType);
         return Result.OK("添加成功！");
     }
@@ -179,9 +176,8 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
      */
     @RequestMapping(value = "/getShipmentTypeList")
     public Result<?> getShipmentTypeList(HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         LambdaQueryWrapper<ShipmentType> shipmentTypeLambdaQueryWrapper = Wrappers.lambdaQuery();
-        shipmentTypeLambdaQueryWrapper.eq(ShipmentType::getWarehouseCode, warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(shipmentTypeLambdaQueryWrapper, ShipmentType.class, req);
         List<ShipmentType> shipmentTypeList = shipmentTypeService.list(shipmentTypeLambdaQueryWrapper);
         return Result.OK(shipmentTypeList);
     }
@@ -75,8 +75,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
     @GetMapping(value = "/list")
     public Result<IPage<InventoryHeader>> queryPageList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        inventoryHeader.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, inventoryHeader);
         QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
         Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
         IPage<InventoryHeader> pageList = inventoryHeaderService.page(page, queryWrapper);
@@ -92,10 +91,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
     @ApiOperation(value = "库存表-添加", notes = "库存表-添加")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody InventoryHeader inventoryHeader, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        if (StringUtils.isNotEmpty(warehouseCode)) {
-            inventoryHeader.setWarehouseCode(warehouseCode);
-        }
+        HuahengJwtUtil.setWarehouseCode(req, inventoryHeader);
         inventoryHeaderService.save(inventoryHeader);
         return Result.OK("添加成功！");
     }
@@ -184,8 +180,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
     @ApiOperation(value = "库存详情-添加", notes = "库存详情-添加")
     @PostMapping(value = "/addInventoryDetail")
     public Result<String> addInventoryDetail(@RequestBody InventoryDetail inventoryDetail, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        inventoryDetail.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, inventoryDetail);
         inventoryDetailService.save(inventoryDetail);
         return Result.OK("添加成功！");
     }
@@ -247,11 +242,11 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
         String selections = request.getParameter("selections");
         if (oConvertUtils.isNotEmpty(selections)) {
             List<String> selectionList = Arrays.asList(selections.split(","));
-            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+            exportList = pageList.stream().filter(item -> selectionList.contains(item.getId().toString())).collect(Collectors.toList());
         } else {
             exportList = pageList;
         }
-
+        
         // Step.3 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         mv.addObject(NormalExcelConstants.FILE_NAME, "库存详情"); // 此处设置的filename无效 ,前端会重更新设置一下
@@ -274,7 +269,6 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
     @GetMapping(value = "/freeList")
     public Result<IPage<InventoryHeader>> freeList(InventoryHeader inventoryHeader, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-
         QueryWrapper<InventoryHeader> queryWrapper = QueryGenerator.initQueryWrapper(inventoryHeader, req.getParameterMap());
         queryWrapper.eq("container_status", QuantityConstant.STATUS_CONTAINER_SOME);
         Page<InventoryHeader> page = new Page<InventoryHeader>(pageNo, pageSize);
@@ -76,8 +76,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
     public Result<IPage<ShipmentContainerHeader>> queryPageList(ShipmentContainerHeader shipmentContainerHeader,
         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
         HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        shipmentContainerHeader.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, shipmentContainerHeader);
         QueryWrapper<ShipmentContainerHeader> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerHeader, req.getParameterMap());
         Page<ShipmentContainerHeader> page = new Page<ShipmentContainerHeader>(pageNo, pageSize);
         IPage<ShipmentContainerHeader> pageList = shipmentContainerHeaderService.page(page, queryWrapper);
@@ -94,10 +93,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
     @PostMapping(value = "/add")
     @RequiresPermissions("shipmentContainerHeader:add")
     public Result<String> add(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        if (StringUtils.isNotEmpty(warehouseCode)) {
-            shipmentContainerHeader.setWarehouseCode(warehouseCode);
-        }
+        HuahengJwtUtil.setWarehouseCode(req, shipmentContainerHeader);
         shipmentContainerHeaderService.save(shipmentContainerHeader);
         return Result.OK("添加成功！");
     }
@@ -174,8 +170,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
     public Result<IPage<ShipmentContainerDetail>> listShipmentContainerDetailByMainId(ShipmentContainerDetail shipmentContainerDetail,
         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
         HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        shipmentContainerDetail.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, shipmentContainerDetail);
         QueryWrapper<ShipmentContainerDetail> queryWrapper = QueryGenerator.initQueryWrapper(shipmentContainerDetail, req.getParameterMap());
         Page<ShipmentContainerDetail> page = new Page<ShipmentContainerDetail>(pageNo, pageSize);
         IPage<ShipmentContainerDetail> pageList = shipmentContainerDetailService.page(page, queryWrapper);
@@ -192,10 +187,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
     @RequiresPermissions("shipmentContainerDetail:add")
     @PostMapping(value = "/addShipmentContainerDetail")
     public Result<String> addShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        if (StringUtils.isEmpty(warehouseCode)) {
-            shipmentContainerDetail.setWarehouseCode(warehouseCode);
-        }
+        HuahengJwtUtil.setWarehouseCode(req, shipmentContainerDetail);
         shipmentContainerDetailService.save(shipmentContainerDetail);
         return Result.OK("添加成功！");
     }
@@ -58,8 +58,7 @@ public class ShipmentHeaderHistoryController extends JeecgController&lt;ShipmentHea
     public Result<IPage<ShipmentHeaderHistory>> queryPageList(ShipmentHeaderHistory shipmentHeaderHistory,
         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
         HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        shipmentHeaderHistory.setWarehouseCode(warehouseCode);
+        HuahengJwtUtil.setWarehouseCode(req, shipmentHeaderHistory);
         QueryWrapper<ShipmentHeaderHistory> queryWrapper = QueryGenerator.initQueryWrapper(shipmentHeaderHistory, req.getParameterMap());
         Page<ShipmentHeaderHistory> page = new Page<>(pageNo, pageSize);
         IPage<ShipmentHeaderHistory> pageList = shipmentHeaderHistoryService.page(page, queryWrapper);
+log4jdbc.statement.warn=false
+
+log4jdbc.dump.booleanastruefalse=false
+
+log4jdbc.dump.sql.maxlinelength=0
+
+log4jdbc.dump.fulldebugstacktrace=false
+
+log4jdbc.dump.sql.select=true
+log4jdbc.dump.sql.insert=true
+log4jdbc.dump.sql.delete=true
+log4jdbc.dump.sql.update=true
+log4jdbc.dump.sql.create=true
+
+log4jdbc.dump.sql.addsemicolon=false
+
+log4jdbc.trim.sql=true
+
+log4jdbc.trim.sql.extrablanklines=true
+
+log4jdbc.suppress.generated.keys.exception=false
 \ No newline at end of file