From 7f15ccc7c1cf11041dbfdbcdc1787a11bd2a4b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 23 Jul 2024 16:08:49 +0800 Subject: [PATCH] fix:87396 --- .../LawsUnifiedTodoLogController.java | 18 ++++-- .../hiwork/entity/LawsUnifiedTodoLog.java | 8 ++- .../service/LawsUnifiedTodoLogService.java | 58 +++++++++++-------- .../service/impl/UnifiedTodoServiceImpl.java | 1 - .../controller/MarketStandardController.java | 2 +- .../service/ILawsMarketStandardService.java | 7 +++ .../impl/LawsMarketStandardServiceImpl.java | 21 ++++++- 7 files changed, 81 insertions(+), 34 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/controller/LawsUnifiedTodoLogController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/controller/LawsUnifiedTodoLogController.java index 2cc93771..6d2d8f81 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/controller/LawsUnifiedTodoLogController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/controller/LawsUnifiedTodoLogController.java @@ -10,6 +10,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog; import com.jero.modules.docking.hiwork.service.LawsUnifiedTodoLogService; +import com.jero.modules.docking.hiwork.service.impl.LawsUnifiedTodoLogServiceImpl; import com.jero.modules.system.vo.IdMapBody; import com.jero.modules.system.vo.IdsMapBody; import io.swagger.annotations.Api; @@ -35,7 +36,7 @@ import java.util.List; @Api(tags = "统一代办推送日志表") @RestController @RequestMapping("LawsUnifiedTodoLog") -public class LawsUnifiedTodoLogController extends JeroController { +public class LawsUnifiedTodoLogController extends JeroController { /** * 服务对象 */ @@ -51,10 +52,7 @@ public class LawsUnifiedTodoLogController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsUnifiedTodoLog, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = lawsUnifiedTodoLogService.page(page, queryWrapper); - return Result.OK(pageList); + return lawsUnifiedTodoLogService.getPage(lawsUnifiedTodoLog,pageNo,pageSize,req); } /** @@ -155,4 +153,14 @@ public class LawsUnifiedTodoLogController extends JeroController send(@RequestBody LawsUnifiedTodoLog lawsUnifiedTodoLog) { + return lawsUnifiedTodoLogService.send(lawsUnifiedTodoLog); + } + } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java index 8cb62b44..6faf2634 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/entity/LawsUnifiedTodoLog.java @@ -50,6 +50,12 @@ public class LawsUnifiedTodoLog { @ApiModelProperty(value="状态1成功，2失败") private Integer state; + /** + * 消息类型1：OA消息 2：飞书 + */ + @ApiModelProperty(value="消息类型1：OA消息 2：飞书") + private Integer messageType; + /** * 创建人 */ @@ -78,4 +84,4 @@ public class LawsUnifiedTodoLog { @ApiModelProperty(value="更新时间") private Date updateTime; -} \ No newline at end of file +} diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/LawsUnifiedTodoLogService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/LawsUnifiedTodoLogService.java index ca987ed7..a9c40ff7 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/LawsUnifiedTodoLogService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/LawsUnifiedTodoLogService.java @@ -1,38 +1,46 @@ package com.jero.modules.docking.hiwork.service; -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; import com.jero.modules.docking.hiwork.entity.LawsUnifiedTodoLog; -import com.jero.modules.docking.hiwork.mapper.LawsUnifiedTodoLogMapper; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + /** * *@author liJiaRao *@date 2024-07-12 14:02 */ -@Service -public class LawsUnifiedTodoLogService extends ServiceImpl { - public void add(LawsUnifiedTodoLog lawsUnifiedTodoLog) { - this.save(lawsUnifiedTodoLog); - } +public interface LawsUnifiedTodoLogService extends IService { - public void editById(LawsUnifiedTodoLog lawsUnifiedTodoLog) { - this.updateById(lawsUnifiedTodoLog); - } + /** + * 分页 + * @param lawsUnifiedTodoLog + * @param pageNo + * @param pageSize + * @param req + * @return + */ + Result> getPage(LawsUnifiedTodoLog lawsUnifiedTodoLog, Integer pageNo,Integer pageSize, + HttpServletRequest req); - public void deleteById(String id) { - this.removeById(id); - } + void add(LawsUnifiedTodoLog lawsUnifiedTodoLog); - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } + void editById(LawsUnifiedTodoLog lawsUnifiedTodoLog); - public LawsUnifiedTodoLog queryById(String id) { - LawsUnifiedTodoLog lawsUnifiedTodoLog = this.getById(id); - return lawsUnifiedTodoLog; - } + void deleteById(String id); + + void deleteByIds(List idList); + + LawsUnifiedTodoLog queryById(String id); + + /** + * 发送 + * @param lawsUnifiedTodoLog + * @return + */ + Result send(LawsUnifiedTodoLog lawsUnifiedTodoLog); } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java index 9b223bd9..b6d154ad 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/hiwork/service/impl/UnifiedTodoServiceImpl.java @@ -108,7 +108,6 @@ public class UnifiedTodoServiceImpl implements PushWorkflowIntegrationAPI { }catch (Exception e){ log.error("统一待办推送异常",e); } - } private void push(String url, String jsonString) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index ee8ad482..9f0c5d92 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -205,7 +205,7 @@ public class MarketStandardController { if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { return Result.error("请选择数据!"); } - return marketStandardService.publish(map.get("id")); + return marketStandardService.checkPublish(map.get("id")); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 3ef4175a..e34f2994 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -87,6 +87,13 @@ public interface ILawsMarketStandardService extends IService */ void edit(MarketStandardDetailVO marketStandardDetailVO); + /** + * 验证是否已发布 + * @param id + * @return + */ + Result checkPublish(String id); + /** * 发布 * @param id diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 1ec5a595..aad7e853 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -408,7 +408,26 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl checkPublish(String id) { + LawsMarketStandard lawsMarketStandardOld = getById(id); + if(Objects.isNull(lawsMarketStandardOld)){ + return Result.error("数据不存在"); + } + // 已发布的清单所有人都可以查看，未发布的数据只能作者和管理管查看、编辑、删除 + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) + && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) + && !Objects.equals(lawsMarketStandardOld.getAuthor(),sysUser.getId())){ + return Result.error("没有权限"); + } + if(Objects.equals(lawsMarketStandardOld.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){ + return Result.error("数据已发布"); + } + processMarketStandardReleaseService.checkProcessStatus(id); + return Result.OK(); + } + + @Override public synchronized Result publish(String id) { LawsMarketStandard lawsMarketStandardOld = getById(id); if(Objects.isNull(lawsMarketStandardOld)){