合并本地分支

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

@@ -42,13 +42,5 @@ public class AgreementController {
         return responseBean;
     }
 
-    @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
-    @RequestMapping(value = "/allTpAnnouncementTel",method = RequestMethod.GET)
-    public ResponseBean getTpAnnouncementTel(){
-        ResponseBean responseBean = new ResponseBean();
-        ResponseBean agreement = agreementService.getTpAnnouncementTel();
-        responseBean.addSuccess(agreement);
-        return responseBean;
-    }
 
 }

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

@@ -35,9 +35,9 @@ public class SocialController {
 
     @RequestMapping(value = "/announcement/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
-    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("id") Integer id, HttpSession session){
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("id") Integer id, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
@@ -48,63 +48,64 @@ public class SocialController {
 
     @RequestMapping(value = "/sign/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "活动报名接口", notes = "活动报名接口")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-                         @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id")})
-    public ResponseBean SignActivity(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId")Integer activityId, HttpSession session){
+
+
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动Id")})
+    public ResponseBean SignActivity(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = socialServiceI.findTaUserInfo(activityId, communityId, userId);
         return responseBean;
     }
-    
+
     @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "公告标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
-    @RequestMapping(value = "/announcements/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getAnnouncements(@PathVariable Integer communityId,@RequestParam String title,
-                                         @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+    @RequestMapping(value = "/announcements/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer communityId, @RequestParam String title,
+                                         @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId,title,pageNum,pageSize);
+        List<TpAnnouncement> announcementList = socialServiceI.getAnnouncements(communityId, title, pageNum, pageSize);
         responseBean.addSuccess(announcementList);
         return responseBean;
     }
 
     @ApiOperation(value = "获取公告轮播图", notes = "获取公告轮播图")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区id")
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区id")
     })
