fix:87396

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<LawsUnifiedTodoLog, LawsUnifiedTodoLogService> {
+public class LawsUnifiedTodoLogController extends JeroController<LawsUnifiedTodoLog, LawsUnifiedTodoLogServiceImpl> {
     /**
      * 服务对象
      */
@@ -51,10 +52,7 @@ public class LawsUnifiedTodoLogController extends JeroController<LawsUnifiedTodo
                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                            HttpServletRequest req) {
-        QueryWrapper<LawsUnifiedTodoLog> queryWrapper = QueryGenerator.initQueryWrapper(lawsUnifiedTodoLog, req.getParameterMap());
+        return lawsUnifiedTodoLogService.getPage(lawsUnifiedTodoLog,pageNo,pageSize,req);
-        Page<LawsUnifiedTodoLog> page = new Page<>(pageNo, pageSize);
-        IPage<LawsUnifiedTodoLog> pageList = lawsUnifiedTodoLogService.page(page, queryWrapper);
-        return Result.OK(pageList);
     }
 
     /**
@@ -155,4 +153,14 @@ public class LawsUnifiedTodoLogController extends JeroController<LawsUnifiedTodo
     }
 
 
+    /**
+     * 发送
+     */
+    @AutoLog(value = "统一代办推送日志表-发送")
+    @ApiOperation(value = "统一代办推送日志表-发送", notes = "统一代办推送日志表-发送")
+    @PostMapping(value = "/send")
+    public Result<String> send(@RequestBody LawsUnifiedTodoLog lawsUnifiedTodoLog) {
+        return lawsUnifiedTodoLogService.send(lawsUnifiedTodoLog);
+    }
+
 }

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;
 
-}
+}

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 com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
+import com.jero.common.api.vo.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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 interface LawsUnifiedTodoLogService extends IService<LawsUnifiedTodoLog> {
-public class LawsUnifiedTodoLogService extends ServiceImpl<LawsUnifiedTodoLogMapper, LawsUnifiedTodoLog> {
-    public void add(LawsUnifiedTodoLog lawsUnifiedTodoLog) {
-        this.save(lawsUnifiedTodoLog);
-    }
 
-    public void editById(LawsUnifiedTodoLog lawsUnifiedTodoLog) {
+    /**
-        this.updateById(lawsUnifiedTodoLog);
+     * 分页
-    }
+     * @param lawsUnifiedTodoLog
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    Result<IPage<LawsUnifiedTodoLog>> getPage(LawsUnifiedTodoLog lawsUnifiedTodoLog, Integer pageNo,Integer pageSize,
+                                               HttpServletRequest req);
 
-    public void deleteById(String id) {
+    void add(LawsUnifiedTodoLog lawsUnifiedTodoLog);
-        this.removeById(id);
-    }
 
-    public void deleteByIds(List<String> idList) {
+    void editById(LawsUnifiedTodoLog lawsUnifiedTodoLog);
-        for (String id : idList) {
-            deleteById(id);
-        }
-    }
 
-    public LawsUnifiedTodoLog queryById(String id) {
+    void deleteById(String id);
-        LawsUnifiedTodoLog lawsUnifiedTodoLog = this.getById(id);
+
-        return lawsUnifiedTodoLog;
+    void deleteByIds(List<String> idList);
-    }
+
+    LawsUnifiedTodoLog queryById(String id);
+
+    /**
+     * 发送
+     * @param lawsUnifiedTodoLog
+     * @return
+     */
+    Result<String> send(LawsUnifiedTodoLog lawsUnifiedTodoLog);
 }

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) {

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"));
     }
 
     /**

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java

@@ -87,6 +87,13 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      */
     void edit(MarketStandardDetailVO marketStandardDetailVO);
 
+    /**
+     * 验证是否已发布
+     * @param id
+     * @return
+     */
+    Result<?> checkPublish(String id);
+
     /**
      * 发布
      * @param id

laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java

@@ -408,7 +408,26 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    @Transactional(rollbackFor = JeroBootException.class)
+    public synchronized Result<?> 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)){