From 26df7092ac720d9d66e062526d6d71a49ec9d451 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 24 Jun 2024 11:53:37 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 21 ------- .../controller/LawsDomesticController.java | 17 ------ .../controller/LawsEnterpriseController.java | 18 ------ .../LawsUpdateRecordController.java | 60 ------------------- .../service/ILawsUpdateRecordService.java | 30 ---------- .../impl/LawsUpdateRecordServiceImpl.java | 52 ---------------- 6 files changed, 198 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsUpdateRecordController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsUpdateRecordService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsUpdateRecordServiceImpl.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 9e234959..0cc2be81 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -121,8 +121,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; @Autowired - private ILawsUpdateRecordService lawsUpdateRecordService; - @Autowired private ISysDictItemService sysDictItemService; @Autowired private ILawsNodeRelationService lawsNodeRelationService; @@ -769,17 +767,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { //根据类型更新数据 executeUpdateWrapperByModel(module, updateWrapper); - // 增加入库记录 - String addContent = loginUser.calcNameWorkNo() + " " + now + " 入库" + - standardNumber + "《" + standardName + "》"; - lawsUpdateRecordService.addRecord(standardNumber, addContent); - - // 增加修改内容记录 - String content = recordBuffer.toString(); - if (!oldStr.equals(content)) { - lawsUpdateRecordService.addRecord(standardNumber, content); - } - // 对标准体系做处理 lawsNodeRelationService.addRelation(standardSystem, standardNumber, id); @@ -951,14 +938,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService { //根据类型更新数据 executeUpdateWrapperByModel(module, updateWrapper); //lawsCommonMapper.commonEdit(tableName, updateWrapper, id); - // 如果修改了内容 - String content = recordBuffer.toString(); - if (!oldStr.equals(content)) { - if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue()) - || module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { - lawsUpdateRecordService.addRecord(standardNumber, content); - } - } // 对标准体系做处理 lawsNodeRelationService.removeByStandardId(id); 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 a00e2b38..d79c6ae7 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,6 +1,5 @@ package com.jero.modules.laws.standard.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; @@ -11,9 +10,7 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; 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.split.service.ISarFileSplitInfoService; import com.jero.modules.tag.entity.LawsTag; @@ -48,8 +45,6 @@ public class LawsDomesticController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; - @Autowired - private ILawsUpdateRecordService lawsUpdateRecordService; @Resource private ISarFileSplitInfoService splitInfoService; @@ -182,18 +177,6 @@ public class LawsDomesticController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } - @AutoLog(value = "国内法规标准-法规更新记录") - @ApiOperation(value="国内法规标准-法规更新记录", notes="国内法规标准-法规更新记录") - @GetMapping(value = "/getUpdateRecordList") - @ApiOperationSupport(order = 11) - @RequiresPermissions("domesticStandard:updateRecord") - public Result> getUpdateRecordList(@RequestParam("standardNumber") @ApiParam("标准编号") String standardNumber) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); - queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); - return Result.OK(lawsUpdateRecordService.list(queryWrapper)); - } - @AutoLog(value = "国内法规标准-导出") @ApiOperation(value="国内法规标准-导出", notes="国内法规标准-导出") @PostMapping("/exportData") 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 4f00a6b2..7aa92fbb 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,6 +1,5 @@ package com.jero.modules.laws.standard.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; @@ -17,9 +16,7 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptServic import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingRecordService; import com.jero.modules.laws.standard.entity.LawsStandardTempPermission; -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.split.service.ISarFileSplitInfoService; import com.jero.modules.sys.utils.UserUtils; @@ -57,8 +54,6 @@ public class LawsEnterpriseController { private ILawsNodeRelationService lawsNodeRelationService; @Autowired private ILawsStandardCollectionService lawsStandardCollectionService; - @Autowired - private ILawsUpdateRecordService lawsUpdateRecordService; @Resource private EnterpriseStandardAuthUserService esAuthUserService; @@ -227,19 +222,6 @@ public class LawsEnterpriseController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } - @AutoLog(value = "企业法规标准-法规更新记录") - @ApiOperation(value="企业法规标准-法规更新记录", notes="企业法规标准-法规更新记录") - @GetMapping(value = "/getUpdateRecordList") - @ApiOperationSupport(order = 12) - @RequiresPermissions("enterpriseStandard:detail:updateLog") - public Result> getUpdateRecordList(@RequestParam("standardNumber") @ApiParam("标准编号") String standardNumber) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber); - queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); - return Result.OK(lawsUpdateRecordService.list(queryWrapper)); - } - - @AutoLog(value = "企业法规标准-临时权限设置") @ApiOperation(value="企业法规标准-临时权限设置", notes="企业法规标准-临时权限设置") @PostMapping(value = "/tempPermission") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsUpdateRecordController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsUpdateRecordController.java deleted file mode 100644 index cb49544d..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsUpdateRecordController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.jero.modules.laws.standard.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -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 io.swagger.annotations.ApiParam; -import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; - -/** - * @Description: 文档动态 - * @Author: jero-boot - * @Date: 2024-01-19 - * @Version: V1.0 - */ -@Api(tags = "文档动态") -@RestController -@RequestMapping("/laws/standard/updateRecord") -@Slf4j -public class LawsUpdateRecordController { - - @Resource - private ILawsUpdateRecordService lawsUpdateRecordService; - - @AutoLog(value = "文档动态-查询") - @ApiOperation(value = "文档动态-查询", notes = "文档动态-查询") - @GetMapping(value = "/list") - @ApiOperationSupport(order = 1) - @RequiresPermissions("standardRegulationLibrary:documentDynamics:search") - public Result> getUpdateRecordList( - @RequestParam("content") @ApiParam("消息内容") String content, - @RequestParam(name = "pageNo", defaultValue = "1") @ApiParam("页码") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") @ApiParam("页面显示数量") Integer pageSize) { - IPage pageList = lawsUpdateRecordService.queryPageList(content, pageNo, pageSize); - return Result.OK(pageList); - } - - - @AutoLog(value = "文档动态-批量删除") - @ApiOperation(value = "文档动态-批量删除", notes = "文档动态-批量删除") - @PostMapping(value = "/deleteBatch") - @ApiOperationSupport(order = 2) - @RequiresPermissions("standardRegulationLibrary:documentDynamics:batchDelete") - public Result batchDelete(@RequestBody Map map) { - lawsUpdateRecordService.removeByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK(); - } - -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsUpdateRecordService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsUpdateRecordService.java deleted file mode 100644 index d7190fd5..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsUpdateRecordService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.jero.modules.laws.standard.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.laws.standard.entity.LawsUpdateRecord; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 更新记录 - * @Author: jero-boot - * @Date: 2023-09-11 - * @Version: V1.0 - */ -public interface ILawsUpdateRecordService extends IService { - - /** - * @Author: liao - * @Date: 2023/9/12 16:56 - * @Description: 添加 - **/ - void addRecord(String standardNumber, String content); - - /** - * 文档动态列表 - * @param content 消息内容 - * @param pageNo 页码 - * @param pageSize 页面显示数量 - * @return IPage - */ - IPage queryPageList(String content, Integer pageNo, Integer pageSize); -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsUpdateRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsUpdateRecordServiceImpl.java deleted file mode 100644 index 50571ab9..00000000 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsUpdateRecordServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.jero.modules.laws.standard.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.api.vo.Result; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardPlanVo; -import com.jero.modules.laws.standard.entity.LawsUpdateRecord; -import com.jero.modules.laws.standard.mapper.LawsUpdateRecordMapper; -import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.jero.common.exception.JeroBootException; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - - -/** - * @Description: 更新记录 - * @Author: jero-boot - * @Date: 2023-09-11 - * @Version: V1.0 - */ -@Service -@Transactional(rollbackFor = JeroBootException.class) -public class LawsUpdateRecordServiceImpl extends ServiceImpl implements ILawsUpdateRecordService { - - /** - * @Author: liao - * @Date: 2023/9/12 16:58 - * @Description: 添加 - **/ - @Override - public void addRecord(String standardNumber, String content) { - LawsUpdateRecord lawsUpdateRecord = new LawsUpdateRecord(); - lawsUpdateRecord.setUniqueRelationFlag(standardNumber); - lawsUpdateRecord.setContent(content); - save(lawsUpdateRecord); - } - - @Override - public IPage queryPageList(String content, Integer pageNo, Integer pageSize) { - IPage page = new Page<>(pageNo, pageSize); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StrUtil.isNotBlank(content), LawsUpdateRecord::getContent, content); - queryWrapper.eq(LawsUpdateRecord::getDelFlag, YesOrNoEnum.NO.getValue()); - queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime); - page = page(page, queryWrapper); - return page; - } -}