Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

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

@@ -21,6 +21,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.util.List;
 
 @RestController
@@ -125,12 +126,12 @@ public class TicketController {
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "ticketTitle:工单内容,ticketContent:小区标题，repairType：0:公共区域  1: 房屋质量  2:户内设施 "),
+                    "ticketTitle:工单内容,ticketContent:小区标题，repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) {
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();

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

@@ -5,6 +5,7 @@ import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTicketRecordComment;
 import com.community.huiju.vo.TpTicketVO;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -46,7 +47,7 @@ public interface ITicketService {
 	 * @param parameter
 	 * @return
 	 */
-    ResponseBean addAiTicketService(Integer userId,String parameter);
+    ResponseBean addAiTicketService(Integer userId,String parameter) throws IOException;
 	
 	/**
 	 * 回复工单

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

@@ -271,7 +271,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getRoleName()) || Constant.OWNER.equals(sysRole.getRoleName()))){
             tpTransactionMapper.insertSelective(tpTransaction);
-            insertTdImage(tpTransaction, imageUrl, type, userId);
+            insertTdImage(tpTransaction, imageUrl, userId);
 
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
@@ -281,11 +281,11 @@ public class SocialServiceImpl implements SocialServiceI {
         return response;
     }
 
-    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, String type, Integer userId) throws IOException {
+    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, Integer userId) throws IOException {
         TdImages tdImages = new TdImages();
         Integer uuId = tpTransaction.getId();
         tdImages.setImageUrl(imageUrl);
-        tdImages.setType(type);
+        tdImages.setType(Constant.SOCIAL);
         tdImages.setUuid(uuId);
         tdImages.setCreateUser(userId);
         tdImages.setCreateTime(new Date());

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

@@ -4,10 +4,7 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpTicketMapper;
-import com.community.huiju.dao.TpTicketRecordCommentMapper;
-import com.community.huiju.dao.TpTicketRecordMapper;
+import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.ITicketService;
 import com.community.huiju.vo.TpTicketVO;
@@ -20,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +42,9 @@ public class TicketServiceImpl implements ITicketService {
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
     @Override
     public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
@@ -177,12 +178,13 @@ public class TicketServiceImpl implements ITicketService {
     }
 
     @Override
-    public ResponseBean addAiTicketService(Integer userId, String parameter) {
+    public ResponseBean addAiTicketService(Integer userId, String parameter) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         String ticketContent = (String) jsonObject.get("ticketContent");
         String ticketTitle = (String) jsonObject.get("ticketTitle");
         String repairType = (String) jsonObject.get("repairType");
+        String imageUrl = (String) jsonObject.get("imageUrl");
 
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
 
@@ -198,7 +200,10 @@ public class TicketServiceImpl implements ITicketService {
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
 
+
         tpTicketMapper.insertSelective(tpTicket);
+        insertTdImage(tpTicket, imageUrl, userId);
+
         Integer id=tpTicket.getId();
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
@@ -213,6 +218,18 @@ public class TicketServiceImpl implements ITicketService {
         response.addSuccess(tpTicketReco);
         return response;
     }
+
+    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) throws IOException {
+        TdImages tdImages = new TdImages();
+        Integer uuId = tpTicket.getId();
+        tdImages.setImageUrl(imageUrl);
+        tdImages.setType(Constant.SERVICE);
+        tdImages.setUuid(uuId);
+        tdImages.setCreateUser(userId);
+        tdImages.setCreateTime(new Date());
+        tdImagesMapper.insertSelective(tdImages);
+    }
+
     /**
      * 回复工单
      * @param tpTicketRecordComment

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -87,4 +87,9 @@ public class Constant {
     /** banner的类型 文章 **/
     public static final String BANNER_TYPE_ARTICLE = "2";
 
+    /**图片社交类型**/
+    public static final String SOCIAL = "social";
+
+    /**图片服务类型**/
+    public static final String SERVICE = "service";
 }