合并本地分支

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

@@ -302,7 +302,7 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:小区id,title:小区标题，content：小区内容"),
+                    "id:帖子id，imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
@@ -314,6 +314,19 @@ public class SocialController extends BaseController {
         return response;
     }
 
+    @ApiOperation(value = "删除二手租赁帖子", notes = "删除二手租赁帖子")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "id:帖子id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/deleteTransaction/{Id}", method = RequestMethod.PUT)
+    public ResponseBean deleteTransaction(HttpSession session, @RequestBody String paramets) {
+        ResponseBean response = socialServiceI.deleteransaction(paramets);
+        return response;
+    }
+
+
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),

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

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TdImages;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -36,4 +37,11 @@ public interface TdImagesMapper {
      * @return
      */
     int insertBatch(List<TdImages> list);
+
+    /**
+     * 修改时删除当前图片
+     * @param uuid
+     * @param type
+     */
+    void deleteTdImages(@Param("uuid") Integer uuid, @Param("type") String type);
 }

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

@@ -135,4 +135,11 @@ public interface SocialServiceI {
 	 * @return
 	 */
 	ResponseBean cancelSignActivity(Integer activityId, Integer communityId, Integer userId);
+
+	/**
+	 * 删除二手租赁帖子
+ 	 * @param paramets
+	 * @return
+	 */
+	ResponseBean deleteransaction(String paramets);
 }

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

@@ -382,17 +382,45 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean updateTransaction(String paramets,Integer userId) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String id = (String) jsonObject.get("id");
-        String transactionTitle = (String) jsonObject.get("title");
-        String transactionContent = (String) jsonObject.get("content");
+        String transactionTitle = (String) jsonObject.get("transactionTitle");
+        String transactionContent = (String) jsonObject.get("transactionContent");
+        String imageUrl = (String) jsonObject.get("imageUrl");
+        TpTransaction tpTransaction = JSONObject.parseObject(paramets,TpTransaction.class);
+
+        tdImagesMapper.deleteTdImages( Integer.valueOf(id),Constant.TRANSACTION);
+        try {
+            insertTdImage(tpTransaction, imageUrl, userId,Constant.TRANSACTION);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException("图片修改异常");
+        }
         tpTransactionMapper.updateTransaction(Integer.valueOf(id),transactionTitle,transactionContent,userId);
         response.addSuccess("修改成功");
         return response;
     }
 
+    @Override
+    public ResponseBean deleteransaction(String paramets) {
+        ResponseBean responseBean= new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(paramets);
+        String id = (String) jsonObject.get("id");
+        TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
+        if(null!= tpTransaction) {
+            tpTransaction.setStatus("0");
+            tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
+            responseBean.addSuccess("删除成功");
+        }else {
+            responseBean.addSuccess("当前ID不存在");
+        }
+        return responseBean;
+        }
+
+
     @Override
     public void accessTicket(Integer communityId, TpTicket tpTicket, String ticketId, Integer userId) {
         //修改工单内容和评分
@@ -439,7 +467,8 @@ public class SocialServiceImpl implements SocialServiceI {
         responseBean.addSuccess("取消报名成功");
         return responseBean;
     }
-    
+
+
     public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId,String remark){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名

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

@@ -130,4 +130,9 @@
 
   </insert>
 
+  <delete id="deleteTdImages" parameterType="map" >
+    delete from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+  </delete>
+
 </mapper>