From 9f141589563aa1b5616a5fca06ddb36ac96930cc Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 28 Sep 2023 11:09:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF-?= =?UTF-8?q?=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsStandardSharingController.java | 392 +++++++++--------- 1 file changed, 200 insertions(+), 192 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java index 799c58e1..15af1ee4 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java @@ -2,6 +2,7 @@ package com.jero.modules.personal.controller; import java.util.*; import javax.servlet.http.HttpServletRequest; + import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; @@ -9,10 +10,12 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.entity.LawsNewsFeed; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; +import com.jero.modules.laws.standard.service.ILawsNewsFeedService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; import com.jero.modules.personal.entity.LawsStandardSharing; import com.jero.modules.personal.service.ILawsStandardSharingService; @@ -33,214 +36,219 @@ import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; - /** +/** * @Description: 标准分享 * @Author: jero-boot - * @Date: 2023-09-07 + * @Date: 2023-09-07 * @Version: V1.0 */ -@Api(tags="标准分享") +@Api(tags = "标准分享") @RestController @RequestMapping("/personal/lawsStandardSharing") @Slf4j public class LawsStandardSharingController extends JeroController { - @Autowired - private ILawsStandardSharingService lawsStandardSharingService; - @Autowired - private ISysUserService sysUserService; + @Autowired + private ILawsStandardSharingService lawsStandardSharingService; + @Autowired + private ISysUserService sysUserService; - @Autowired - private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准 - @Autowired - private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准 - @Autowired - private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准 + @Autowired + private ILawsDomesticStandardService lawsDomesticStandardService; //国内标准 + @Autowired + private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准 + @Autowired + private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准 + @Autowired + private ILawsNewsFeedService lawsNewsFeedService; - /** - * 分页列表查询 - */ - @RequiresPermissions("personalCenter:sentShare:search") - @AutoLog(value = "标准分享-分页已发分享列表查询") - @ApiOperation(value="标准分享-分页已发分享列表查询", notes="标准分享-分页已发分享列表查询") - @GetMapping(value = "/issued/page") - public Result> issued(LawsStandardSharing lawsStandardSharing, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - lawsStandardSharing.setSharerId(sysUser.getId()); - lawsStandardSharing.setRecipientId(null); - IPage pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); - return Result.OK(pageList); - } + /** + * 分页列表查询 + */ + @RequiresPermissions("personalCenter:sentShare:search") + @AutoLog(value = "标准分享-分页已发分享列表查询") + @ApiOperation(value = "标准分享-分页已发分享列表查询", notes = "标准分享-分页已发分享列表查询") + @GetMapping(value = "/issued/page") + public Result> issued(LawsStandardSharing lawsStandardSharing, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + lawsStandardSharing.setSharerId(sysUser.getId()); + lawsStandardSharing.setRecipientId(null); + IPage pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); + return Result.OK(pageList); + } - /** - * 分页列表查询 - */ - @RequiresPermissions("personalCenter:receivedShare:search") - @AutoLog(value = "标准分享-分页已收分享列表查询") - @ApiOperation(value="标准分享-分页已收分享列表查询", notes="标准分享-分页已收分享列表查询") - @GetMapping(value = "/received/page") - public Result> received(LawsStandardSharing lawsStandardSharing, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - lawsStandardSharing.setRecipientId(sysUser.getId()); - lawsStandardSharing.setSharerId(null); - IPage pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); - return Result.OK(pageList); - } + /** + * 分页列表查询 + */ + @RequiresPermissions("personalCenter:receivedShare:search") + @AutoLog(value = "标准分享-分页已收分享列表查询") + @ApiOperation(value = "标准分享-分页已收分享列表查询", notes = "标准分享-分页已收分享列表查询") + @GetMapping(value = "/received/page") + public Result> received(LawsStandardSharing lawsStandardSharing, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + lawsStandardSharing.setRecipientId(sysUser.getId()); + lawsStandardSharing.setSharerId(null); + IPage pageList = lawsStandardSharingService.queryPage(lawsStandardSharing, pageNo, pageSize, req); + return Result.OK(pageList); + } - /** - * 添加 - */ - @AutoLog(value = "标准分享-国内分享") - @ApiOperation(value="标准分享-国内分享", notes="标准分享-国内分享") - @PostMapping(value = "/domestic/add") - public Result domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - SysUser user = sysUserService.getById(sysUser.getId()); - String recipientId = lawsStandardSharing.getRecipientId(); - Date date = new Date(); - List sharings = new ArrayList<>(); - List recipientIdList = Arrays.asList(recipientId.split(",")); - for (int i = 0; i < recipientIdList.size(); i++) { - LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource(CommonConstant.STANDARD_SOURCE_1); - sharing.setStandardId(lawsStandardSharing.getStandardId()); - LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId()); - sharing.setStandardName(standard.getStandardName()); - sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); - sharing.setSharerId(sysUser.getId()); - sharing.setSharerName(user.getNameWorkNo()); - sharing.setRecipientId(recipientIdList.get(i)); - SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); - sharing.setRecipientName(userServiceById.getNameWorkNo()); - sharing.setSharingTime(date); - sharing.setShareDescription(lawsStandardSharing.getShareDescription()); - sharing.setReadingStatus("1"); - sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - sharings.add(sharing); - } - lawsStandardSharingService.saveBatch(sharings); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 添加 + */ + @AutoLog(value = "标准分享-国内分享") + @ApiOperation(value = "标准分享-国内分享", notes = "标准分享-国内分享") + @PostMapping(value = "/domestic/add") + public Result domesticAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser user = sysUserService.getById(sysUser.getId()); + String recipientId = lawsStandardSharing.getRecipientId(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(CommonConstant.STANDARD_SOURCE_1); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + LawsDomesticStandard standard = lawsDomesticStandardService.queryById(lawsStandardSharing.getStandardId()); + sharing.setStandardName(standard.getStandardName()); + sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(user.getNameWorkNo()); + sharing.setRecipientId(recipientIdList.get(i)); + SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); + sharing.setRecipientName(userServiceById.getNameWorkNo()); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } - /** - * 添加 - */ - @AutoLog(value = "标准分享-海外分享") - @ApiOperation(value="标准分享-海外分享", notes="标准分享-海外分享") - @PostMapping(value = "/overseas/add") - public Result overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - SysUser user = sysUserService.getById(sysUser.getId()); - String recipientId = lawsStandardSharing.getRecipientId(); - Date date = new Date(); - List sharings = new ArrayList<>(); - List recipientIdList = Arrays.asList(recipientId.split(",")); - for (int i = 0; i < recipientIdList.size(); i++) { - LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource(CommonConstant.STANDARD_SOURCE_2); - sharing.setStandardId(lawsStandardSharing.getStandardId()); - LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId()); - sharing.setStandardName(standard.getStandardName()); - sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); - sharing.setSharerId(sysUser.getId()); - sharing.setSharerName(user.getNameWorkNo()); - sharing.setRecipientId(recipientIdList.get(i)); - SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); - sharing.setRecipientName(userServiceById.getNameWorkNo()); - sharing.setSharingTime(date); - sharing.setShareDescription(lawsStandardSharing.getShareDescription()); - sharing.setReadingStatus("1"); - sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - sharings.add(sharing); - } - lawsStandardSharingService.saveBatch(sharings); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 添加 + */ + @AutoLog(value = "标准分享-海外分享") + @ApiOperation(value = "标准分享-海外分享", notes = "标准分享-海外分享") + @PostMapping(value = "/overseas/add") + public Result overseasAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser user = sysUserService.getById(sysUser.getId()); + String recipientId = lawsStandardSharing.getRecipientId(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(CommonConstant.STANDARD_SOURCE_2); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + LawsOverseasStandard standard = lawsOverseasStandardService.queryById(lawsStandardSharing.getStandardId()); + sharing.setStandardName(standard.getStandardName()); + sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(user.getNameWorkNo()); + sharing.setRecipientId(recipientIdList.get(i)); + SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); + sharing.setRecipientName(userServiceById.getNameWorkNo()); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } - /** - * 添加 - */ - @AutoLog(value = "标准分享-企标分享") - @ApiOperation(value="标准分享-企标分享", notes="标准分享-企标分享") - @PostMapping(value = "/enterprise/add") - public Result enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - SysUser user = sysUserService.getById(sysUser.getId()); - String recipientId = lawsStandardSharing.getRecipientId(); - Date date = new Date(); - List sharings = new ArrayList<>(); - List recipientIdList = Arrays.asList(recipientId.split(",")); - for (int i = 0; i < recipientIdList.size(); i++) { - LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource(CommonConstant.STANDARD_SOURCE_3); - sharing.setStandardId(lawsStandardSharing.getStandardId()); - LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardSharing.getStandardId()); - sharing.setStandardName(standard.getStandardName()); - sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); - sharing.setSharerId(sysUser.getId()); - sharing.setSharerName(user.getNameWorkNo()); - sharing.setRecipientId(recipientIdList.get(i)); - SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); - sharing.setRecipientName(userServiceById.getNameWorkNo()); - sharing.setSharingTime(date); - sharing.setShareDescription(lawsStandardSharing.getShareDescription()); - sharing.setReadingStatus("1"); - sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - sharings.add(sharing); - } - lawsStandardSharingService.saveBatch(sharings); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 添加 + */ + @AutoLog(value = "标准分享-企标分享") + @ApiOperation(value = "标准分享-企标分享", notes = "标准分享-企标分享") + @PostMapping(value = "/enterprise/add") + public Result enterpriseAdd(@Validated @RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser user = sysUserService.getById(sysUser.getId()); + String recipientId = lawsStandardSharing.getRecipientId(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setSource(CommonConstant.STANDARD_SOURCE_3); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + LawsEnterpriseStandard standard = ILawsEnterpriseStandardService.getById(lawsStandardSharing.getStandardId()); + sharing.setStandardName(standard.getStandardName()); + sharing.setStandardNumber(lawsStandardSharing.getStandardNumber()); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(user.getNameWorkNo()); + sharing.setRecipientId(recipientIdList.get(i)); + SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); + sharing.setRecipientName(userServiceById.getNameWorkNo()); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } - /** - * 添加 - */ - @AutoLog(value = "标准分享-动态消息分享") - @ApiOperation(value="标准分享-动态消息分享", notes="标准分享-动态消息分享") - @PostMapping(value = "/dynamicMessages/add") - public Result dynamicMessages(@RequestBody LawsStandardSharing lawsStandardSharing) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - SysUser user = sysUserService.getById(sysUser.getId()); - String recipientId = lawsStandardSharing.getRecipientId(); - Date date = new Date(); - List sharings = new ArrayList<>(); - List recipientIdList = Arrays.asList(recipientId.split(",")); - for (int i = 0; i < recipientIdList.size(); i++) { - LawsStandardSharing sharing = new LawsStandardSharing(); - sharing.setSource(CommonConstant.STANDARD_SOURCE_4); - sharing.setSharerId(sysUser.getId()); - sharing.setSharerName(user.getNameWorkNo()); - sharing.setRecipientId(recipientIdList.get(i)); - SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); - sharing.setRecipientName(userServiceById.getNameWorkNo()); - sharing.setSharingTime(date); - sharing.setShareDescription(lawsStandardSharing.getShareDescription()); - sharing.setReadingStatus("1"); - sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - sharings.add(sharing); - } - lawsStandardSharingService.saveBatch(sharings); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 添加 + */ + @AutoLog(value = "标准分享-动态消息分享") + @ApiOperation(value = "标准分享-动态消息分享", notes = "标准分享-动态消息分享") + @PostMapping(value = "/dynamicMessages/add") + public Result dynamicMessages(@RequestBody LawsStandardSharing lawsStandardSharing) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser user = sysUserService.getById(sysUser.getId()); + String recipientId = lawsStandardSharing.getRecipientId(); + Date date = new Date(); + List sharings = new ArrayList<>(); + List recipientIdList = Arrays.asList(recipientId.split(",")); + for (int i = 0; i < recipientIdList.size(); i++) { + LawsStandardSharing sharing = new LawsStandardSharing(); + sharing.setStandardId(lawsStandardSharing.getStandardId()); + LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.getById(lawsStandardSharing.getStandardId()); + sharing.setRubric(lawsNewsFeed.getDynamicHeading()); + sharing.setSource(CommonConstant.STANDARD_SOURCE_4); + sharing.setSharerId(sysUser.getId()); + sharing.setSharerName(user.getNameWorkNo()); + sharing.setRecipientId(recipientIdList.get(i)); + SysUser userServiceById = sysUserService.getById(recipientIdList.get(i)); + sharing.setRecipientName(userServiceById.getNameWorkNo()); + sharing.setSharingTime(date); + sharing.setShareDescription(lawsStandardSharing.getShareDescription()); + sharing.setReadingStatus("1"); + sharing.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); + sharings.add(sharing); + } + lawsStandardSharingService.saveBatch(sharings); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } - /** - * 批量删除 - */ - @AutoLog(value = "标准分享-批量删除") - @ApiOperation(value="标准分享-批量删除", notes="标准分享-批量删除") - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestBody Map map) { - if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){ - throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); - } - this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(","))); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } + /** + * 批量删除 + */ + @AutoLog(value = "标准分享-批量删除") + @ApiOperation(value = "标准分享-批量删除", notes = "标准分享-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) { + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); + } + this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(","))); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } }