合并本地

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

@@ -302,27 +302,29 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:帖子id，imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+                    "imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction(HttpSession session, @RequestBody String paramets) {
+    @RequestMapping(value = "/updateTransaction/{id}", method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(paramets, userId);
+        ResponseBean response = socialServiceI.updateTransaction(paramets,userId,Integer.valueOf(id));
         return response;
     }
 
     @ApiOperation(value = "删除二手租赁帖子", notes = "删除二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:帖子id"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", 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);
+    @RequestMapping(value = "/deleteTransaction/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteTransaction(HttpSession session, @PathVariable("id") String id) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userId);
         return response;
     }
 

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

@@ -110,7 +110,7 @@ public interface SocialServiceI {
 	/**
 	 * 修改当前帖子
 	 */
-	ResponseBean updateTransaction(String paramets,Integer userId);
+	ResponseBean updateTransaction(String paramets,Integer userId,Integer id);
 
 	/**
 	 * 评价工单以及评分
@@ -138,8 +138,8 @@ public interface SocialServiceI {
 
 	/**
 	 * 删除二手租赁帖子
- 	 * @param paramets
+ 	 * @param id
 	 * @return
 	 */
-	ResponseBean deleteransaction(String paramets);
+	ResponseBean deleteransaction(Integer id,Integer userid);
 }

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

@@ -383,34 +383,36 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTransaction(String paramets,Integer userId) {
+    public ResponseBean updateTransaction(String paramets,Integer userId,Integer id) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String id = (String) jsonObject.get("id");
         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);
+        TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+        TpTransaction taUser = tpTransactionMapper.getById(id);
+        if (null != taUser && userId.equals(taUser.getTaUserId())) {
+            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;
 
-        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("修改成功");
+        response.addError("操作失败");
         return response;
     }
 
     @Override
-    public ResponseBean deleteransaction(String paramets) {
+    public ResponseBean deleteransaction(Integer id,Integer userId) {
         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) {
+        if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");

文档/MYSQL/smartCommunity.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542770145" Name="smartCommunity" Objects="655" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542706044</a:ModificationDate>
+<a:ModificationDate>1542791427</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-21601,-60687), (-4813,-54689))</a:Rect>
+<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -9335,9 +9335,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>type</a:Code>
 <a:CreationDate>1539162638</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539591244</a:ModificationDate>
+<a:ModificationDate>1542791171</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>类型    0 代表 报修  1 代表 投诉  2代表 联系单   字典</a:Comment>
+<a:Comment>类型    2 代表 报修  1 代表 投诉  3代表 联系单   字典</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542770145" Name="smartCommunity" Objects="655" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1542791427" Name="smartCommunity" Objects="656" Symbols="78" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5945,9 +5945,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o159">
 <a:CreationDate>1542706044</a:CreationDate>
-<a:ModificationDate>1542706044</a:ModificationDate>
+<a:ModificationDate>1542791427</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-21601,-60687), (-4813,-54689))</a:Rect>
+<a:Rect>((-22201,-62967), (-5413,-56969))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -9335,9 +9335,9 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:Code>type</a:Code>
 <a:CreationDate>1539162638</a:CreationDate>
 <a:Creator>szc</a:Creator>
-<a:ModificationDate>1539591244</a:ModificationDate>
+<a:ModificationDate>1542791171</a:ModificationDate>
 <a:Modifier>szc</a:Modifier>
-<a:Comment>类型    0 代表 报修  1 代表 投诉  2代表 联系单   字典</a:Comment>
+<a:Comment>类型    2 代表 报修  1 代表 投诉  3代表 联系单   字典</a:Comment>
 <a:DataType>char(1)</a:DataType>
 <a:Length>1</a:Length>
 </o:Column>