-    @RequestMapping(value = "/announcement/Img/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getAnnouncement(@PathVariable(value = "communityId")Integer communityId ){
+    @RequestMapping(value = "/announcement/Img/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getAnnouncement(@PathVariable(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         List<TpAnnouncement> agreement = socialServiceI.getAnnouncement(communityId);
         responseBean.addSuccess(agreement);
         return responseBean;
     }
 
-    
+
     @ApiOperation(value = "按小区获取分页活动列表", notes = "按小区获取分页活动列表,公告标题模糊查询")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "title", value = "活动标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
-    @RequestMapping(value = "/activitys/{communityId}",method = RequestMethod.GET)
-    public ResponseBean getActivitys(@PathVariable Integer communityId,@RequestParam String title,
-                                     @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+    @RequestMapping(value = "/activitys/{communityId}", method = RequestMethod.GET)
+    public ResponseBean getActivitys(@PathVariable Integer communityId, @RequestParam String title,
+                                     @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
-        List<TpActivity> activityList = socialServiceI.getActivitys(communityId,title,pageNum,pageSize);
+        List<TpActivity> activityList = socialServiceI.getActivitys(communityId, title, pageNum, pageSize);
         responseBean.addSuccess(activityList);
         return responseBean;
     }
-    
+
     @ApiOperation(value = "论坛活动帖子详情", notes = "获取论坛活动帖子详情")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
-    @RequestMapping(value = "/activity/{communityId}", method = RequestMethod.GET)
-    public ResponseBean findActivityDetail(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session){
+    public ResponseBean findActivityDetail(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();
@@ -114,27 +115,27 @@ public class SocialController {
     }
 
     @ApiOperation(value = "二手租赁详情", notes = "二手租赁详情")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "activityId", value = "活动帖子id")})
     @RequestMapping(value = "/secondHand/{communityId}", method = RequestMethod.GET)
-    public ResponseBean findUsedDetails(@PathVariable(value = "communityId")Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session){
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId, @RequestParam("activityId") Integer activityId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId,userId);
+        TpTransaction activity = socialServiceI.findUsedDetails(activityId, communityId, userId);
         responseBean.addSuccess(activity);
         return responseBean;
     }
 
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/getAllTransaction/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getAllPosts(@PathVariable("communityId")Integer communityId, @RequestParam("type") String type,
-                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+    public ResponseBean getAllPosts(@PathVariable("communityId") Integer communityId, @RequestParam("type") String type,
+                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         List<TpTransaction> tpTransactions = socialServiceI.findAllTransaction(communityId, type, pageNum, pageSize);
         responseBean.addSuccess(tpTransactions);
@@ -142,10 +143,10 @@ public class SocialController {
     }
 
     @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id")})
     @RequestMapping(value = "/stopTicket/{communityId}", method = RequestMethod.GET)
-    public ResponseBean stopTicket(@PathVariable("communityId")Integer communityId, @RequestParam("ticketId")Integer ticketId, HttpSession session){
+    public ResponseBean stopTicket(@PathVariable("communityId") Integer communityId, @RequestParam("ticketId") Integer ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = socialServiceI.stopTpTicketRecord(communityId, ticketId, userId);
@@ -153,11 +154,11 @@ public class SocialController {
     }
 
     @ApiOperation(value = "修改报修内容", notes = "修改报修内容")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
-                         @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket"),
-                         @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
+            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "type", value = "工单类型")})
     @RequestMapping(value = "/updateTicket/{ticketId}", method = RequestMethod.POST)
-    public ResponseBean updateTicketContent(@PathVariable("ticketId")Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type")String type){
+    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId, @RequestBody TpTicket tpTicket, @RequestParam("type") String type) {
         ResponseBean responseBean = new ResponseBean();
         socialServiceI.updateTicketContent(ticketId, tpTicket, type);
         return responseBean;
@@ -165,16 +166,17 @@ public class SocialController {
 
     @ApiOperation(value = "添加二手租赁帖子", notes = "添加二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionTitle",value = "交易标题"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "transactionContent",value = "交易内容"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type",value = "0:二手 1:求购  2:租赁"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "交易标题"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionContent", value = "交易内容"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "0:二手 1:求购  2:租赁"),
     })
-    @RequestMapping(value = "/addAllTransaction",method = RequestMethod.POST)
-    public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session){
+    @RequestMapping(value = "/addTransaction", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean addTransaction(TpTransaction tpTransaction, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response=socialServiceI.addAllTransaction(userId,tpTransaction);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, tpTransaction);
         return response;
     }
 
@@ -183,36 +185,42 @@ public class SocialController {
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
-    @RequestMapping(value = "/selectAllTransaction",method = RequestMethod.POST)
-    public ResponseBean selectAllTransaction( HttpSession session,
-                                              @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize){
+    @RequestMapping(value = "/selectAllTransaction", method = RequestMethod.GET)
+    public ResponseBean selectAllTransaction(HttpSession session,
+                                             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId=userElement.getId();
-        ResponseBean response=socialServiceI.selectAllTransaction(userId,pageNum, pageSize);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize);
         return response;
     }
 
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "二手租赁帖子Id")
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "二手租赁帖子Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "小区标题"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "transactionContent", value = "交易内容"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "Type", value = "0 代表，1求购，2租赁"),
     })
