From c71d60e18c015724ed1ac6e6f3d61f38d69f57bc Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 16 Aug 2024 11:13:44 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=97=A5=E5=9D=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StStrategyConfigController.java | 10 +++++----- .../point/controller/SchBasePointController.java | 5 +++++ .../region/controller/SchBaseRegionController.java | 4 ++++ .../task/controller/SchBaseTaskController.java | 3 +++ .../early_deferral/AlmEarlyDeferralController.java | 5 +++++ .../controller/inv_early/AlmEarlyInvController.java | 5 +++++ .../form_data/controller/PmFormDataController.java | 1 + .../BmExternalFieldMappingController.java | 7 +++++++ .../form_mapping/SyncFormMappingController.java | 5 +++++ 9 files changed, 40 insertions(+), 5 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java index e4de8ddd..f6f2175a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/controller/StStrategyConfigController.java @@ -36,7 +36,7 @@ public class StStrategyConfigController { private IStStrategyConfigService iStStrategyConfigService; @GetMapping - @Log("分页查询") + @Log("查询规则") public ResponseEntity query(StrategyQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(iStStrategyConfigService.page(page.build(),query.build())), HttpStatus.OK); } @@ -52,28 +52,28 @@ public class StStrategyConfigController { } @PostMapping - @Log("新增") + @Log("新增规格") public ResponseEntity create(@Validated @RequestBody StStrategyConfig dao) { iStStrategyConfigService.create(dao); return new ResponseEntity<>(HttpStatus.OK); } @PutMapping - @Log("修改") + @Log("修改规格") public ResponseEntity update(@Validated @RequestBody StStrategyConfig dao) { iStStrategyConfigService.update(dao); return new ResponseEntity<>(HttpStatus.OK); } @DeleteMapping - @Log("删除") + @Log("删除规格") public ResponseEntity delete(@RequestBody Long[] ids) { iStStrategyConfigService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } @PutMapping("/changeActive") - @Log("修改启用状态") + @Log("修改启用状态规格") public ResponseEntity changeActive(@Validated @RequestBody StStrategyConfig dao) { iStStrategyConfigService.changeActive(dao); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java index 5f8380d0..982505bd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/point/controller/SchBasePointController.java @@ -4,6 +4,7 @@ package org.nl.wms.dispatch_manage.point.controller; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; @@ -41,6 +42,7 @@ public class SchBasePointController { } @PostMapping + @Log("创建点位") public ResponseEntity create(@Validated @RequestBody SchBasePoint entity) { entity.setId(IdUtil.getStringId()); entity.setCreate_name(SecurityUtils.getCurrentNickName()); @@ -50,6 +52,7 @@ public class SchBasePointController { } @PutMapping + @Log("更新点位") public ResponseEntity update(@Validated @RequestBody SchBasePoint entity) { entity.setUpdate_name(SecurityUtils.getCurrentNickName()); entity.setUpdate_time(DateUtil.now()); @@ -59,12 +62,14 @@ public class SchBasePointController { @DeleteMapping + @Log("删除点位") public ResponseEntity delete(@RequestBody Set ids) { pointService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } @GetMapping("/getRegion") + @Log("获取区域") public ResponseEntity getRegion() { return new ResponseEntity<>(regionService.list(), HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java index ac0a5eb9..fb0f3618 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/region/controller/SchBaseRegionController.java @@ -3,6 +3,7 @@ package org.nl.wms.dispatch_manage.region.controller; import cn.hutool.core.date.DateUtil; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; @@ -38,6 +39,7 @@ public class SchBaseRegionController { } @PostMapping + @Log("创建区域") public ResponseEntity create(@Validated @RequestBody SchBaseRegion entity) { entity.setId(IdUtil.getStringId()); entity.setCreate_name(SecurityUtils.getCurrentNickName()); @@ -47,6 +49,7 @@ public class SchBaseRegionController { } @PutMapping + @Log("更新区域") public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity) { entity.setUpdate_name(SecurityUtils.getCurrentNickName()); entity.setUpdate_time(DateUtil.now()); @@ -56,6 +59,7 @@ public class SchBaseRegionController { @DeleteMapping + @Log("删除区域") public ResponseEntity delete(@RequestBody Set ids) { regionService.removeByIds(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java index ac1f1518..ccb661de 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java @@ -41,6 +41,7 @@ public class SchBaseTaskController { @PostMapping("getVehicleTask") + @Log("查询载具任务") public ResponseEntity getVehicleTask(@RequestBody JSONObject param) { Assert.noNullElements(new Object[]{param,param.getString("vehicle_id")},"请求参数不能为空"); return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_id")), HttpStatus.OK); @@ -48,11 +49,13 @@ public class SchBaseTaskController { @GetMapping + @Log("任务查询") public ResponseEntity query(SchBaseTaskQuery whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(iSchBaseTaskService.queryAll(whereJson,page)), HttpStatus.OK); } @PostMapping + @Log("手动创建任务") public ResponseEntity create(@Validated @RequestBody SchBaseTask entity){ iSchBaseTaskService.create(entity); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java index 1249a23c..9d98c444 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; @@ -69,6 +70,7 @@ public class AlmEarlyDeferralController { } @PostMapping("/saveDtl") + @Log("保存预警明细配置") public ResponseEntity saveDtl(@Validated @RequestBody JSONObject dto) { String id = dto.getString("id"); LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); @@ -88,6 +90,7 @@ public class AlmEarlyDeferralController { } @DeleteMapping("/delete") + @Log("删除预警明细配置") public ResponseEntity delete(@RequestBody String[] ids) { if (ids.length > 0) { almEarlyDeferralService.removeByIds(Arrays.asList(ids)); @@ -96,6 +99,7 @@ public class AlmEarlyDeferralController { } @PostMapping + @Log("创建预警明细配置") public ResponseEntity create(@Validated @RequestBody JSONObject dto) { AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class); almEarlyDeferral.setCreate_name(SecurityUtils.getCurrentNickName()); @@ -106,6 +110,7 @@ public class AlmEarlyDeferralController { } @PostMapping("/update") + @Log("修改预警信息") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class); almEarlyDeferral.setCreate_time(DateUtil.now()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java index db0f9940..f5d4fde2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; @@ -89,6 +90,7 @@ public class AlmEarlyInvController { } @PostMapping + @Log("创建预警信息") public ResponseEntity create(@Validated @RequestBody JSONObject dto) { AlmEarlyInv inv = dto.toJavaObject(AlmEarlyInv.class); inv.setCreate_id(SecurityUtils.getCurrentUserId()); @@ -99,6 +101,7 @@ public class AlmEarlyInvController { } @PostMapping("/update") + @Log("更新预警信息") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { AlmEarlyInv inv = dto.toJavaObject(AlmEarlyInv.class); inv.setCreate_time(DateUtil.now()); @@ -107,6 +110,7 @@ public class AlmEarlyInvController { } @PostMapping("/saveDtl") + @Log("保存预警明细配置") public ResponseEntity saveDtl(@Validated @RequestBody JSONObject dto) { String id = dto.getString("id"); LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); @@ -125,6 +129,7 @@ public class AlmEarlyInvController { } @DeleteMapping("/delete") + @Log("删除预警配置") public ResponseEntity delete(@RequestBody String[] ids) { if (ids.length > 0) { iAlmEarlyInvService.removeByIds(Arrays.asList(ids)); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index d05bb30d..b66a40e9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -33,6 +33,7 @@ public class PmFormDataController { @GetMapping() + @Log("查询数据") public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java index a7a16f7e..318d96ae 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/field_mapping/BmExternalFieldMappingController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.wms.sync_manage.service.field_mapping.IBmExternalFieldMappingService; import org.nl.wms.sync_manage.service.field_mapping.dao.BmExternalFieldMapping; @@ -41,30 +42,35 @@ public class BmExternalFieldMappingController { } @PostMapping + @Log("创建同步") public ResponseEntity create(@Validated @RequestBody BmExternalFieldMapping dto) { mappingsService.save(dto); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/addRows") + @Log("新增同步明细") public ResponseEntity addRows(@RequestBody RequestMappingParam param) { mappingsService.addRows(param); return new ResponseEntity<>(HttpStatus.OK); } @PutMapping + @Log("创建同步配置") public ResponseEntity update(@Validated @RequestBody BmExternalFieldMapping dto) { mappingsService.update(dto, new LambdaUpdateWrapper().eq(BmExternalFieldMapping::getId, dto.getId())); return new ResponseEntity<>(HttpStatus.OK); } @PutMapping("/updateRows") + @Log("创建同步配置明细") public ResponseEntity updateRows(@RequestBody RequestMappingParam param) { mappingsService.updateRows(param); return new ResponseEntity<>(HttpStatus.OK); } @DeleteMapping + @Log("删除同步") public ResponseEntity delete(@RequestBody Long[] ids) { if (ids.length > 0) { mappingsService.removeByIds(Arrays.asList(ids)); @@ -95,6 +101,7 @@ public class BmExternalFieldMappingController { return new ResponseEntity<>(mappingsService.getExistTableName(), HttpStatus.OK); } @PostMapping("/syncAnalyse") + @Log("同步测试") public ResponseEntity syncAnalyse(@RequestBody JSONObject form){ String fromType=form.getString("local_table_name"); JSONArray formMapping = new JSONArray(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java index 96bbaa8f..13027f3a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java @@ -4,6 +4,7 @@ package org.nl.wms.sync_manage.controller.form_mapping; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.FileUtil; @@ -67,16 +68,19 @@ public class SyncFormMappingController { return new ResponseEntity<>(TableDataInfo.build(iSyncFormMappingService.page(page.build(), query.build())), HttpStatus.OK); } @PostMapping("/create") + @Log("创建表同步配置") public ResponseEntity create(@RequestBody JSONObject param) { iSyncFormMappingService.saveSyncMapping(param); return new ResponseEntity<>(HttpStatus.OK); } @PostMapping("/update") + @Log("修改表同步配置") public ResponseEntity update(@RequestBody JSONObject param) { iSyncFormMappingService.saveSyncMapping(param); return new ResponseEntity<>(HttpStatus.OK); } @DeleteMapping + @Log("删除表同步配置") public ResponseEntity delete(@RequestBody String[] ids) { if (ids.length>0){ iSyncFormMappingService.removeByIds(Arrays.asList(ids)); @@ -86,6 +90,7 @@ public class SyncFormMappingController { @PostMapping("/syncAnalyse") + @Log("表同步测试") public ResponseEntity syncAnalyse(@RequestBody JSONObject form){ //参数判读，参数解析，调用参数入库 Object analyseData = form.remove("analyseData");