From 11a35b85e8af9183a73b043b356f9f2483bb5f8b Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 14 Sep 2023 14:06:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsCommonController.java | 20 ------------------- .../controller/LawsDomesticController.java | 15 ++++++++++++++ .../controller/LawsEnterpriseController.java | 15 ++++++++++++++ .../controller/LawsOverseasController.java | 15 ++++++++++++++ 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java index bc6dcf4a..5302f302 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java @@ -1,17 +1,12 @@ package com.jero.modules.laws.common.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; -import com.jero.modules.laws.standard.entity.LawsNodeRelation; -import com.jero.modules.laws.standard.entity.LawsUpdateRecord; -import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -21,9 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * @Author: liao * @Date: 2023/9/11 15:40 @@ -36,8 +28,6 @@ public class LawsCommonController { @Autowired private ILawsCommonService lawsCommonService; - @Autowired - private ILawsUpdateRecordService lawsUpdateRecordService; @ApiOperation(value="多选标准弹框", notes="多选标准弹框") @GetMapping(value = "/getManyStandardSelectionBox") @@ -58,14 +48,4 @@ public class LawsCommonController { return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize)); } - @AutoLog(value = "法规更新记录列表查询") - @ApiOperation(value="法规更新记录列表查询", notes="法规更新记录列表查询") - @GetMapping(value = "/getUpdateRecordList") - public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); - queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); - return Result.OK(lawsUpdateRecordService.list(queryWrapper)); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index fc3a50b8..bf791b6b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standard.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -7,7 +8,9 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; +import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; @@ -36,6 +39,8 @@ public class LawsDomesticController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; + @Autowired + private ILawsUpdateRecordService lawsUpdateRecordService; private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); @@ -119,4 +124,14 @@ public class LawsDomesticController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + @AutoLog(value = "国内法规标准-法规更新记录") + @ApiOperation(value="国内法规标准-法规更新记录", notes="国内法规标准-法规更新记录") + @GetMapping(value = "/getUpdateRecordList") + public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); + queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); + return Result.OK(lawsUpdateRecordService.list(queryWrapper)); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index f9337b7d..a066f3ec 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standard.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -7,7 +8,9 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; +import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; @@ -36,6 +39,8 @@ public class LawsEnterpriseController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; + @Autowired + private ILawsUpdateRecordService lawsUpdateRecordService; private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @@ -118,4 +123,14 @@ public class LawsEnterpriseController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + @AutoLog(value = "企业法规标准-法规更新记录") + @ApiOperation(value="企业法规标准-法规更新记录", notes="企业法规标准-法规更新记录") + @GetMapping(value = "/getUpdateRecordList") + public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); + queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); + return Result.OK(lawsUpdateRecordService.list(queryWrapper)); + } + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 71d81990..9c8f6619 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -1,5 +1,6 @@ package com.jero.modules.laws.standard.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -7,7 +8,9 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; +import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; @@ -36,6 +39,8 @@ public class LawsOverseasController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; + @Autowired + private ILawsUpdateRecordService lawsUpdateRecordService; private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue(); @@ -118,4 +123,14 @@ public class LawsOverseasController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + @AutoLog(value = "海外法规标准-法规更新记录") + @ApiOperation(value="海外法规标准-法规更新记录", notes="海外法规标准-法规更新记录") + @GetMapping(value = "/getUpdateRecordList") + public Result> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); + queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); + return Result.OK(lawsUpdateRecordService.list(queryWrapper)); + } + }