-    @RequestMapping(value = "/ubDateAllTransaction",method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction( HttpSession session, TpTransaction tpTransaction) {
+    @RequestMapping(value = "/upDateTransaction/{Id}", method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction(HttpSession session, @PathVariable(value = "Id") Integer Id,
+                                          @RequestParam(value = "transactionTitle") String transactionTitle,
+                                          @RequestParam(value = "transactionContent") String transactionContent,
+                                          @RequestParam(value = "Type") Integer Type) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(tpTransaction, userId);
+        ResponseBean response = socialServiceI.updateTransaction(Id, transactionTitle, transactionContent, userId, Type);
         return response;
     }
 
     @ApiOperation(value = "评价工单内容以及评分", notes = "评价工单内容以及评分")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType ="TpTicket"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicket", value = "报修", required = true, dataType = "TpTicket"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "工单Id")})
     @RequestMapping(value = "/accessTicket/{communityId}", method = RequestMethod.POST)
-    public ResponseBean accessTicket(@PathVariable("communityId")Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId")String ticketId, HttpSession session){
+    public ResponseBean accessTicket(@PathVariable("communityId") Integer communityId, @RequestBody TpTicket tpTicket, @RequestParam("ticketId") String ticketId, HttpSession session) {
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
         ResponseBean responseBean = new ResponseBean();

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

@@ -7,6 +7,7 @@ import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpTicket;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.model.TpTicketRecordComment;
+import com.community.huiju.service.AgreementServicel;
 import com.community.huiju.service.ITicketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -31,8 +32,11 @@ public class TicketController {
     @Autowired
     private ITicketService iTicketService;
 
-    @RequestMapping(value = "/tickets/{communityId}",method = RequestMethod.GET)
-    @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据",notes = "根据 小区编号,第几页,一页多少行")
+    @Autowired
+    private AgreementServicel agreementServicel;
+
+    @RequestMapping(value = "/tickets/{communityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
@@ -40,8 +44,8 @@ public class TicketController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
-                                   @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value = "pageSize",defaultValue = "3") Integer pageSize,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
                                    HttpSession session) {
         ResponseBean response = new ResponseBean();
 
@@ -51,23 +55,23 @@ public class TicketController {
         tpTicket.setCommunityId(Integer.valueOf(communityId));
         tpTicket.setTaUserId(userElement.getId());
 
-        response = iTicketService.getList(tpTicket,pageNum,pageSize);
+        response = iTicketService.getList(tpTicket, pageNum, pageSize);
         return response;
     }
-    
-    @ApiOperation(value = "获取报修/投诉/联系单进度详情数据",notes = "获取报修/投诉/联系单进度详情数据")
+
+    @ApiOperation(value = "获取报修/投诉/联系单进度详情数据", notes = "获取报修/投诉/联系单进度详情数据")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "ticketId",value = "报修id")
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "ticketId", value = "报修id")
     })
     @RequestMapping(value = "/ticket/schedule/{communityId}", method = RequestMethod.GET)
-    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId,@RequestParam Integer ticketId){
+    public ResponseBean getTicketSchedule(@PathVariable(value = "communityId") String communityId, @RequestParam Integer ticketId) {
         ResponseBean responseBean = new ResponseBean();
-        TpTicket ticket = iTicketService.getTicketSchedule(communityId,ticketId);
+        TpTicket ticket = iTicketService.getTicketSchedule(communityId, ticketId);
         responseBean.addSuccess(ticket);
         return responseBean;
     }
-    
+
     @RequestMapping(value = "/tickets/list/{communityId}", method = RequestMethod.GET)
     @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
     @ApiImplicitParams({
@@ -76,10 +80,11 @@ public class TicketController {
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+
     })
     public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
-                                       @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "type") String type,
                                        HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
@@ -91,14 +96,15 @@ public class TicketController {
         tpTicket.setTaUserId(userElement.getId());
         tpTicket.setType(type);
 
-        responseBean = iTicketService.getByTypeList(tpTicket,pageNum,pageSize);
+        responseBean = iTicketService.getByTypeList(tpTicket, pageNum, pageSize);
 
         return responseBean;
 
     }
+
     @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType ="body")})
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数", paramType = "body")})
     @RequestMapping(value = "/ticket/reply/{communityId}", method = RequestMethod.POST)
     public ResponseBean updateTicketsReply(@PathVariable(value = "communityId") Integer communityId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
@@ -108,7 +114,7 @@ public class TicketController {
         Integer size = iTicketService.updateTicketsReply(tpTicketRecordComment, userId);
         if (size > 0){
             responseBean.addSuccess(size);
-        }else{
+        } else {
             responseBean.addError("更新失败");
         }
         return responseBean;
@@ -116,20 +122,30 @@ public class TicketController {
 
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({
+
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
-    @RequestMapping(value = "/addAlltpTicket",method = RequestMethod.POST)
+    @RequestMapping(value = "/addAlltpTicket", method = RequestMethod.POST)
     @ResponseBody
-    public ResponseBean addTransaction(TpTicket tpTicket, HttpSession session){
+    public ResponseBean addTransaction(@RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response=iTicketService.addAiTicketService(userId,tpTicket);
+        ResponseBean response = iTicketService.addAiTicketService(userId, parameter);
         return response;
     }
 
-
+    @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
+    @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
+    public ResponseBean getTpAnnouncementTel() {
+        ResponseBean responseBean = new ResponseBean();
+        ResponseBean agreement = agreementServicel.getTpAnnouncementTel();
+                responseBean.addSuccess(agreement);
+        return responseBean;
+    }
 }
+
+

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

@@ -70,7 +70,7 @@ public class UserController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId=userElement.getId();
-        ResponseBean response=iTaUserService.udDateloginName(userId,paramets);
+        ResponseBean response=iTaUserService.upDateloginName(userId,paramets);
         return response;
     }
 

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

@@ -39,7 +39,7 @@ public interface TaUserMapper {
      * @param record
      * @return
      */
-    TaUser ubdateLongName(TaUser record);
+    TaUser updateLongName(TaUser record);
 
     /**
      * 查询房屋成员列表

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

@@ -23,4 +23,6 @@ public interface TpTransactionMapper {
     List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("type") String type);
 
     List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId);
+
+    void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId,@Param("Type")Integer Type);
 }

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

@@ -39,7 +39,7 @@ public interface ITaUserService {
      * @param id
      * @return
      */
-    ResponseBean udDateloginName(Integer id, String paramets);
+    ResponseBean upDateloginName(Integer id, String paramets);
 
     /**
      * 获取房屋成员列表

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

@@ -43,10 +43,10 @@ public interface ITicketService {
 	/**
 	 * 添加报修
 	 * @param userId
-	 * @param tpTicket
+	 * @param parameter
 	 * @return
 	 */
-    ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket);
+    ResponseBean addAiTicketService(Integer userId,String parameter);
 	
 	/**
 	 * 回复工单

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

@@ -88,11 +88,9 @@ public interface SocialServiceI {
 
 	/**
 	 * 修改当前帖子
-	 * @param tpTransaction
-	 * @param userId
-	 * @return
 	 */
-	ResponseBean updateTransaction(TpTransaction tpTransaction,Integer userId);
+	ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type);
+
 	void updateTicketContent(Integer ticketId, TpTicket tpTicket, String type);
 
 	/**

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

@@ -246,7 +246,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicket.setType(type);
         tpTicketMapper.updateByPrimaryKeySelective(tpTicket);
     }
-
+    @Transactional
     @Override
     public ResponseBean addAllTransaction(Integer userId, TpTransaction tpTransaction) {
         ResponseBean response = new ResponseBean();
@@ -254,10 +254,11 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCommunityId(user.getCommunityId());
         tpTransaction.setTaUserId(userId);
         tpTransaction.setCreateUser(userId);
+        tpTransaction.setStatus("1");
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
-        tpTransactionMapper.insert(tpTransaction);
+        tpTransactionMapper.insertSelective(tpTransaction);
         response.addSuccess("发布成功");
         return response;
     }
@@ -274,17 +275,9 @@ public class SocialServiceImpl implements SocialServiceI {
     }
 
     @Override
-    public ResponseBean updateTransaction(TpTransaction tpTransaction,Integer userId) {
+    public ResponseBean updateTransaction(Integer Id,String transactionTitle,String transactionContent,Integer userId,Integer Type) {
         ResponseBean response = new ResponseBean();
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        tpTransaction.setCommunityId(user.getCommunityId());
-        tpTransaction.setTaUserId(userId);
-        tpTransaction.setCreateUser(userId);
-        tpTransaction.setStatus("2");
-        tpTransaction.setCreateDate(new Date());
-        tpTransaction.setUpdateUser(userId);
-        tpTransaction.setUpdateDate(new Date());
-        tpTransactionMapper.updateByPrimaryKey(tpTransaction);
+        tpTransactionMapper.updateTransaction(Id,transactionTitle,transactionContent,userId,Type);
         response.addSuccess("修改成功");
         return response;
     }

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

@@ -158,7 +158,7 @@ public class TaUserServiceImpl implements ITaUserService {
     }
     @Transactional
     @Override
-    public ResponseBean udDateloginName(Integer id, String paramets) {
+    public ResponseBean upDateloginName(Integer id, String paramets) {
         ResponseBean response = new ResponseBean();
 
         JSONObject jsonObject = JSONObject.parseObject(paramets);
@@ -174,7 +174,7 @@ public class TaUserServiceImpl implements ITaUserService {
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
             taUser.setId(user.getId());
-            taUserMapper.ubdateLongName(taUser);
+            taUserMapper.updateLongName(taUser);
              response.addSuccess("修改成功");
             AppkeyCache.setCache(user.getLoginName(),"null");
             return response;

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

@@ -1,16 +1,14 @@
 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.model.TaUser;
-import com.community.huiju.model.TpTicket;
-import com.community.huiju.model.TpTicketRecord;
-import com.community.huiju.model.TpTicketRecordComment;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITicketService;
 import com.community.huiju.vo.TpTicketVO;
 import com.github.pagehelper.PageHelper;
@@ -35,54 +33,54 @@ public class TicketServiceImpl implements ITicketService {
 
     @Autowired
     private TpTicketMapper tpTicketMapper;
-    
+
     @Autowired
     private TpTicketRecordMapper tpTicketRecordMapper;
 
     @Autowired
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
-    
+
     @Autowired
     private TaUserMapper taUserMapper;
 
     @Override
-    public ResponseBean getList(TpTicket tpTicket,Integer pageNum, Integer pageSize) {
+    public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
 
-        ResponseBean<Map<String,Object>> responseBean = new ResponseBean();
+        ResponseBean<Map<String, Object>> responseBean = new ResponseBean();
         // 最终返回值
-        Map<String,Object> result = Maps.newHashMap();
+        Map<String, Object> result = Maps.newHashMap();
 
-        Map<String,Object> parameter = Maps.newHashMap();
-        parameter.put("communityId",tpTicket.getCommunityId());
-        parameter.put("taUserId",tpTicket.getTaUserId());
+        Map<String, Object> parameter = Maps.newHashMap();
+        parameter.put("communityId", tpTicket.getCommunityId());
+        parameter.put("taUserId", tpTicket.getTaUserId());
 
         //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type",0);
+        parameter.put("type", 0);
         // 报修
-        PageHelper.startPage(pageNum,pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketRepairsList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> repairsList = Lists.newArrayList();
-        tpTicketVOConvert(tpTicketRepairsList,repairsList);
+        tpTicketVOConvert(tpTicketRepairsList, repairsList);
 
         // 投诉
         //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type",1);
-        PageHelper.startPage(pageNum,pageSize);
+        parameter.put("type", 1);
+        PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketComplaintList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
 
         // 联系工单
         //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type",2);
-        PageHelper.startPage(pageNum,pageSize);
+        parameter.put("type", 2);
+        PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketLiaisonList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
 
-        result.put("repairs",repairsList);
-        result.put("complaint",complaintList);
-        result.put("liaison",liaisonList);
+        result.put("repairs", repairsList);
+        result.put("complaint", complaintList);
+        result.put("liaison", liaisonList);
 
         responseBean.addSuccess(result);
         return responseBean;
@@ -90,34 +88,36 @@ public class TicketServiceImpl implements ITicketService {
 
     /**
      * 公共方法, 获取一条数据
+     *
      * @param map
      * @return
      */
-    private TpTicketRecordComment getTicketRecordComment(Map map){
+    private TpTicketRecordComment getTicketRecordComment(Map map) {
         List<TpTicketRecordComment> list = tpTicketRecordCommentMapper.selectByTicketId(map);
-        return null==list
-                ?null:list.size()==0
-                ?null:list.get(0);
+        return null == list
+                ? null : list.size() == 0
+                ? null : list.get(0);
     }
 
     /**
      * 数据转换,并填充数据
+     *
      * @param target
      * @param source
      * @return
      */
-    public void tpTicketVOConvert(List<TpTicket> source, List<TpTicketVO> target){
+    public void tpTicketVOConvert(List<TpTicket> source, List<TpTicketVO> target) {
 
         // 查询参数
-        Map<String,Object> lastRecordMap = Maps.newHashMap();
+        Map<String, Object> lastRecordMap = Maps.newHashMap();
         // 表示查询出最新的一条
-        lastRecordMap.put("size",1);
+        lastRecordMap.put("size", 1);
 
-        source.stream().forEach(e->{
+        source.stream().forEach(e -> {
             TpTicketVO tpTicketVO = new TpTicketVO();
-            BeanUtils.copyProperties(e,tpTicketVO);
+            BeanUtils.copyProperties(e, tpTicketVO);
             // 设置工单编号
-            lastRecordMap.put("tickerId",e.getId());
+            lastRecordMap.put("tickerId", e.getId());
             TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
@@ -133,26 +133,27 @@ public class TicketServiceImpl implements ITicketService {
 
         ResponseBean response = new ResponseBean();
 
-        Map<String,Object> parameter = Maps.newHashMap();
-        parameter.put("communityId",tpTicket.getCommunityId());
-        parameter.put("taUserId",tpTicket.getTaUserId());
+        Map<String, Object> parameter = Maps.newHashMap();
+        parameter.put("communityId", tpTicket.getCommunityId());
+        parameter.put("taUserId", tpTicket.getTaUserId());
 
         //  0 代表 报修  1 代表 投诉  2代表 联系单
-        parameter.put("type",tpTicket.getType());
+        parameter.put("type", tpTicket.getType());
 
-        PageHelper.startPage(pageNum,pageSize);
+        PageHelper.startPage(pageNum, pageSize);
         List<TpTicket> tpTicketList = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(parameter);
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
-        tpTicketVOConvert(tpTicketList,tpTicketVOList);
+        tpTicketVOConvert(tpTicketList, tpTicketVOList);
 
         response.addSuccess(tpTicketVOList);
 
         return response;
     }
-    
+
     /**
      * 获取报修详情
+     *
      * @param communityId
      * @param ticketId
      * @return
@@ -160,10 +161,10 @@ public class TicketServiceImpl implements ITicketService {
     @Override
     public TpTicket getTicketSchedule(String communityId, Integer ticketId) {
         //查看工单详情
-        TpTicket ticket = tpTicketMapper.selectByTicketId(communityId,ticketId);
-        if (null != ticket){
+        TpTicket ticket = tpTicketMapper.selectByTicketId(communityId, ticketId);
+        if (null != ticket) {
             //工单进度
-            List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId,ticketId);
+            List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(communityId, ticketId);
             //工单回复
             ticketRecordList.stream().forEach(TpTicketRecord -> {
                 List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
@@ -175,25 +176,35 @@ public class TicketServiceImpl implements ITicketService {
     }
 
     @Override
-    public ResponseBean addAiTicketService(Integer userId, TpTicket tpTicket) {
+    public ResponseBean addAiTicketService(Integer userId, String parameter) {
         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");
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        TpTicket tpTicket=new TpTicket();
         tpTicket.setCommunityId(user.getCommunityId());
         tpTicket.setTaUserId(userId);
-        tpTicket.setTpUserId(userId);
+        tpTicket.setStatus("2");
+        tpTicket.setRepairType(repairType);
+        tpTicket.setTicketTitle(ticketTitle);
+        tpTicket.setTicketContent(ticketContent);
         tpTicket.setCreateUser(userId);
         tpTicket.setCreateDate(new Date());
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
-        tpTicketMapper.insert(tpTicket);
+        tpTicketMapper.insertSelective(tpTicket);
+        Integer id=tpTicket.getId();
         TpTicketRecord tpTicketRecord = new TpTicketRecord();
         //获取当前插入的信息，维护工单记录表
-        TpTicket tpTicketReco = tpTicketMapper.getById(userId, user.getCommunityId());
+        TpTicket tpTicketReco = tpTicketMapper.selectByPrimaryKey(id);
         tpTicketRecord.setCommunityId(user.getCommunityId());
         tpTicketRecord.setTicketId(tpTicketReco.getId());
+        tpTicketRecord.setStatus(tpTicketReco.getStatus());
         tpTicketRecord.setCreateUser(userId);
         tpTicketRecord.setCreateDate(new Date());
-        tpTicketRecordMapper.insert(tpTicketRecord);
+        tpTicketRecordMapper.insertSelective(tpTicketRecord);
         response.addSuccess("新增成功");
         return response;
     }

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

@@ -260,7 +260,7 @@
     where login_name=#{loginName,jdbcType=VARCHAR}
   </select>
 
-  <select id="ubdateLongName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap">
+  <select id="updateLongName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap">
     update ta_user
     set
     login_name = #{loginName,jdbcType=VARCHAR}

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

@@ -45,7 +45,7 @@
       #{comment,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TpTicket" >
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TpTicket" >
     insert into tp_ticket
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >

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

@@ -188,4 +188,16 @@
     from tp_transaction
     where community_id = #{communityId,jdbcType=INTEGER} and ta_user_id = #{userId,jdbcType=INTEGER}
   </select>
+
+  <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
+    update tp_transaction
+    set
+    ta_user_id = #{userId,jdbcType=INTEGER},
+    transaction_title = #{transactionTitle,jdbcType=VARCHAR},
+    transaction_content = #{transactionContent,jdbcType=VARCHAR},
+     type = #{Type,jdbcType=CHAR},
+    update_user = #{userId,jdbcType=INTEGER},
+    update_date = now()
+    where id = #{id,jdbcType=INTEGER}
+  </update>
 </mapper>