From 13a8f6afa0552dfe24754fa1b6a74045d723f167 Mon Sep 17 00:00:00 2001 From: liao Date: Wed, 20 Sep 2023 15:22:24 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/common/constant/FieldCommon.java | 2 + .../laws/common/constant/ResultCommon.java | 1 + .../service/impl/LawsCommonServiceImpl.java | 6 +-- .../controller/LawsNewsFeedController.java | 39 +++---------------- .../service/impl/LawsNewsFeedServiceImpl.java | 28 +++++++++++-- .../main/resources/i18n/messages.properties | 1 + .../resources/i18n/messages_en.properties | 1 + .../resources/i18n/messages_zh.properties | 1 + 8 files changed, 40 insertions(+), 39 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index c4341c5e..f641c046 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -61,6 +61,8 @@ public class FieldCommon { public static final String ID = "id"; // 标准编号 public static final String STANDARD_NUMBER = "standard_number"; + // 新增页面标准编号 + public static final String STANDARD_NUMBER_TEMP = "standard_number_temp"; // 年代号 public static final String YEAR_NUMBER = "year_number"; // 标准名称 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 487ca5d4..897db126 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -19,6 +19,7 @@ public class ResultCommon { public static final String EXIST_STANDARD_NUMBER = "message.exists.standard.number"; // 标准编号已经存在 public static final String NOT_EXIST_PARAM = "message.no.exists.param"; // 参数{0}不存在 public static final String NO_PERMISSION = "message.no.permission"; // 没有数据操作权限 + public static final String SELECT_DATA = "message.select.data"; // 请选择数据 public static final String RMR_SET_QUALITY_OVER_TEN = "es.rmr.setQuality.overTen"; // 请最多选择10条 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 866a5689..6f6af0fc 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 @@ -799,15 +799,15 @@ public class LawsCommonServiceImpl implements ILawsCommonService { public void setStandardNumber(Map parameterMap) { // 标准类别 String standardClass = (String) parameterMap.get(FieldCommon.STANDARD_CLASS); - // 法规编号不能为空 - String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER); + // 法规编号不能为空（新增页面） + String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER_TEMP); // 年代号 String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER); if (StringUtils.isBlank(standardClass)) { throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.STANDARD_CLASS); } if (StringUtils.isBlank(standardNumber)) { - throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER, ""); + throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER); } if (StringUtils.isBlank(yearNumber)) { throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.YEAR_NUMBER); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java index bac08f6c..afa82963 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java @@ -2,9 +2,9 @@ package com.jero.modules.laws.standard.controller; import java.util.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; +import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.standard.entity.LawsNewsFeed; @@ -15,7 +15,6 @@ import com.jero.common.system.base.controller.JeroController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; @@ -115,10 +114,10 @@ public class LawsNewsFeedController extends JeroController delete(@RequestBody Map map) { if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { - return Result.error("请选择数据!"); + throw new JeroBootException(ResultCommon.SELECT_DATA); } lawsNewsFeedService.deleteById(map.get("id")); - return Result.OK("删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -132,10 +131,10 @@ public class LawsNewsFeedController extends JeroController deleteBatch(@RequestBody Map map) { if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { - return Result.error("请选择数据!"); + throw new JeroBootException(ResultCommon.SELECT_DATA); } this.lawsNewsFeedService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK("批量删除成功!"); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } /** @@ -147,35 +146,9 @@ public class LawsNewsFeedController extends JeroController queryById(@RequestParam(name = "id", required = true) String id) { + public Result queryById(@RequestParam(name = "id") String id) { LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id); - if (lawsNewsFeed == null) { - return Result.error("未找到对应数据"); - } return Result.OK(lawsNewsFeed); } - /** - * 导出excel - * - * @param request - * @param lawsNewsFeed - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, LawsNewsFeed lawsNewsFeed) { - return super.exportXls(request, lawsNewsFeed, LawsNewsFeed.class, "动态消息"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, LawsNewsFeed.class); - } - } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java index 91b12380..0d89fc13 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.standard.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; import com.jero.common.system.vo.LoginUser; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.ResultCommon; @@ -21,6 +22,9 @@ import com.jero.common.exception.JeroBootException; import java.util.Arrays; import java.util.List; import java.util.Date; +import java.util.Objects; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.query.QueryGenerator; import javax.servlet.http.HttpServletRequest; @@ -144,7 +148,13 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List newsFeedList = listByIds(ids); + List writerList = newsFeedList.stream().map(LawsNewsFeed::getWriter) + .distinct().collect(Collectors.toList()); + if ((writerList.size() > 1 || !loginUser.getId().equals(writerList.get(0))) + && !loginUser.getRoleIds().contains(FieldCommon.ROLE_ADMIN_ID)) { + throw new JeroBootException(ResultCommon.NO_PERMISSION); + } + removeByIds(ids); } /** @@ -166,6 +184,10 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl