修改消息规则

src/main/java/com/ccsens/ptccsens/api/DeliverController.java

@@ -76,7 +76,7 @@ public class DeliverController {
     @RequestMapping(value = "/checkDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse checkDeliver(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.CheckDeliver> params) throws Exception{
         log.info("查看任务下的交付物--{}",params);
-        deliverService.checkDeliver(params.getParam(), params.getUserId());
+        deliverService.checkDeliver(params.getParam(), params.getUserId(),params.getPhone());
         return JsonResponse.newInstance().ok();
     }
 

src/main/java/com/ccsens/ptccsens/bean/dto/DeliverDto.java

@@ -74,7 +74,7 @@ public class DeliverDto {
         @ApiModelProperty("检查人id")
         private List<Long> checkerList;
         @ApiModelProperty("消息id")
-        private Long msgId;
+        private String msgId;
     }
 
     @Data
@@ -93,7 +93,7 @@ public class DeliverDto {
         @ApiModelProperty("分数")
         private BigDecimal score;
         @ApiModelProperty("消息id")
-        private Long msgId;
+        private String msgId;
     }
 
 

src/main/java/com/ccsens/ptccsens/bean/message/StatusMessageDto.java

@@ -25,11 +25,12 @@ public class StatusMessageDto {
         private String msgId;
     }
 
-    public StatusMessageDto(String type,Long msgId){
+    public StatusMessageDto(String type,String event,String msgId){
         this();
         this.type = type;
+        this.event = event;
         Data d = new Data();
-        d.setMsgId(msgId.toString());
+        d.setMsgId(msgId);
         setData(d);
     }
 }

src/main/java/com/ccsens/ptccsens/config/SpringConfig.java

@@ -100,7 +100,8 @@ public class SpringConfig implements WebMvcConfigurer {
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
 
         registry.addResourceHandler("/uploads/**")
-                .addResourceLocations("file:///home/ptccsens/server/uploads/");
+                .addResourceLocations("file:///home/pt_ccsens/server/uploads/");
+
     }
 
     /**

src/main/java/com/ccsens/ptccsens/service/DeliverService.java

@@ -3,6 +3,7 @@ package com.ccsens.ptccsens.service;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.ptccsens.bean.dto.DeliverDto;
 import com.ccsens.ptccsens.bean.message.NotificationMessageDto;
 import com.ccsens.ptccsens.bean.message.RemindMessageDto;
@@ -15,7 +16,9 @@ import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordCheckMapper;
 import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordFileMapper;
 import com.ccsens.ptccsens.persist.mapper.PluDeliverRecordMapper;
 import com.ccsens.ptccsens.util.BasicsCodeError;
+import com.ccsens.util.bean.message.client.SetSuccessStatusMessage;
 import com.ccsens.util.bean.message.common.MessageConstant;
+import com.ccsens.util.bean.message.common.MessageRule;
 import com.ccsens.util.exception.BaseException;
 import com.ccsensptos.tallsdk.util.MessageUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -157,13 +160,13 @@ public class DeliverService implements IDeliverService {
                 //生成消息内容
                 RemindMessageDto remindMessageDto = new RemindMessageDto(param.getProjectId(),roleId,pluDeliver.getTaskSubId(),pluginId,taskType,"提交交付物");
                 //TODO 发送消息
-                MessageUtil.sendToUser(phoneList,null,remindMessageDto);
+                MessageUtil.sendToUser(phoneList,null,remindMessageDto,MessageConstant.DomainType.User,null);
             });
         }
     }
 
     @Override
-    public void checkDeliver(DeliverDto.CheckDeliver param, Long userId) {
+    public void checkDeliver(DeliverDto.CheckDeliver param, Long userId,String phone) {
         //检查交付物提交记录是否存在
         PluDeliverRecord deliverRecord = deliverRecordMapper.selectByPrimaryKey(param.getDeliverRecordId());
         if(ObjectUtil.isNull(deliverRecord)){
@@ -201,7 +204,7 @@ public class DeliverService implements IDeliverService {
         NotificationMessageDto remindMessageDto = new NotificationMessageDto();
         remindMessageDto.setContent("XXX交付物检查");
         //TODO 发送消息(暂定是通知)
-        MessageUtil.sendToUser(userIdList,null,remindMessageDto);
+        MessageUtil.sendToUser(userIdList,null,remindMessageDto,MessageConstant.DomainType.User,null);
 //        //查找交付物信息
 //        PluDeliver pluDeliver = pluDeliverDao.selectByPrimaryKey(deliverRecord.getDeliverId());
 //        //获取任务的角色信息
@@ -218,10 +221,17 @@ public class DeliverService implements IDeliverService {
 //            });
 //        }
 
+
+
         //TODO 修改消息状态(已处理)
         if(ObjectUtil.isNotNull(param.getMsgId())){
-            StatusMessageDto statusMessageDto = new StatusMessageDto(MessageConstant.ClientMessageType.SetMsgSuccess.name(),param.getMsgId());
+            List<String> phoneList = new ArrayList<>();
-            MessageUtil.sendToUser(userIdList,null,statusMessageDto);
+            phoneList.add(phone);
+            StatusMessageDto statusMessageDto = new StatusMessageDto(MessageConstant.ClientMessageType.SetMsgSuccess.name(),"Remind",param.getMsgId());
+            //发送消息给消息系统，消息处理成功
+            MessageUtil.sendToUser(phoneList,null,new SetSuccessStatusMessage(param.getMsgId()),MessageConstant.DomainType.Server,null);
+            //发送给前端提示消息被处理
+            MessageUtil.sendToUser(phoneList,null,statusMessageDto,MessageConstant.DomainType.User,new MessageRule((byte)0, MessageRule.AckRule.ALWAYS,10,(byte)1,0L));
         }
     }
 

src/main/java/com/ccsens/ptccsens/service/ExportService.java

@@ -47,7 +47,7 @@ public class ExportService implements IExportService {
         wb.write(stream);
         stream.close();
 
-        return PropUtil.notGatewayUrl + "/" + fileName;
+        return PropUtil.imgDomain + "/" + fileName;
     }
 
     /**

src/main/java/com/ccsens/ptccsens/service/IDeliverService.java

@@ -46,7 +46,7 @@ public interface IDeliverService {
      * @param param 检查信息
      * @param userId userId
      */
-    void checkDeliver(DeliverDto.CheckDeliver param, Long userId);
+    void checkDeliver(DeliverDto.CheckDeliver param, Long userId,String phone);
 
     /**
      * 查看交付物提交记录

src/main/java/com/ccsens/ptccsens/service/TallService.java

@@ -150,6 +150,7 @@ public class TallService implements ITallService {
 
         //生成excel数据并导入文件
         String url = exportService.exportWbs(wbsProjectInfo,wbsTaskInfo,wbsRoleInfo);
+
         TallWbsVo.WbsPath wbsPath = new TallWbsVo.WbsPath();
         wbsPath.setUrl(url);
         return wbsPath;
@@ -676,21 +677,24 @@ public class TallService implements ITallService {
         //获取任务列表
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType());
+        PageInfo<TallTaskVo.QueryTask> queryTaskPageInfo = new PageInfo<>(regularTask);
+        if(CollectionUtil.isNotEmpty(queryTaskPageInfo.getList())){
             if(param.getQueryType() == 0){
                 //向上查找任务顺序是倒的，需要改成正序
                 List<TallTaskVo.QueryTask> taskList = new ArrayList<>();
-            for (int i = regularTask.size() - 1; i >= 0; i--) {
+                for (int i = queryTaskPageInfo.getList().size() - 1; i >= 0; i--) {
-                taskList.add(regularTask.get(i));
+                    taskList.add(queryTaskPageInfo.getList().get(i));
                 }
-            regularTask = taskList;
+                queryTaskPageInfo.setList(taskList);
             }
             //查询任务下的插件
-        queryPluginForTask(regularTask);
+            queryPluginForTask(queryTaskPageInfo.getList());
             //查询任务下的检查人
-        queryCheckerOfTask(regularTask);
+            queryCheckerOfTask(queryTaskPageInfo.getList());
             //TODO 查询插件展示信息
-        queryPluginShow(regularTask,user.getId());
+            queryPluginShow(queryTaskPageInfo.getList(),user.getId());
+        }
 
-        return new PageInfo<>(regularTask);
+        return queryTaskPageInfo;
     }
 }

src/main/resources/application-dev.yml

@@ -46,6 +46,6 @@ mybatisCache:
 
 notGatewayUrl: http://101.201.226.163:7320/v1.0
 file:
-  path: /home/ptccsens/server/uploads/
+  path: /home/pt_ccsens/server/uploads/
   domain: https://test.tall.wiki/gateway/ptccsens
-  imgDomain: https://test.tall.wiki/gateway/ptccsens/v1.0/uploads/
+  imgDomain: http://101.201.226.163:7320/v1.0/uploads