修复Bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -175,16 +175,17 @@ public class TicketController extends BaseController {
 
     @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
-            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , imageUrl:图片地址 "),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
     public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId,
-                                            @RequestBody TpTicket tpTicket,
+                                            @RequestBody String parameter,
                                             HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        responseBean = iTicketService.updateTicketContent(ticketId, tpTicket,userElement.getId());
+        responseBean = iTicketService.updateTicketContent(ticketId, parameter,userElement.getId());
         return responseBean;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -30,7 +30,7 @@ public interface TpMessageMapper {
     /**
      * 查询工单消息
      *
-     *  根据工单ID,模板类型 进行查询
+     *  根据 工单ID,模板类型, 消息类型 进行查询
      *
      * @param tpMessage
      * @return

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

@@ -59,10 +59,10 @@ public interface ITicketService {
 	/**
 	 * 修改 维修/投诉/联系单 内容
 	 * @param ticketId
-	 * @param tpTicket
+	 * @param parameter
 	 * @param userId
 	 */
-	ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId);
+	ResponseBean updateTicketContent(Integer ticketId, String parameter,Integer userId);
 
 	/**
 	 * 终止 维修/投诉/联系单

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

@@ -341,6 +341,9 @@ public class SocialServiceImpl implements SocialServiceI {
      * @throws IOException
      */
     private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId,String type) throws IOException {
+        if (null == imageUrl || "".equals(imageUrl)) {
+            return;
+        }
         String [] imgArr = imageUrl.split(",");
         for (String url  : imgArr) {
             TdImages tdImages = new TdImages();

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

@@ -229,6 +229,7 @@ public class TicketServiceImpl implements ITicketService {
             TpMessage tpMessage = new TpMessage();
             tpMessage.setTicketId(ticket.getId());
             tpMessage.setModelType("1");
+            tpMessage.setMessageType(ticket.getType());
 
             tpMessage = tpMessageMapper.selectTicketMessage(tpMessage);
             tpMessage.setReadStatus("1");
@@ -301,7 +302,10 @@ public class TicketServiceImpl implements ITicketService {
      * @param userId
      * @throws IOException
      */
-    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) throws IOException {
+    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) {
+        if (null == imageUrl || "".equals(imageUrl)) {
+            return;
+        }
         String [] imgArr = imageUrl.split(",");
         for (String img : imgArr) {
             TdImages tdImages = new TdImages();
@@ -338,33 +342,22 @@ public class TicketServiceImpl implements ITicketService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTicketContent(Integer ticketId, TpTicket tpTicket,Integer userId) {
+    public ResponseBean updateTicketContent(Integer ticketId, String parameter,Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        String imageUrl = (String) jsonObject.get("imageUrl");
+
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
+
         // 删除旧图片链接
         Map<String,Object> map = Maps.newHashMap();
         map.put("uuid",ticketId);
         map.put("type","service");
         tdImagesMapper.deleteByUuidAndType(map);
 
-        // 获取图片
-        String [] tdImagesArr = tpTicket.getTdImagesList();
-        List<TdImages> tdImagesList = Lists.newArrayList();
-        if (null != tdImagesArr && tdImagesArr.length > 0) {
-            for (String img : tdImagesArr) {
-                TdImages tdImages = new TdImages();
-                tdImages.setImageUrl(img);
-                tdImages.setCreateTime(new Date());
-                tdImages.setCreateUser(userId);
-                tdImages.setType("service");
-                tdImages.setUuid(ticketId);
-
-                tdImagesList.add(tdImages);
-            }
-            // 插入图片链接
-            tdImagesMapper.insertBatch(tdImagesList);
-        }
-
+        insertTdImage(tpTicket, imageUrl , userId);
 
         TpTicket ticket = tpTicketMapper.selectByPrimaryKey(ticketId);
         ticket.setTicketTitle(tpTicket.getTicketTitle());
@@ -413,8 +406,8 @@ public class TicketServiceImpl implements ITicketService {
         TpMessage tpMessage = new TpMessage();
         tpMessage.setCommunityId(tpTicket.getCommunityId());
         tpMessage.setTicketId(tpTicket.getId());
-        // 消息类型  1：工单类型  2：认证类型  3：管理类型  4： 下载类型
-        tpMessage.setMessageType("1");
+        // 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动
+        tpMessage.setMessageType(tpTicket.getType());
         // 通知方式: APP 内通知
         tpMessage.setAdviceType("1");
         // 模板类型为 消息模板

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

@@ -361,13 +361,10 @@
     select
     <include refid="Base_Column_List"/>
     from tp_message
-    where message_type=1
-    <if test="ticketId != null and ticketId !=''">
-        and ticket_id=#{ticketId}
-    </if>
-    <if test="modelType != null and modelType !=''">
-        and model_type=#{modelType}
-    </if>
+    where
+    message_type=#{messageType}
+    and ticket_id=#{ticketId}
+    and model_type=#{modelType}
   </select>
 
 </mapper>