From 801a6ba1bce0de51a75256bc1a2d45e2f61d5056 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 25 三月 2025 14:21:45 +0800 Subject: [PATCH] art: @AutoLog 日志去除 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java | 6 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 54 +++++++++++++++++++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java | 6 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSysFilesController.java | 6 --- 12 files changed, 54 insertions(+), 66 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java index 0079e3f..779b7c6 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java @@ -2,9 +2,13 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog; import org.jeecg.modules.eam.constant.AssetStatusEnum; import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus; @@ -13,6 +17,7 @@ import org.jeecg.modules.eam.entity.EamEquipment; import org.jeecg.modules.eam.entity.EamEquipmentExtend; import org.jeecg.modules.eam.mapper.EamEquipmentMapper; +import org.jeecg.modules.eam.request.EamEquipmentQuery; import org.jeecg.modules.eam.service.IEamEquipmentExtendService; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.tree.FindsEquipmentProductionUtil; @@ -91,6 +96,55 @@ return treeList; } + @Override + public IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment) { + QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>(); + //鐢ㄦ埛鏉冮檺 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysUser == null){ + return page; + } + queryWrapper.exists("select 1 from mdc_user_production t where t.user_id=? and t.pro_id=e.org_id", sysUser.getId()); + if(eamEquipment != null){ + if(StringUtils.isNotBlank(eamEquipment.getEquipmentCode())){ + queryWrapper.like("e.equipment_code", eamEquipment.getEquipmentCode()); + } + if(StringUtils.isNotBlank(eamEquipment.getEquipmentName())){ + queryWrapper.like("e.equipment_name", eamEquipment.getEquipmentName()); + } + if(StringUtils.isNotBlank(eamEquipment.getEquipmentImportance())){ + queryWrapper.eq("e.equipment_importance", eamEquipment.getEquipmentImportance()); + } + if(StringUtils.isNotBlank(eamEquipment.getAssetStatus())){ + queryWrapper.like("e.asset_status", eamEquipment.getAssetStatus()); + } + if(StringUtils.isNotBlank(eamEquipment.getTechnologyStatus())){ + queryWrapper.like("e.technology_status", eamEquipment.getTechnologyStatus()); + } + if(StringUtils.isNotBlank(eamEquipment.getOperationSystem())){ + queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem()); + } + if(StringUtils.isNotBlank(eamEquipment.getOrgId())){ + queryWrapper.like("e.org_id", eamEquipment.getOrgId()); + } + if(StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())){ + queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory()); + } + //鎺掑簭 + if(StringUtils.isNotBlank(eamEquipment.getColumn()) && StringUtils.isNotBlank(eamEquipment.getOrder())){ + //queryWrapper.like("column", eamEquipment.getColumn()); + queryWrapper.orderByDesc("e.create_time"); + }else { + queryWrapper.orderByDesc("e.create_time"); + } + }else { + queryWrapper.orderByDesc("e.create_time"); + } + + IPage<EamEquipment> ipage = eamEquipmentMapper.queryPageList(page, queryWrapper); + return ipage; + } + /** * 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級 */ diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java index 65fb78d..6680dbb 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentFaultReasonController.java @@ -48,7 +48,6 @@ * @param req * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鏁呴殰鍘熷洜缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamEquipmentFaultReason eamEquipmentFaultReason, @@ -68,7 +67,6 @@ * @param eamEquipmentFaultReason * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-娣诲姞") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-娣诲姞", notes="璁惧鏁呴殰鍘熷洜缁存姢-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamEquipmentFaultReason eamEquipmentFaultReason) { @@ -85,7 +83,6 @@ * @param eamEquipmentFaultReason * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-缂栬緫") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-缂栬緫", notes="璁惧鏁呴殰鍘熷洜缁存姢-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody EamEquipmentFaultReason eamEquipmentFaultReason) { @@ -99,7 +96,6 @@ * @param id * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鍒犻櫎") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鍒犻櫎", notes="璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { @@ -113,7 +109,6 @@ * @param ids * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-鎵归噺鍒犻櫎") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-鎵归噺鍒犻櫎", notes="璁惧鏁呴殰鍘熷洜缁存姢-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -127,7 +122,6 @@ * @param id * @return */ - @AutoLog(value = "璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鏌ヨ") @ApiOperation(value="璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鏌ヨ", notes="璁惧鏁呴殰鍘熷洜缁存姢-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java index 688b6fa..1b6d19c 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamPrecisionParametersController.java @@ -49,7 +49,6 @@ * @param req * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="绮惧害鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamPrecisionParameters eamPrecisionParameters, @@ -69,7 +68,6 @@ * @param eamPrecisionParameters * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-娣诲姞") @ApiOperation(value="绮惧害鍙傛暟缁存姢-娣诲姞", notes="绮惧害鍙傛暟缁存姢-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamPrecisionParameters eamPrecisionParameters) { @@ -86,7 +84,6 @@ * @param eamPrecisionParameters * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-缂栬緫") @ApiOperation(value="绮惧害鍙傛暟缁存姢-缂栬緫", notes="绮惧害鍙傛暟缁存姢-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody EamPrecisionParameters eamPrecisionParameters) { @@ -100,7 +97,6 @@ * @param id * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @ApiOperation(value="绮惧害鍙傛暟缁存姢-閫氳繃id鍒犻櫎", notes="绮惧害鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { @@ -114,7 +110,6 @@ * @param ids * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-鎵归噺鍒犻櫎") @ApiOperation(value="绮惧害鍙傛暟缁存姢-鎵归噺鍒犻櫎", notes="绮惧害鍙傛暟缁存姢-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -128,7 +123,6 @@ * @param id * @return */ - @AutoLog(value = "绮惧害鍙傛暟缁存姢-閫氳繃id鏌ヨ") @ApiOperation(value="绮惧害鍙傛暟缁存姢-閫氳繃id鏌ヨ", notes="绮惧害鍙傛暟缁存姢-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java index 6fe8e3a..15627fa 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamProcessParametersController.java @@ -49,7 +49,6 @@ * @param req * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamProcessParameters eamProcessParameters, @@ -69,7 +68,6 @@ * @param eamProcessParameters * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-娣诲姞") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-娣诲姞", notes="宸ュ簭鍙傛暟缁存姢-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamProcessParameters eamProcessParameters) { @@ -86,7 +84,6 @@ * @param eamProcessParameters * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-缂栬緫") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-缂栬緫", notes="宸ュ簭鍙傛暟缁存姢-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody EamProcessParameters eamProcessParameters) { @@ -100,7 +97,6 @@ * @param id * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name="id",required=true) String id) { @@ -114,7 +110,6 @@ * @param ids * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎", notes="宸ュ簭鍙傛暟缁存姢-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { @@ -128,7 +123,6 @@ * @param id * @return */ - @AutoLog(value = "宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ") @ApiOperation(value="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ", notes="宸ュ簭鍙傛暟缁存姢-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name="id",required=true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java index 690da16..60c6986 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartInventoryController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囦欢搴撳瓨淇℃伅-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartInventory eamSparePartInventory, @@ -65,7 +64,6 @@ * @param eamSparePartInventory * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-娣诲姞") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-娣诲姞", notes = "澶囦欢搴撳瓨淇℃伅-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartInventory eamSparePartInventory) { @@ -79,7 +77,6 @@ * @param eamSparePartInventory * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-缂栬緫") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-缂栬緫", notes = "澶囦欢搴撳瓨淇℃伅-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartInventory eamSparePartInventory) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鍒犻櫎", notes = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-鎵归噺鍒犻櫎", notes = "澶囦欢搴撳瓨淇℃伅-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鏌ヨ", notes = "澶囦欢搴撳瓨淇℃伅-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java index 44a48d9..6858b2a 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囧搧澶囦欢棰嗙敤鍗�-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartReceive eamSparePartReceive, @@ -65,7 +64,6 @@ * @param eamSparePartReceive * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-娣诲姞") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-娣诲姞", notes = "澶囧搧澶囦欢棰嗙敤鍗�-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartReceive eamSparePartReceive) { @@ -79,7 +77,6 @@ * @param eamSparePartReceive * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-缂栬緫") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-缂栬緫", notes = "澶囧搧澶囦欢棰嗙敤鍗�-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartReceive eamSparePartReceive) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鍒犻櫎", notes = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-鎵归噺鍒犻櫎", notes = "澶囧搧澶囦欢棰嗙敤鍗�-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鏌ヨ", notes = "澶囧搧澶囦欢棰嗙敤鍗�-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java index 30cb336..7860618 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartReceiveDetailController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes = "棰嗙敤鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartReceiveDetail eamSparePartReceiveDetail, @@ -65,7 +64,6 @@ * @param eamSparePartReceiveDetail * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-娣诲姞") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-娣诲姞", notes = "棰嗙敤鍗曟槑缁�-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartReceiveDetail eamSparePartReceiveDetail) { @@ -79,7 +77,6 @@ * @param eamSparePartReceiveDetail * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-缂栬緫") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-缂栬緫", notes = "棰嗙敤鍗曟槑缁�-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartReceiveDetail eamSparePartReceiveDetail) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎", notes = "棰嗙敤鍗曟槑缁�-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎", notes = "棰嗙敤鍗曟槑缁�-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ") @ApiOperation(value = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ", notes = "棰嗙敤鍗曟槑缁�-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java index 76db71c..7d973b6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionController.java @@ -51,7 +51,6 @@ * @param req * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囦欢璇疯喘鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囦欢璇疯喘鍗�-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartRequisition eamSparePartRequisition, @@ -70,7 +69,6 @@ * @param eamSparePartRequisition * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-娣诲姞") @ApiOperation(value = "澶囦欢璇疯喘鍗�-娣诲姞", notes = "澶囦欢璇疯喘鍗�-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartRequisition eamSparePartRequisition) { @@ -88,7 +86,6 @@ * @param eamSparePartRequisition * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-缂栬緫") @ApiOperation(value = "澶囦欢璇疯喘鍗�-缂栬緫", notes = "澶囦欢璇疯喘鍗�-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartRequisition eamSparePartRequisition) { @@ -102,7 +99,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囦欢璇疯喘鍗�-閫氳繃id鍒犻櫎", notes = "澶囦欢璇疯喘鍗�-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -116,7 +112,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囦欢璇疯喘鍗�-鎵归噺鍒犻櫎", notes = "澶囦欢璇疯喘鍗�-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -130,7 +125,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢璇疯喘鍗�-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囦欢璇疯喘鍗�-閫氳繃id鏌ヨ", notes = "澶囦欢璇疯喘鍗�-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java index 8bf6048..08a1435 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartRequisitionDetailController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囦欢娓呰喘鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartRequisitionDetail eamSparePartRequisitionDetail, @@ -65,7 +64,6 @@ * @param eamSparePartRequisitionDetail * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-娣诲姞") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-娣诲姞", notes = "澶囦欢娓呰喘鍗曟槑缁�-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartRequisitionDetail eamSparePartRequisitionDetail) { @@ -79,7 +77,6 @@ * @param eamSparePartRequisitionDetail * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-缂栬緫") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-缂栬緫", notes = "澶囦欢娓呰喘鍗曟槑缁�-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartRequisitionDetail eamSparePartRequisitionDetail) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鍒犻櫎", notes = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-鎵归噺鍒犻櫎", notes = "澶囦欢娓呰喘鍗曟槑缁�-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鏌ヨ", notes = "澶囦欢娓呰喘鍗曟槑缁�-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java index 2d045d8..d236b81 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囧搧澶囦欢鎶ュ簾-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSparePartScrap eamSparePartScrap, @@ -65,7 +64,6 @@ * @param eamSparePartScrap * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-娣诲姞") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-娣诲姞", notes = "澶囧搧澶囦欢鎶ュ簾-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSparePartScrap eamSparePartScrap) { @@ -79,7 +77,6 @@ * @param eamSparePartScrap * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-缂栬緫") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-缂栬緫", notes = "澶囧搧澶囦欢鎶ュ簾-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSparePartScrap eamSparePartScrap) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鍒犻櫎", notes = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-鎵归噺鍒犻櫎", notes = "澶囧搧澶囦欢鎶ュ簾-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鏌ヨ", notes = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java index 035593e..efe21a9 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartsController.java @@ -46,7 +46,6 @@ * @param req * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囧搧澶囦欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSpareParts eamSpareParts, @@ -65,7 +64,6 @@ * @param eamSpareParts * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-娣诲姞") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-娣诲姞", notes = "澶囧搧澶囦欢绠$悊-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSpareParts eamSpareParts) { @@ -79,7 +77,6 @@ * @param eamSpareParts * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-缂栬緫") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-缂栬緫", notes = "澶囧搧澶囦欢绠$悊-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSpareParts eamSpareParts) { @@ -93,7 +90,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-閫氳繃id鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-閫氳繃id鍒犻櫎", notes = "澶囧搧澶囦欢绠$悊-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -107,7 +103,6 @@ * @param ids * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-鎵归噺鍒犻櫎") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-鎵归噺鍒犻櫎", notes = "澶囧搧澶囦欢绠$悊-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -121,7 +116,6 @@ * @param id * @return */ - @AutoLog(value = "澶囧搧澶囦欢绠$悊-閫氳繃id鏌ヨ") @ApiOperation(value = "澶囧搧澶囦欢绠$悊-閫氳繃id鏌ヨ", notes = "澶囧搧澶囦欢绠$悊-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSysFilesController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSysFilesController.java index 466d530..d4c046a 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSysFilesController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSysFilesController.java @@ -48,7 +48,6 @@ * @param req * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ") @ApiOperation(value = "璁惧闄勪欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧闄勪欢绠$悊-鍒嗛〉鍒楄〃鏌ヨ") @GetMapping(value = "/list") public Result<?> queryPageList(EamSysFiles eamSysFiles, @@ -68,7 +67,6 @@ * @param request * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-娣诲姞") @ApiOperation(value = "璁惧闄勪欢绠$悊-娣诲姞", notes = "璁惧闄勪欢绠$悊-娣诲姞") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamSysFilesRequest request) { @@ -85,7 +83,6 @@ * @param eamSysFiles * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-缂栬緫") @ApiOperation(value = "璁惧闄勪欢绠$悊-缂栬緫", notes = "璁惧闄勪欢绠$悊-缂栬緫") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamSysFiles eamSysFiles) { @@ -99,7 +96,6 @@ * @param id * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-閫氳繃id鍒犻櫎") @ApiOperation(value = "璁惧闄勪欢绠$悊-閫氳繃id鍒犻櫎", notes = "璁惧闄勪欢绠$悊-閫氳繃id鍒犻櫎") @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { @@ -117,7 +113,6 @@ * @param ids * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-鎵归噺鍒犻櫎") @ApiOperation(value = "璁惧闄勪欢绠$悊-鎵归噺鍒犻櫎", notes = "璁惧闄勪欢绠$悊-鎵归噺鍒犻櫎") @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { @@ -138,7 +133,6 @@ * @param id * @return */ - @AutoLog(value = "璁惧闄勪欢绠$悊-閫氳繃id鏌ヨ") @ApiOperation(value = "璁惧闄勪欢绠$悊-閫氳繃id鏌ヨ", notes = "璁惧闄勪欢绠$悊-閫氳繃id鏌ヨ") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { -- Gitblit v1.9.3