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

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TaFaceController.java → CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -4,7 +4,8 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.model.TaAgreement;
 import com.community.huiju.model.TaFace;
-import com.community.huiju.service.TaFaceServicel;
+import com.community.huiju.service.FaceServicel;
+import com.community.huiju.service.FaceServicel;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,13 +22,12 @@ import javax.servlet.http.HttpSession;
 @RefreshScope
 @RequestMapping("/")
 @Api(value = "人脸相关API", description = "人脸相关API")
-public class TaFaceController {
+public class FaceController {
     @Autowired
-    private TaFaceServicel faceServicel;
+    private FaceServicel faceServicel;
 
     @ApiOperation(value = "添加人脸图片", notes = "添加人脸图片")
     @ApiImplicitParams({
-//            @ApiImplicitParam(paramType = "query",dataType = "String",name = "faceImg",value = "上传的图片"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addFace",method = RequestMethod.POST)
@@ -42,7 +42,6 @@ public class TaFaceController {
 
     @ApiOperation(value = "修改人脸图片", notes = "修改人脸图片")
     @ApiImplicitParams({
-    /*        @ApiImplicitParam(paramType = "query",dataType = "String",name = "faceImg",value = "上传的图片"),*/
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/upDateFace",method = RequestMethod.PUT)

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

@@ -162,7 +162,9 @@ public class SocialController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
-    public ResponseBean addTransaction(@RequestBody String paramets, HttpSession session) throws IOException {
+    @ResponseBody
+    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/TaFaceServicel.java → CODE/smart-community/app-api/src/main/java/com/community/huiju/service/FaceServicel.java

@@ -4,7 +4,7 @@ package com.community.huiju.service;
 import com.community.commom.mode.ResponseBean;
 import org.springframework.web.multipart.MultipartFile;
 
-public interface TaFaceServicel {
+public interface FaceServicel {
     /**
      * 添加人脸
      * @param userId

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

@@ -71,7 +71,8 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException;
+    ResponseBean addAllTransaction(Integer userId, String paramets)throws IOException;
+
 
 	/**
 	 * 获取当前用户发布所有的帖子

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaFaceServicelimpl.java → CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -12,7 +12,7 @@ import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaSysRole;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.service.ImageServiceI;
-import com.community.huiju.service.TaFaceServicel;
+import com.community.huiju.service.FaceServicel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.Date;
 
 @Service
-public class TaFaceServicelimpl implements TaFaceServicel {
+public class FaceServicelimpl implements FaceServicel {
 
 
     @Autowired

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

@@ -229,9 +229,7 @@ public class SocialServiceImpl implements SocialServiceI {
     @Transactional
     @Override
     public ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException {
-
         ResponseBean response = new ResponseBean();
-
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String transactionTitle = (String) jsonObject.get("title");
         String transactionContent = (String) jsonObject.get("content");
@@ -272,7 +270,6 @@ 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, userId);
-
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
             return response;