注释消息提示

blade-service-api/blade-rabbitmq-producer-api/src/main/java/org/springblade/producer/bean/PushMessage.java

@@ -1,12 +1,12 @@
-package org.springblade.producer.bean;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PushMessage {
-    String clientId() default "";
-}
+//package org.springblade.producer.bean;
+//
+//import java.lang.annotation.ElementType;
+//import java.lang.annotation.Retention;
+//import java.lang.annotation.RetentionPolicy;
+//import java.lang.annotation.Target;
+//
+//@Target(ElementType.METHOD)
+//@Retention(RetentionPolicy.RUNTIME)
+//public @interface Message {
+//    String clientId() default "";
+//}

blade-service/blade-business/src/main/java/org/springblade/business/controller/ArchiveFileController.java

@@ -39,7 +39,6 @@ import org.springblade.manager.feign.ArchiveTreeClient;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ProjectClient;
 import org.springblade.manager.vo.ArchiveTreeVO2;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.system.entity.Role;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.beans.BeanUtils;
@@ -163,7 +162,7 @@ public class ArchiveFileController extends BladeController {
     @PostMapping("batchAbolish")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "批量废除")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchAbolish(@RequestParam String ids) {
         //获取所有相关任务记录
         List<Task> taskList = this.taskClient.queryTaskListByFormDataId(ids);
@@ -262,7 +261,7 @@ public class ArchiveFileController extends BladeController {
     @PostMapping("/batchApproval")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "批量上报")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchApproval(@RequestBody StartTaskVO startTaskVO) {
         if (ObjectUtil.isEmpty(SecureUtil.getUserId()) || SecureUtil.getUserId() == -1L) {
             throw new ServiceException("未获取到当前用户信息");
@@ -321,7 +320,7 @@ public class ArchiveFileController extends BladeController {
     @PostMapping("/batchApproval2")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "批量上报")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchApproval2(@RequestBody StartTaskVO startTaskVO) {
         if (ObjectUtil.isEmpty(SecureUtil.getUserId()) || SecureUtil.getUserId() == -1L) {
             throw new ServiceException("未获取到当前用户信息");

blade-service/blade-business/src/main/java/org/springblade/business/controller/ContractLogController.java

@@ -36,7 +36,6 @@ import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ProjectClient;
 import org.springblade.manager.feign.WbsTreeContractClient;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.cache.ParamCache;
 import org.springframework.beans.BeanUtils;
@@ -178,7 +177,7 @@ public class ContractLogController extends BladeController {
             @ApiImplicitParam(name = "nodePrimaryKeyId", value = "当前操作的日志类型ID，即左侧列表的节点primaryKeyId", required = true),
             @ApiImplicitParam(name = "recordTime", value = "当前选择的填写日期，即右侧日期控件所选日期，格式为 yyyy-MM-dd", required = true)
     })
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> oneAbolish(@RequestParam String nodePrimaryKeyId, @RequestParam String recordTime, @RequestParam String contractId) throws IOException {
         //查询数据
         ContractLog log = this.contractLogService.getOne(Wrappers.<ContractLog>lambdaQuery().eq(ContractLog::getWbsNodeId, nodePrimaryKeyId)
@@ -282,7 +281,7 @@ public class ContractLogController extends BladeController {
             @ApiImplicitParam(name = "nodePrimaryKeyId", value = "当前操作的日志类型ID，即左侧列表的节点primaryKeyId", required = true),
             @ApiImplicitParam(name = "recordTime", value = "当前选择的填写日期，即右侧日期控件所选日期，格式为 yyyy-MM-dd", required = true)
     })
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> startTaskTheLog(@RequestBody JSONObject json) {
         if (json != null) {
             StartTaskVO startTaskVO = JSONObject.parseObject(JSONObject.toJSONString(json), StartTaskVO.class);
@@ -399,7 +398,7 @@ public class ContractLogController extends BladeController {
     @PostMapping("/batchAbolish")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "批量废除")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchAbolish(@RequestParam String ids) {
         //获取所有相关任务记录
         List<Task> taskList = this.taskClient.queryTaskListByFormDataId(ids);
@@ -519,7 +518,7 @@ public class ContractLogController extends BladeController {
     @PostMapping("/batchTask")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "批量上报")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
         if (StringUtils.isNotEmpty(startTaskVO.getIds())) {
             //获取数据源id

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -51,7 +51,7 @@ import org.springblade.manager.feign.*;
 import org.springblade.manager.vo.WbsTreeContractTreeVOS;
 import org.springblade.manager.vo.WbsTreeContractVO8;
 import org.springblade.manager.vo.WbsTreePrivateAddVO;
-import org.springblade.producer.bean.PushMessage;
+//import org.springblade.producer.bean.PushMessage;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.DictBiz;
@@ -592,7 +592,7 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/abolishOne")
     @ApiOperationSupport(order = 24)
     @ApiOperation(value = "单个废除")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> abolishOne(@RequestParam String primaryKeyId, @RequestParam String classify, @RequestParam String projectId, @RequestParam String contractId) {
         //查询填报状态
         InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery().eq(InformationQuery::getWbsId, primaryKeyId).eq(InformationQuery::getClassify, classify).eq(InformationQuery::getType, 1));
@@ -616,7 +616,7 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/abolishOne-sj")
     @ApiOperationSupport(order = 24)
     @ApiOperation(value = "单个废除-首件")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> abolishOneSJ(@RequestParam String primaryKeyId, @RequestParam String id, @RequestParam String projectId, @RequestParam String contractId) {
         //查询填报状态
         InformationQuery businessData = this.informationQueryService.getOne(Wrappers.<InformationQuery>lambdaQuery()
@@ -885,7 +885,7 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/taskOne")
     @ApiOperationSupport(order = 22)
     @ApiOperation(value = "填报页单个上报")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> taskOne(@RequestBody StartTaskVO startTaskVO) {
         InformationQuery businessData;
         //此时的ids是当前节点的primaryKeyId但并不是业务数据ID，需要根据ids和classify去查询具体的业务ID
@@ -1036,7 +1036,7 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/batchAbolish")
     @ApiOperationSupport(order = 18)
     @ApiOperation(value = "批量废除", notes = "质检的ids，试验的记录ids")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchAbolish(@RequestParam String ids, String primaryKeyId, @RequestParam String projectId, @RequestParam String contractId) {
         Set<String> aopParamsSet = new HashSet<>();
         aopParamsSet.add(SecureUtil.getUserId() + "," + projectId + "," + contractId);
@@ -1232,7 +1232,7 @@ public class InformationWriteQueryController extends BladeController {
     @PostMapping("/batchTask")
     @ApiOperationSupport(order = 17)
     @ApiOperation(value = "批量上报")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchTask(@RequestBody StartTaskVO startTaskVO) {
         // 1= 代表 试验 流程上报  2=试验 - 委托单上报   其他=质检或别的项目上报
         Long appType = startTaskVO.getTrialSelfInspectionRecordId();

blade-service/blade-business/src/main/java/org/springblade/business/controller/MessageWarningController.java

@@ -37,7 +37,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springframework.web.bind.annotation.*;
@@ -71,7 +70,7 @@ public class MessageWarningController extends BladeController {
     @PostMapping("/setMessageWarningRead")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "标记已读")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> setMessageWarningRead(MessageWarningVO vo) {
         if (vo.getIds() != null && vo.getIds().size() > 0) {
             try {
@@ -200,7 +199,7 @@ public class MessageWarningController extends BladeController {
     @PostMapping("/remove")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @RequestParam String projectId, @RequestParam String contractId) throws IOException {
         if (this.messageWarningService.deleteLogic(Func.toLongList(ids))) {
             Set<String> aopParamsSet = new HashSet<>();

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -52,7 +52,6 @@ import org.springblade.manager.dto.SaveUserInfoByProjectDTO;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ContractRelationJlyz;
 import org.springblade.manager.entity.ProjectInfo;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.resource.feign.CommonFileClient;
 import org.springblade.resource.feign.NewISmsClient;
 import org.springblade.system.cache.ParamCache;
@@ -312,7 +311,7 @@ public class TaskController extends BladeController {
     @PostMapping("/batch-complete-approval-task")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "批量审批")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID)
     public R<Object> batchCompleteApprovalTask(@RequestBody BatchTaskVO batchTaskVO) throws IOException {
         String taskIds = batchTaskVO.getTaskIds();
         String parallelProcessInstanceIds = batchTaskVO.getParallelProcessInstanceIds();
@@ -394,7 +393,7 @@ public class TaskController extends BladeController {
     @PostMapping("/batch-report-task-archive")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "批量上报-档案")
-    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
     public R<Object> batchReportTaskArchive(@RequestBody ArchiveTaskBatchReportDTO archiveTaskBatchReportDTO) {
         if (ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getDataIds())
                 || ObjectUtil.isEmpty(archiveTaskBatchReportDTO.getBatch())
@@ -554,7 +553,7 @@ public class TaskController extends BladeController {
     @PostMapping("/batch-repeal-task-archive")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "批量撤销（废除）-档案")
-    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
     public R<Object> batchRepealTaskArchive(@RequestBody ArchiveTaskBatchRepealDTO repealDTO) {
         Set<String> aopParamsSet = new HashSet<>();
         if (repealDTO.getType().equals(1)) {
@@ -626,7 +625,7 @@ public class TaskController extends BladeController {
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "批量审批（档案 垂直审批）")
     @Transactional
-    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.ARCHIVE_CLIENT_ID)
     public R<Object> batchCompleteApprovalTaskArchive(@RequestBody TaskArchiveOuterLayerDTO taskArchiveOuterLayerDTO) {
         if (ObjectUtil.isEmpty(SecureUtil.getUser()) || ObjectUtil.isEmpty(SecureUtil.getUserId()) || SecureUtil.getUserId().equals(-1L)) {
             throw new ServiceException("未获取到当前登陆的用户信息，操作失败");

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionController.java

@@ -33,7 +33,6 @@ import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.feign.ContractClient;
 import org.springblade.manager.feign.ProjectAssignmentUserClient;
 import org.springblade.manager.feign.ProjectClient;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
@@ -226,7 +225,7 @@ public class UserOpinionController extends BladeController {
     @PostMapping("/saveUserOpinion")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增工单服务信息", notes = "传入userOpinion")
-    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID + "," + ClientIdConstant.MANAGER_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.BUSINESS_CLIENT_ID + "," + ClientIdConstant.MANAGER_CLIENT_ID)
     public R<Object> saveUserOpinion(@Valid @RequestBody UserOpinionVO userOpinionVo) {
         Set<String> aopParamsSet = new HashSet<>();
         //设置用户信息

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -79,7 +79,6 @@ import org.springblade.meter.service.impl.*;
 import org.springblade.meter.utils.CollectionUtils;
 import org.springblade.meter.utils.FileUtils;
 import org.springblade.meter.vo.*;
-import org.springblade.producer.bean.PushMessage;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.user.entity.User;
@@ -206,7 +205,7 @@ public class TaskController extends BladeController {
     @PostMapping("/report")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "任务上报", notes = "（中期计量申请、材料计量单、开工预付款计量单、变更令）传入MeterApprovalDTO")
-    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
     @Transactional(rollbackFor = Exception.class)
     public R<Object> approval(@RequestBody MeterApprovalDTO approvalDTO) {
         if (ObjectUtil.isEmpty(approvalDTO.getBatch()) || ObjectUtil.isEmpty(approvalDTO.getPeriodId()) || ObjectUtil.isEmpty(approvalDTO.getProjectId()) || ObjectUtil.isEmpty(approvalDTO.getContractId()) || ObjectUtil.isEmpty(approvalDTO.getTaskName()) || ObjectUtil.isEmpty(approvalDTO.getRestrictDay())) {
@@ -777,7 +776,7 @@ public class TaskController extends BladeController {
     @PostMapping("/repeal")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "任务废除（任务撤销、驳回审批）", notes = "按一期废除，即按整条任务废除（中期计量申请、材料计量单、开工预付款计量单、变更令、任务查看-废除任务）")
-    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
     @Transactional(rollbackFor = Exception.class)
     public R<Object> repeal(@RequestBody TaskRepealDTO taskRepealDTO) throws JsonProcessingException {
         /*加锁*/
@@ -2494,7 +2493,7 @@ public class TaskController extends BladeController {
     @PostMapping("/approve")
     @ApiOperationSupport(order = 19)
     @ApiOperation(value = "同意审批（批量审批）", notes = "传入TaskApproveDTO")
-    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
+//    @PushMessage(clientId = ClientIdConstant.METER_CLIENT_ID)
     @Transactional
     public R<Object> approve(@RequestBody TaskApproveDTO dto) {
         if (ObjectUtil.isEmpty(dto.getTaskId()) || ObjectUtil.isEmpty(dto.getProjectId()) || ObjectUtil.isEmpty(dto.getContractId()) || ObjectUtil.isEmpty(SecureUtil.getUserId())) {