添加上传交付物消息

common/src/main/java/com/ccsens/common/bean/message/DeliverMessageWithUpload.java

@@ -0,0 +1,52 @@
+package com.ccsens.common.bean.message;
+
+import com.ccsens.common.util.Constant;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author 逗
+ */
+@Data
+public class DeliverMessageWithUpload {
+    private String type = Constant.MessageType.UPLOAD_DELIVER;
+    private String event;
+
+    public DeliverMessageWithUpload() {
+
+    }
+
+    private Data data;
+
+    @Setter
+    @Getter
+    public static class Data{
+        //任务分解id
+        Long taskId;
+        //任务详情id
+        Long taskDetailId;
+        //交付物id
+        Long deliverId;
+        //角色id（上传的任务所属的角色id）
+        Long roleId;
+        //上传者id(memberId)
+        Long memberId;
+        //上传者名字（成员名）
+        String memberName;
+
+    }
+
+    public DeliverMessageWithUpload(Long taskId, Long taskDetailId, Long deliverId, Long roleId, Long memberId, String memberName){
+        this();
+        Data d = new Data();
+        d.setTaskId(taskId);
+        d.setTaskDetailId(taskDetailId);
+        d.setDeliverId(deliverId);
+        d.setRoleId(roleId);
+        d.setMemberId(memberId);
+        d.setMemberName(memberName);
+        setData(d);
+    }
+
+}

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

@@ -99,6 +99,7 @@ public class DeliverService implements IDeliverService{
             deliverChecker.setStatus((byte)0);
             deliverCheckerDao.insertSelective(deliverChecker);
         }
+        //TODO 发送消息
     }
 
 
@@ -140,6 +141,7 @@ public class DeliverService implements IDeliverService{
         deliverCheck.setRemark(params.getRemark());
         deliverCheck.setScore(params.getScore());
         deliverCheckerDao.updateByPrimaryKeySelective(deliverCheck);
+        //TODO 发送消息
     }
 
 

common/src/main/java/com/ccsens/common/util/Constant.java

@@ -55,11 +55,15 @@ public  class Constant {
     public static final class MessageType {
         /**修改任务状态*/
         public static final String TASK_STATUS = "taskStatus";
+        /**上传交付物*/
+        public static final String UPLOAD_DELIVER = "uploadDeliver";
+        /**检查交付物*/
+        public static final String CHECKER_DELIVER = "checkerDeliver";
     }
 
     public enum ROLE_LEVEL {
-        MEMBER((byte)0,"项目成员"),PM((byte)1,"项目经理"),STAKEHOLDER((byte)2,"干系人"),PIPE((byte)3,"管带")
+        /**系统角色*/
-        ,GOD((byte)4,"上帝");
+        MEMBER((byte)0,"项目成员"),PM((byte)1,"项目经理"),STAKEHOLDER((byte)2,"干系人"),PIPE((byte)3,"管带"),GOD((byte)4,"上帝");
 
         public Byte value;
         public String phase;

signin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common
 

signin/src/main/resources/mapper_dao/ProjectDap.xml

@@ -38,7 +38,7 @@
 				sp.rec_status = 0
 			AND u.user_id = #{userId}
 		)
-		 ORDER BY up.sort
+		 ORDER BY u.sort
     </select>
 
     <select id="querySonProject" resultType="com.ccsens.signin.bean.vo.ProjectVo$QueryProject">