提交分支

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

@@ -23,8 +23,6 @@ import org.springframework.web.multipart.MultipartFile;
 @Api(value = "图片操作API", description = "图片操作API")
 public class ImageController {
 
-
-
     @Autowired
     private ImageServiceI imageService;
 

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

@@ -158,17 +158,15 @@ public class SocialController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "title:小区标题，content：小区内容, type:0二手,1求购,2租赁"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="title:小区标题, imageUrl:图片URL地址, content:小区内容, type:0二手,1求购,2租赁"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @PostMapping(value = "/addTransaction", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    @ResponseBody
-    public ResponseBean addTransaction(@RequestBody String paramets, @ApiParam(value = "file" ,required = true) MultipartFile uploadFile, HttpSession session) throws IOException {
+    @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
+    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();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets, uploadFile);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
         return response;
     }
 

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

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

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

@@ -228,7 +228,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets, MultipartFile uploadFile) throws IOException {
+    public ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException {
 
         ResponseBean response = new ResponseBean();
 
@@ -236,6 +236,7 @@ public class SocialServiceImpl implements SocialServiceI {
         String transactionTitle = (String) jsonObject.get("title");
         String transactionContent = (String) jsonObject.get("content");
         String  type= (String) jsonObject.get("type");
+        String imageUrl = (String) jsonObject.get("imageUrl");
 
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
         TpTransaction tpTransaction = new TpTransaction();
@@ -270,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, uploadFile, type, userId);
+            insertTdImage(tpTransaction, imageUrl, type, userId);
 
             TpTransaction tpTransaction1=tpTransactionMapper.getById(tpTransaction.getId());
             response.addSuccess(tpTransaction1);
@@ -280,10 +281,9 @@ public class SocialServiceImpl implements SocialServiceI {
         return response;
     }
 
-    private void insertTdImage(TpTransaction tpTransaction, MultipartFile uploadFile, String type, Integer userId) throws IOException {
+    private void insertTdImage(TpTransaction tpTransaction, String imageUrl, String type, Integer userId) throws IOException {
         TdImages tdImages = new TdImages();
         Integer uuId = tpTransaction.getId();
-        String imageUrl = imageServiceI.getImageUrl(uploadFile);
         tdImages.setImageUrl(imageUrl);
         tdImages.setType(type);
         tdImages.setUuid(uuId);