把工单添加到 消息表

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpMessage.java

@@ -5,6 +5,8 @@ import java.util.Date;
 public class TpMessage {
     private Integer id;
 
+    private Integer ticketId;
+
     private Integer communityId;
 
     private String messageType;
@@ -45,6 +47,14 @@ public class TpMessage {
         this.id = id;
     }
 
+    public Integer getTicketId() {
+        return ticketId;
+    }
+
+    public void setTicketId(Integer ticketId) {
+        this.ticketId = ticketId;
+    }
+
     public Integer getCommunityId() {
         return communityId;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java

@@ -42,7 +42,7 @@ public interface ITicketService {
 
 
 	/**
-	 * 添加报修
+	 * 添加 维修/投诉/联系单
 	 * @param userId
 	 * @param parameter
 	 * @return
@@ -57,7 +57,7 @@ public interface ITicketService {
 	Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
 
 	/**
-	 * 修改报修内容
+	 * 修改 维修/投诉/联系单 内容
 	 * @param ticketId
 	 * @param tpTicket
 	 * @param type
@@ -66,7 +66,7 @@ public interface ITicketService {
 	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type,Integer userId);
 
 	/**
-	 * 终止报修
+	 * 终止 维修/投诉/联系单
 	 * @param communityId
 	 * @param ticketId
 	 * @return

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -44,6 +44,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TdImagesMapper tdImagesMapper;
 
+    @Autowired
+    private TpMessageMapper tpMessageMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -233,6 +236,10 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecord.setCreateDate(new Date());
 
         tpTicketRecordMapper.insertSelective(tpTicketRecord);
+
+        // 把工单信息添加到消息表
+        insertTicketMessage(tpTicket,userId);
+
         response.addSuccess(tpTicketReco);
         return response;
     }
@@ -320,4 +327,42 @@ public class TicketServiceImpl implements ITicketService {
             return responseBean;
         }
     }
+
+    /**
+     * 公共方法
+     *      把工单插入消息表
+     * @param tpTicket 工单
+     * @param userId 用户id
+     */
+    private TpMessage insertTicketMessage(TpTicket tpTicket,Integer userId) {
+
+        TpMessage tpMessage = new TpMessage();
+        tpMessage.setCommunityId(tpTicket.getCommunityId());
+        tpMessage.setTicketId(tpTicket.getId());
+        tpMessage.setMessageType(tpTicket.getType());
+        // 通知方式: APP 内通知
+        tpMessage.setAdviceType("1");
+        // 模板类型为 消息模板
+        tpMessage.setModelType("1");
+        tpMessage.setUuid(userId);
+        // 接收人类型: APP用户
+        tpMessage.setUuidType("1");
+        // 来源: APP 端用户
+        tpMessage.setSource("1");
+        // 这里的消息内容对应, 工单标题
+        tpMessage.setMessageContent(tpTicket.getTicketTitle());
+        tpMessage.setStatus("1");
+        // 阅读状态: 0未阅读
+        tpMessage.setReadStatus("0");
+        tpMessage.setCreateUser(userId);
+        tpMessage.setCreateDate(new Date());
+        tpMessage.setUpdateUser(userId);
+        tpMessage.setUpdateDate(new Date());
+
+        tpMessageMapper.insertSelective(tpMessage);
+
+        return tpMessage;
+
+    }
+
 }

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.community.huiju.dao.TpMessageMapper" >
   <resultMap id="BaseResultMap" type="com.community.huiju.model.TpMessage" >
     <id column="id" property="id" jdbcType="INTEGER" />
+    <id column="ticket_id" property="ticketId" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="message_type" property="messageType" jdbcType="CHAR" />
     <result column="advice_type" property="adviceType" jdbcType="CHAR" />
@@ -21,7 +22,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, message_type, advice_type, model_type, uuid, uuid_type, source, 
+    id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
     message_content, status, result, meaasge_type_id, read_status, create_user, create_date, 
     update_user, update_date
   </sql>
@@ -36,25 +37,28 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpMessage" >
-    insert into tp_message (id, community_id, message_type, 
+    insert into tp_message (id, ticket_id, community_id, message_type,
       advice_type, model_type, uuid, 
       uuid_type, source, message_content, 
       status, result, meaasge_type_id, 
       read_status, create_user, create_date, 
       update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{ticketId,jdbcType=INTEGER},#{communityId,jdbcType=INTEGER}, #{messageType,jdbcType=CHAR},
       #{adviceType,jdbcType=CHAR}, #{modelType,jdbcType=CHAR}, #{uuid,jdbcType=INTEGER}, 
       #{uuidType,jdbcType=CHAR}, #{source,jdbcType=CHAR}, #{messageContent,jdbcType=VARCHAR}, 
       #{status,jdbcType=CHAR}, #{result,jdbcType=VARCHAR}, #{meaasgeTypeId,jdbcType=VARCHAR}, 
       #{readStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpMessage" useGeneratedKeys="true" keyProperty="id" >
     insert into tp_message
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
         id,
       </if>
+      <if test="ticketId != null">
+        ticket_id,
+      </if>
       <if test="communityId != null" >
         community_id,
       </if>
@@ -108,6 +112,9 @@
       <if test="id != null" >
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="ticketId != null">
+        #{ticketId,jdbcType=INTEGER},
+      </if>
       <if test="communityId != null" >
         #{communityId,jdbcType=INTEGER},
       </if>
@@ -161,6 +168,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpMessage" >
     update tp_message
     <set >
+      <if test="ticketId != null">
+        ticket_id = #{ticketId,jdbcType=INTEGER},
+      </if>
       <if test="communityId != null" >
         community_id = #{communityId,jdbcType=INTEGER},
       </if>
@@ -214,7 +224,8 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpMessage" >
     update tp_message
-    set community_id = #{communityId,jdbcType=INTEGER},
+    set ticket_id = #{ticketId,jdbcType=INTEGER},
+      community_id = #{communityId,jdbcType=INTEGER},
       message_type = #{messageType,jdbcType=CHAR},
       advice_type = #{adviceType,jdbcType=CHAR},
       model_type = #{modelType,jdbcType=CHAR},