Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -45,7 +45,7 @@ public class AnnouncementTelController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "备注（模糊查询）"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/tels",method = RequestMethod.GET)
 	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
@@ -67,7 +67,7 @@ public class AnnouncementTelController extends BaseController {
 	// @ApiOperation(value = "添加物业端号码", notes = "添加物业端号码")
 	@ApiImplicitParams({
 			@ApiImplicitParam(dataTypeClass = String.class, paramType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
 	public ResponseBean addTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request){
@@ -105,7 +105,7 @@ public class AnnouncementTelController extends BaseController {
 	// @ApiOperation(value = "根据ID修改物业端号码", notes = "根据ID修改物业端号码")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
 	public ResponseBean updateTel(@Valid @RequestBody AnnouncementTel announcementTel, HttpServletRequest request) {
@@ -156,7 +156,7 @@ public class AnnouncementTelController extends BaseController {
 	// @ApiOperation(value = "获取Id获取物业端号码详情", notes = "获取Id获取物业端号码详情")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/tel/{id}",method = RequestMethod.GET)
 	public ResponseBean getNoticeById(@PathVariable(value ="id") Integer id, HttpServletRequest request){
@@ -169,7 +169,7 @@ public class AnnouncementTelController extends BaseController {
 	// @ApiOperation(value = "根据ID批量删除物业端号码", notes = "根据ID批量删除物业端号码")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "integer", name = "ids", value = "主键Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/tel/delete", method = RequestMethod.POST)
 	public ResponseBean deleteNotice(@RequestBody List<Integer> ids, HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -131,7 +131,7 @@ public class BillController extends BaseController {
     // @ApiOperation(value = "根据 id集合 删除缴费项", notes = "根据 id集合 删除缴费项")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id编号集合"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/deleteBillBeach", method = RequestMethod.POST)
     public ResponseBean deleteBillBeach(HttpServletRequest request,
@@ -146,7 +146,7 @@ public class BillController extends BaseController {
     // @ApiOperation(value = "下载Excel模板", notes = "下载Excel模板")
     @ApiImplicitParams({
 //            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/downloadExcel", method = RequestMethod.GET)
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -49,7 +49,6 @@ public class BillInvoiceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billId: 缴费项目id," +
                     "phase: 期,building: 栋,unit: 单元,roomNo: 户号,ownerName: 业主姓名," +
                     "billStatus: 缴费状态,payName: 缴费人,pageSize: 一页多少行,pageNum: 第几页"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
     })
     @RequestMapping(value = "/bill/invoice/list", method = RequestMethod.POST)
     public ResponseBean getBillList(HttpServletRequest request, @RequestBody String parameter) {
@@ -62,7 +61,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "修改缴费项 收费项名称,缴费项说明,截止时间", notes = "修改缴费项 收费项名称,缴费项说明,截止时间")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billName收费项名称,billExplain缴费项说明,endDate截止时间"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/updateBill", method = RequestMethod.PUT)
     public ResponseBean updateBill(HttpServletRequest request, @RequestBody String parameter) {
@@ -76,7 +75,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "根据 id集合 删除缴费单", notes = "根据 id集合 删除缴费单")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/delete", method = RequestMethod.POST)
     public ResponseBean delete(HttpServletRequest request, @RequestBody List<Integer> ids) {
@@ -90,7 +89,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "设置线下缴费", notes = "设置线下缴费")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/offlinePayment", method = RequestMethod.POST)
     public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
@@ -105,7 +104,7 @@ public class BillInvoiceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billId缴费项编号,phase期/区," +
                     "building栋,unit单元,roomNo户号,worthOf截止时间(催缴日期),billInvoiceExplain收费单说明,payPrice收费金额"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/addTempBillInvoice", method = RequestMethod.POST)
     public ResponseBean addTempBillInvoice(HttpServletRequest request, @RequestBody String parameter) {
@@ -118,7 +117,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "由前台批量添加收费单, 进行统一的提交, 修改为有效", notes = "由前台批量添加收费单, 进行统一的提交, 修改为有效")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "ids", value = "id集合"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceStatus", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceStatus(HttpServletRequest request, @RequestBody List<Integer> ids) {
@@ -131,7 +130,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "查询前台批量添加的收费单, 状态是作废", notes = "查询前台批量添加的收费单, 状态是作废")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/getTempBillInvoice/{billId}", method = RequestMethod.GET)
     public ResponseBean getTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
@@ -144,7 +143,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "根据id删除收费单, 只能删除作废的", notes = "根据id删除收费单, 只能删除作废的")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/deleteTempBillInvoice/{billId}", method = RequestMethod.DELETE)
     public ResponseBean deleteTempBillInvoice(HttpServletRequest request, @PathVariable("billId") Integer billId) {
@@ -158,7 +157,7 @@ public class BillInvoiceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "payPrice金额"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdPayPrice/{billId}", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceIdPayPrice(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
@@ -173,7 +172,7 @@ public class BillInvoiceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billInvoiceExplain收费说明"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/{billId}", method = RequestMethod.POST)
     public ResponseBean updateBillInvoiceIdBillInvoiceExplain(HttpServletRequest request, @PathVariable Integer billId, @RequestBody String parameter) {
@@ -199,7 +198,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "导出Excel", notes = "导出Excel")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "缴费id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/exportExcel/{billId}", method = RequestMethod.GET)
     public void exportExcel(HttpServletResponse response, HttpServletRequest request, @PathVariable("billId") Integer billId) {
@@ -223,7 +222,7 @@ public class BillInvoiceController extends BaseController {
     // @ApiOperation(value = "根据缴费项id, 查询草稿", notes = "根据缴费项id, 查询草稿")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "billId", value = "billId缴费项id,pageNum当前页,pageSize一页多少行"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/invoice/getInvoiceInvalid", method = RequestMethod.POST)
     public ResponseBean getInvoiceInvalid(HttpServletRequest request, @RequestBody String parameter) {

src/main/java/com/huiju/estateagents/property/controller/BillStatementController.java

@@ -55,7 +55,7 @@ public class BillStatementController extends BaseController {
 
     // @ApiOperation(value = "导出Excel", notes = "导出Excel")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/bill/statement/exportExcel", method = RequestMethod.GET)
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -120,7 +120,7 @@ public class BuildingOwnerInfoController extends BaseController {
     // @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "userVerifyId审核编号;roleId角色编号;verifyStatus审核 true通过；false不通过;remark备注"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     @RequestMapping(value = "/building/update", method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String parameter, HttpServletRequest request){
@@ -136,7 +136,7 @@ public class BuildingOwnerInfoController extends BaseController {
                     "unitId单元;levelId楼层;roomNoId户号;" +
                     "ownerName业主姓名;" +
                     "ownerTel业主手机号;roleId角色id;gender性别 1：男   2：女;"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     @RequestMapping(value = "/building/add", method = RequestMethod.POST)
     public ResponseBean add(@RequestBody String parameter, HttpServletRequest request){
@@ -149,7 +149,7 @@ public class BuildingOwnerInfoController extends BaseController {
     // @ApiOperation(value = "批量删除楼栋业主信息", notes = "批量删除楼栋业主信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "ids",value = "id集合"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     @RequestMapping(value = "/building/delete", method = RequestMethod.DELETE)
     public ResponseBean delete(@RequestBody List<Integer> ids, HttpServletRequest request){
@@ -265,7 +265,7 @@ public class BuildingOwnerInfoController extends BaseController {
     // @ApiOperation(value = "小区楼栋资料表",nickname ="小区楼栋资料表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="phase:期,building:楼栋 ,unit:单元,level:楼层，roomNo:户号， pageNum:每页显示多少条,pageSzie:当前页数"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+            })
     @RequestMapping(value="/buildinglist",method = RequestMethod.POST)
     public ResponseBean buildinglist(@RequestBody String paramets, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -300,7 +300,7 @@ public class BuildingOwnerInfoController extends BaseController {
     // @ApiOperation(value = "下载Excel模板(小区楼栋信息)", notes = "下载Excel模板(小区楼栋信息)")
     @ApiImplicitParams({
 //            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "billExplain收费组说明"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/building/downloadExcel", method = RequestMethod.GET)
     public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
@@ -320,7 +320,7 @@ public class BuildingOwnerInfoController extends BaseController {
     // @ApiOperation(value = "住户资料详情",nickname ="住户资料详情")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:楼栋住户ID"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")})
+            })
     @RequestMapping(value="/building/details",method = RequestMethod.POST)
     public ResponseBean buildingDetails(@RequestBody String paramets, HttpServletRequest request){
         TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/controller/CarouselSettingController.java

@@ -42,7 +42,6 @@ public class CarouselSettingController extends BaseController {
 
     // @ApiOperation(value = "添加/修改公告的Banner数量", notes = "添加/修改公告的Banner数量")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
     })
     @RequestMapping(value = "/carousel/announcement/banner", method = RequestMethod.PUT)
@@ -79,7 +78,6 @@ public class CarouselSettingController extends BaseController {
 
     // @ApiOperation(value = "添加/修改活动的Banner数量", notes = "添加/修改活动的Banner数量")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "parameter", value = "carouselNum数量值")
     })
     @RequestMapping(value = "/carousel/activity/banner", method = RequestMethod.PUT)
@@ -114,7 +112,7 @@ public class CarouselSettingController extends BaseController {
 
     // @ApiOperation(value = "获取Banner数量", notes = "获取Banner数量")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            ,
     })
     @RequestMapping(value = "/carousel/getBanner", method = RequestMethod.GET)
     public ResponseBean getBannerNum(HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/HotelController.java

@@ -52,7 +52,7 @@ public class HotelController extends BaseController {
                     "endTime:结束时间"+
                     "sort:权重")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/hotelRoomList", method = RequestMethod.POST)
     public ResponseBean hotelRoom(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -69,7 +69,7 @@ public class HotelController extends BaseController {
                     "remark:(描述)"+
                     "sort:权重")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/hotelRoomAdd", method = RequestMethod.POST)
     public ResponseBean hotelRoomAdd(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -80,7 +80,7 @@ public class HotelController extends BaseController {
     // @ApiOperation(value = "查询当前房间信息", notes = "查询当前房间信息")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:房间ID")})
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/getRoom", method = RequestMethod.POST)
     public ResponseBean getRoom(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -101,7 +101,7 @@ public class HotelController extends BaseController {
                     "remark:(描述)"+
                     "sort:权重")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/hotelRoomEdit", method = RequestMethod.POST)
     public ResponseBean hotelRoomEdit(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -113,7 +113,7 @@ public class HotelController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:[]房间ID，roomStatus:(1:是已上架 2:是已下架)"
             )})
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/hotelRoomRoomStatus", method = RequestMethod.POST)
     public ResponseBean hotelRoomRoomStatus(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -123,7 +123,7 @@ public class HotelController extends BaseController {
     
     // @ApiOperation(value = "根据小区获取酒店数据", notes = "根据搜索条件获取角色列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+            ,
     })
     @RequestMapping(value = "/getHotelData",method = RequestMethod.GET)
     public ResponseBean getHotelData(HttpServletRequest request) {
@@ -137,9 +137,9 @@ public class HotelController extends BaseController {
     // @ApiOperation(value = "添加酒店", notes = "添加酒店")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "Hotel", name = "hotel", value = "酒店"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/addHotel", method = RequestMethod.POST)
     public ResponseBean addHotel(@RequestBody Hotel hotel, HttpServletRequest request){
         TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/controller/IndexCountController.java

@@ -31,7 +31,7 @@ public class IndexCountController extends BaseController {
 	
 	// @ApiOperation(value = "获取物业端首页所有统计数据", notes = "获取物业端首页所有统计数据")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/index/count", method = RequestMethod.GET)
 	public ResponseBean getIndexCount(HttpServletRequest request){

src/main/java/com/huiju/estateagents/property/controller/MessageController.java

@@ -37,7 +37,7 @@ public class MessageController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:待办消息类型(-1:论坛，-2:工单，-3:缴费),status:(0:无效，1:有效)，createDate：时间，messageContent:内容 ")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/messageLiset", method = RequestMethod.POST)
     public ResponseBean messageLiset(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -49,7 +49,7 @@ public class MessageController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "messageType:消息类型(-1:论坛，-2:工单，-3:缴费),readStatus:(0:未读，1:已读)，createDate：时间，messageContent:内容 ")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/myMessageList", method = RequestMethod.POST)
     public ResponseBean myMessageList(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -61,7 +61,7 @@ public class MessageController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:(多个) ")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/delectRead", method = RequestMethod.POST)
     public ResponseBean delectRead(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/controller/RoleController.java

@@ -34,7 +34,6 @@ public class RoleController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "roleName", value = "帖子标题（模糊查询）"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 	})
 	@RequestMapping(value = "/roles",method = RequestMethod.GET)
 	public ResponseBean getRoleList(@RequestParam(value = "roleName", required = false) String roleName,
@@ -49,7 +48,6 @@ public class RoleController extends BaseController {
 	
 	// @ApiOperation(value = "添加角色", notes = "添加角色")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
 	})
@@ -64,7 +62,6 @@ public class RoleController extends BaseController {
 	// @ApiOperation(value = "获取角色详情", notes = "获取角色详情")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
 	})
@@ -80,7 +77,6 @@ public class RoleController extends BaseController {
 	// @ApiOperation(value = "修改角色", notes = "修改角色")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "roleName角色名称;description角色描述;menuArray菜单id集合")
 	})
@@ -95,7 +91,6 @@ public class RoleController extends BaseController {
 	
 	// @ApiOperation(value = "删除角色", notes = "删除角色")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "sysRole", value = "idArray角色id集合")
 	})

src/main/java/com/huiju/estateagents/property/controller/SocialController.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.property.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.TpActivity;
+import com.huiju.estateagents.property.model.TpAnnouncement;
+import com.huiju.estateagents.property.model.TpTicket;
+import com.huiju.estateagents.property.model.TpTransaction;
+import com.huiju.estateagents.property.service.SocialServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+/**
+ * @author weichaochao11
+ * @Title: SocialController
+ * @date 2018/10/23
+ */
+@RestController
+@RequestMapping("/api")
+@Api(value = "公告相关的API", tags = "公告相关的API")
+public class SocialController extends BaseController {
+
+    @Autowired
+    private SocialServiceI socialServiceI;
+
+    @RequestMapping(value = "/wx/announcement/{orgId}", method = RequestMethod.GET)
+    @ApiOperation(value = "论坛公告帖子详情", notes = "获取论坛公告帖子详情")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "orgId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "id", value = "公告帖子id")})
+    public ResponseBean findAnnouncementDetail(@PathVariable(value = "orgId") Integer orgId, @RequestParam("id") Integer id, HttpServletRequest request) {
+        TaUser userElement = getTaUser(request);
+        Integer userId = userElement.getUserId();
+        ResponseBean responseBean = new ResponseBean();
+
+        TpAnnouncement tpAnnouncement = socialServiceI.findAnnouncementDetail(id, orgId, userId);
+        responseBean.addSuccess(tpAnnouncement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "按小区获取分页公告列表", notes = "按小区获取分页公告列表,公告标题模糊查询")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", 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 = "/wx/announcements/{orgId}", method = RequestMethod.GET)
+    public ResponseBean getAnnouncements(@PathVariable Integer orgId,
+                                         @RequestParam(required = false) String title,
+                                         @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        ResponseBean announcementList = socialServiceI.getAnnouncements(orgId, title, pageNum, pageSize);
+        return announcementList;
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/TaVisitorLicenseSettingController.java

@@ -52,7 +52,7 @@ public class TaVisitorLicenseSettingController extends BaseController {
 
     // @ApiOperation(value = "查看是否开启访客车辆邀请", notes = "查看是否开启访客车辆邀请")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
     })
     @RequestMapping(value = "/visitor", method = RequestMethod.GET)
     public ResponseBean getVisitorLicense(HttpServletRequest request) {

src/main/java/com/huiju/estateagents/property/controller/TpAnnouncementController.java

@@ -29,7 +29,7 @@ public class TpAnnouncementController extends BaseController {
     // @ApiOperation(value = "获取公告管理列表",nickname ="获取公告管理列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:公告编号,announcementTitle:公告标题 ,current:每页显示多少条,current:每页显示多少条,pageSzie:当前页数")})
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value="/tpAnnouncement",method = RequestMethod.POST)
     public ResponseBean tpAnnouncement(@RequestBody String paramets, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -41,7 +41,7 @@ public class TpAnnouncementController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="announcementTitle:公告标题，" +
                     "announcementCarouselImg:轮播图，announcementContent：内容，contentImg:内容图片，sort:权重值,status:'0 是已作废 1 是已发布   2 是草稿 3 是已修改',")})
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value="/addAnnouncement",method = RequestMethod.POST)
     public ResponseBean addAnnouncement(@RequestBody String paramets, HttpServletRequest request){
         TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/controller/TpEquipmentController.java

@@ -37,7 +37,7 @@ public class TpEquipmentController extends BaseController {
     // @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
     @ApiImplicitParams({
         @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
-        @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     public ResponseBean getAll(@RequestParam("type") Integer type, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
@@ -51,7 +51,7 @@ public class TpEquipmentController extends BaseController {
     // @ApiOperation(value = "添加或修改监控设备", notes = "添加或修改监控设备")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "parameter", value = "监控设备数据"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     public ResponseBean saveOrUpdateMonitoring(@RequestBody String parameter, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
@@ -64,7 +64,7 @@ public class TpEquipmentController extends BaseController {
     // @ApiOperation(value = "删除设备", notes = "删除设备")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     public ResponseBean deleteEquipmentById(@PathVariable("id") Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -76,7 +76,7 @@ public class TpEquipmentController extends BaseController {
     // @ApiOperation(value = "批量删除设备", notes = "批量删除设备")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = Integer.class, name = "ids", value = "设备id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     public ResponseBean deleteBachEquipmentById(@RequestBody List<Integer> ids, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -90,7 +90,7 @@ public class TpEquipmentController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "设备id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     })
     public ResponseBean getMonitoringById(@RequestParam("type") Integer type, @PathVariable("id") Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

src/main/java/com/huiju/estateagents/property/controller/TpRentalHouseController.java

@@ -50,7 +50,6 @@ public class TpRentalHouseController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "houseStatus", value = "上架状态"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 	})
 	@RequestMapping(value = "/rentals",method = RequestMethod.GET)
 	public ResponseBean getRentalList(@RequestParam(value = "id") Integer id,
@@ -72,7 +71,7 @@ public class TpRentalHouseController extends BaseController {
 	// @ApiOperation(value = "添加公寓", notes = "添加公寓")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/rental/add",method = RequestMethod.POST)
 	public ResponseBean saveRental(@RequestBody TpRentalHouse rentalHouse, HttpServletRequest request){
@@ -85,7 +84,7 @@ public class TpRentalHouseController extends BaseController {
 	// @ApiOperation(value = "更新公寓", notes = "更新公寓")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpRentalHouse", name = "rentalHouse", value = "公寓"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/rental/update",method = RequestMethod.POST)
 	public ResponseBean updateRental(@RequestBody TpRentalHouse rentalHouse, HttpServletRequest request){
@@ -98,7 +97,7 @@ public class TpRentalHouseController extends BaseController {
 	// @ApiOperation(value = "获取公寓信息", notes = "获取公寓信息")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "公寓Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/rental/get/{id}",method = RequestMethod.GET)
 	public ResponseBean getRental(@PathVariable Integer id, HttpServletRequest request){
@@ -112,7 +111,7 @@ public class TpRentalHouseController extends BaseController {
 	// @ApiOperation(value = "上架房间", notes = "上架房间")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/rental/shelf",method = RequestMethod.POST)
 	public ResponseBean shelfRental(@RequestBody String jsonString, HttpServletRequest request){
@@ -142,7 +141,7 @@ public class TpRentalHouseController extends BaseController {
 	// @ApiOperation(value = "下架房间", notes = "下架房间")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "房间id集合"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/rental/obtained",method = RequestMethod.POST)
 	public ResponseBean obtainedRental(@RequestBody String jsonString, HttpServletRequest request){

src/main/java/com/huiju/estateagents/property/controller/TpShopController.java

@@ -47,7 +47,6 @@ public class TpShopController extends BaseController {
 			@ApiImplicitParam(paramType = "query", dataType = "String", name = "shopStatus", value = "上架状态"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 	})
 	@RequestMapping(value = "/shops",method = RequestMethod.GET)
 	public ResponseBean getShopList(@RequestParam(value = "id") Integer id,
@@ -66,7 +65,7 @@ public class TpShopController extends BaseController {
 	// @ApiOperation(value = "添加商铺", notes = "添加商铺")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/add",method = RequestMethod.POST)
 	public ResponseBean saveShop(@RequestBody TpShop shop, HttpServletRequest request){
@@ -79,7 +78,7 @@ public class TpShopController extends BaseController {
 	// @ApiOperation(value = "获取商铺信息", notes = "获取商铺信息")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/get/{id}",method = RequestMethod.GET)
 	public ResponseBean getShop(@PathVariable Integer id, HttpServletRequest request){
@@ -93,7 +92,7 @@ public class TpShopController extends BaseController {
 	// @ApiOperation(value = "更新商铺", notes = "更新商铺")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpShop", name = "shop", value = "商铺"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/update",method = RequestMethod.POST)
 	public ResponseBean updateShop(@RequestBody TpShop shop, HttpServletRequest request){
@@ -106,7 +105,7 @@ public class TpShopController extends BaseController {
 	// @ApiOperation(value = "上架商铺", notes = "上架商铺")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/shelf",method = RequestMethod.POST)
 	public ResponseBean shelfShop(@RequestBody String jsonString, HttpServletRequest request){
@@ -136,7 +135,7 @@ public class TpShopController extends BaseController {
 	// @ApiOperation(value = "下架商铺", notes = "下架商铺")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/obtained",method = RequestMethod.POST)
 	public ResponseBean obtainedShop(@RequestBody String jsonString, HttpServletRequest request){

src/main/java/com/huiju/estateagents/property/controller/TpShopSettingController.java

@@ -39,7 +39,7 @@ public class TpShopSettingController extends BaseController {
 	// @ApiOperation(value = "商铺配置启动和关闭", notes = "商铺配置启动和关闭")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺配置值"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/add/setting",method = RequestMethod.POST)
 	public ResponseBean changeShopSetting(@RequestBody String jsonString, HttpServletRequest request){

src/main/java/com/huiju/estateagents/property/controller/TpShopTypeController.java

@@ -41,7 +41,7 @@ public class TpShopTypeController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/types",method = RequestMethod.GET)
 	public ResponseBean getTypesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -55,7 +55,7 @@ public class TpShopTypeController extends BaseController {
 	// @ApiOperation(value = "添加商铺类型", notes = "添加商铺类型")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/add/type",method = RequestMethod.POST)
 	public ResponseBean saveShopType(@RequestBody TpShopType shopType, HttpServletRequest request){
@@ -86,7 +86,7 @@ public class TpShopTypeController extends BaseController {
 	// @ApiOperation(value = "获取商铺类型", notes = "获取商铺类型")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataType = "Integer", name = "id", value = "商铺类型Id"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/get/type/{id}",method = RequestMethod.GET)
 	public ResponseBean getShopType(@PathVariable Integer id, HttpServletRequest request){
@@ -100,7 +100,7 @@ public class TpShopTypeController extends BaseController {
 	// @ApiOperation(value = "更新商铺类型", notes = "更新商铺类型")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "TpShopType", name = "shopType", value = "商铺类型"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/update/type",method = RequestMethod.POST)
 	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpServletRequest request){
@@ -129,7 +129,7 @@ public class TpShopTypeController extends BaseController {
 	// @ApiOperation(value = "删除商铺类型", notes = "删除商铺类型")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "jsonString", value = "商铺id集合"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/delete/type",method = RequestMethod.DELETE)
 	public ResponseBean deleteShopType(@RequestBody String jsonString, HttpServletRequest request){
@@ -142,7 +142,7 @@ public class TpShopTypeController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
 			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度"),
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+
 	})
 	@RequestMapping(value = "/shop/type/select",method = RequestMethod.GET)
 	public ResponseBean getTypesSelect(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -4,7 +4,10 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.TpTicket;
+import com.huiju.estateagents.property.model.TpTicketRecordComment;
 import com.huiju.estateagents.property.service.IUserService;
 import com.huiju.estateagents.property.service.TpTicketService;
 import io.swagger.annotations.Api;
@@ -12,13 +15,11 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 
 /**
  * <p>
@@ -30,7 +31,7 @@ import javax.servlet.http.HttpSession;
  */
 @RestController
 @RequestMapping("/")
-@Api(value = "工单列表API", description = "工单列表API")
+@Api(value = "工单列表API", tags = "工单列表API")
 public class TpTicketController extends BaseController {
     @Autowired
     private IUserService userService;
@@ -45,7 +46,6 @@ public class TpTicketController extends BaseController {
                     "status:流转状态(0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止'）" +
                     "tpUserId:当前处理人" )
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/ticketLiset", method = RequestMethod.POST)
     public ResponseBean ticketLiset(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -57,7 +57,7 @@ public class TpTicketController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:工单编号")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/ticketDetails", method = RequestMethod.POST)
     public ResponseBean ticketDetails(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -69,7 +69,7 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" +
                     "status:工单状态（0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:已终止）")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
     public ResponseBean addRecordComment(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -81,7 +81,7 @@ public class TpTicketController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id，" +
                     "id:当前处理人id")
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/addRecord", method = RequestMethod.POST)
     public ResponseBean addRecord(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -92,7 +92,7 @@ public class TpTicketController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "ticketId:工单id,textContent:拒绝的内容" )
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/updateTicketStatus", method = RequestMethod.POST)
     public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
@@ -104,11 +104,161 @@ public class TpTicketController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id" )
     })
-    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
     @RequestMapping(value = "/updateTicket", method = RequestMethod.POST)
     public ResponseBean updateTicket(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
         ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
         return responseBean;
     }
+
+
+    @RequestMapping(value = "/wx/tickets/{orgId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "orgId",value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @Deprecated
+    public ResponseBean getService(@PathVariable(value = "orgId") Integer orgId,
+                                   @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value = "pageSize", defaultValue = "3") Integer pageSize,
+                                   HttpServletRequest request) {
+        ResponseBean response = new ResponseBean();
+        
+        TaUser userElement = getTaUser(request);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setOrgId(Integer.valueOf(orgId));
+        tpTicket.setTaUserId(userElement.getUserId());
+
+        response = tpTicketService.getList(tpTicket, pageNum, pageSize);
+        return response;
+    }
+
+    @ApiOperation(value = "获取报修/投诉/联系单进度详情数据", notes = "获取报修/投诉/联系单进度详情数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "orgId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "ticketId", value = "报修id")
+    })
+    @RequestMapping(value = "/wx/ticket/schedule/{orgId}", method = RequestMethod.GET)
+    public ResponseBean getTicketSchedule(@PathVariable(value = "orgId") Integer orgId, @RequestParam Integer ticketId) {
+        ResponseBean responseBean = new ResponseBean();
+        TpTicket ticket = tpTicketService.getTicketSchedule(String.valueOf(orgId), ticketId);
+        if (null != ticket) {
+            responseBean.addSuccess(ticket);
+        }else {
+            responseBean.addError("没有该工单!");
+        }
+
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/tickets/list/{orgId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取 报修/投诉/联系单 数据列表", notes = "根据 小区编号,工单类型,第几页,一页多少行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "orgId", value = "小区编号"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (1：投诉   2：报修 3：联系物业)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+
+    })
+    public ResponseBean getServiceList(@PathVariable(value = "orgId") Integer orgId,
+                                       @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value = "type") String type,
+                                       HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUser userElement = getTaUser(request);
+
+        TpTicket tpTicket = new TpTicket();
+        tpTicket.setOrgId(Integer.valueOf(orgId));
+        tpTicket.setTaUserId(userElement.getUserId());
+        tpTicket.setType(type);
+
+        responseBean = tpTicketService.getByTypeList(tpTicket, pageNum, pageSize);
+
+        return responseBean;
+
+    }
+
+    @ApiOperation(value = "回复 报修/投诉/联系单 追问接口", notes = "回复 报修/投诉/联系单 追问接口")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "orgId", value = "小区Id"),
+            @ApiImplicitParam(name = "tpTicketRecordComment", value = "回复记录参数(ticketId:工单id,content:回复时间,ticketRecordCommentId:需要回复的id)", paramType = "body"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/wx/ticket/reply/{orgId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketsReply(@PathVariable(value = "orgId") Integer orgId, @RequestBody TpTicketRecordComment tpTicketRecordComment, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        Integer userId = userElement.getUserId();
+        ResponseBean responseBean = new ResponseBean();
+
+        tpTicketRecordComment.setOrgId(orgId);
+        Integer size = tpTicketService.updateTicketsReply(tpTicketRecordComment, userId);
+        if (size > 0){
+            responseBean.addSuccess(size);
+        } else {
+            responseBean.addError("更新失败");
+        }
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加 报修/投诉/联系单", notes = "添加 报修/投诉/联系单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/wx/addtpTicket", method = RequestMethod.POST)
+    @ResponseBody
+    public ResponseBean addTransaction(@RequestBody String paramets, HttpServletRequest request) throws IOException {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        ResponseBean response = tpTicketService.addAiTicketService(userElement, paramets);
+        return response;
+    }
+
+    @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "ticketId", value = "工单Id"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value =
+                    "ticketTitle:工单标题,ticketContent:工单内容，type: 1：投诉   2：报修 3：联系物业 , imageUrl:图片地址 "),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/wx/updateTicket/{ticketId}", method = RequestMethod.POST)
+    public ResponseBean updateTicketContent(@PathVariable("ticketId") Integer ticketId,
+                                            @RequestBody String parameter,
+                                            HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = tpTicketService.updateTicketContent(ticketId, parameter,userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "报修进度终止", notes = "报修进度终止")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "orgId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "ticketId", value = "帖子Id"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+    @RequestMapping(value = "/wx/stopTicket/{orgId}", method = RequestMethod.GET)
+    public ResponseBean stopTicket(@PathVariable("orgId") Integer orgId, @RequestParam("ticketId") Integer ticketId, HttpServletRequest request) {
+        TaUser userElement = getTaUser(request);
+
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = tpTicketService.stopTpTicketRecord(orgId, ticketId, userElement);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "添加工单对话", notes = "添加工单对话")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "content:对话内容，imageUrl:[]图片,ticketId:工单id，" )
+    })
+
+    @RequestMapping(value = "/wx/addWxRecordComment", method = RequestMethod.POST)
+    public ResponseBean addWxRecordComment(@RequestBody String parameter, HttpServletRequest request){
+        TaUser userElement = getTaUser(request);
+        ResponseBean  responseBean = tpTicketService.addWxRecordComment(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName());
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/property/controller/TransactionController.java

@@ -39,7 +39,7 @@ public class TransactionController extends BaseController {
 					"userName：发布人，status：状态，pageNum：总数，pageSize当前页"
 					)
 	})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value = "/transactions",method = RequestMethod.POST)
 	public ResponseBean getList(@RequestBody String parameter, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -49,7 +49,6 @@ public class TransactionController extends BaseController {
 	
 	// @ApiOperation(value = "获取二手租赁详情", notes = "获取二手租赁详情")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
 	})
@@ -63,7 +62,6 @@ public class TransactionController extends BaseController {
 	
 	// @ApiOperation(value = "作废二手租赁", notes = "作废二手租赁")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "交易id")
 	})
@@ -79,7 +77,7 @@ public class TransactionController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
 					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactions/add",method = RequestMethod.POST)
 	public ResponseBean transactionsAdd(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -91,7 +89,7 @@ public class TransactionController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="transactionTitle:话题标题，" +
 					"type:0 代表 二手（卖二手物品）  1 是代表 求购 （买二手物品） 2 是代表 租赁（租二手物品）3其他话题，contentImg：图片，sort:权重值,status:'0 是已作废 1 是已发布  2 是草稿 ")})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactions/updata",method = RequestMethod.POST)
 	public ResponseBean transactionsUpdata(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -101,7 +99,7 @@ public class TransactionController extends BaseController {
 	// @ApiOperation(value = "删除二手租赁",nickname ="删除二手租赁")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id(多个)" )})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactions/delete",method = RequestMethod.POST)
 	public ResponseBean transactionsDelete(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -113,7 +111,7 @@ public class TransactionController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，replyTaUserName：被回复人，taUserName：回复人，" +
 					"status:（0回复我的,1回复全部物业人员的,2全部物业人员回复的,3话题发起人回复的）,createDate:时间" )})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactionReplyList",method = RequestMethod.POST)
 	public ResponseBean transactionReplyList(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -133,7 +131,7 @@ public class TransactionController extends BaseController {
 	// @ApiOperation(value = "添加二手帖子评论",nickname ="添加二手帖子评论")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value ="id:帖子id，contentImg:评论所带图片,replyContent:评论内容" )})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactionReply/add",method = RequestMethod.POST)
 	public ResponseBean transactionReplyAdd(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);
@@ -144,7 +142,7 @@ public class TransactionController extends BaseController {
 	// @ApiOperation(value = "二手帖子举报列表",nickname ="二手帖子举报列表")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =":举报人姓名，reportPhone：举报人电话,transactionId:帖子ID" )})
-	@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+
 	@RequestMapping(value="/transactionReportList",method = RequestMethod.POST)
 	public ResponseBean transactionReportList(@RequestBody String paramets, HttpServletRequest request){
 		TaUser userElement = getTaUser(request);

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

@@ -39,7 +39,6 @@ public class UserVerifyController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
     })
     public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
                                @RequestParam(value = "userName", required = false) String userName,
@@ -57,7 +56,6 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/user/verify/audit/{userVerifyId}", method = RequestMethod.PUT)
     // @ApiOperation(value = "审核用户", notes = "审核用户")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Boolean.class, name = "verifyStatus", value = "true通过；false不通过"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "remark", value = "审核不通过的原因"),
@@ -76,7 +74,6 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/ta/user/has", method = RequestMethod.GET)
     // @ApiOperation(value = "校验移动端手机号是否注册", notes = "校验移动端手机号是否注册")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "手机号"),
     })
     public ResponseBean taUserHas(@RequestParam("ownerTel") String ownerTel,
@@ -102,7 +99,6 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/ta/user/hasOwner", method = RequestMethod.GET)
     // @ApiOperation(value = "根据 期/栋/单元/楼层/户号 校验是否有业主", notes = "根据 期/栋/单元/楼层/户号 校验是否有业主")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "ownerTel", value = "审核id"),
     })
     public ResponseBean taUserHasOwner(@RequestParam("phaseId") Integer phaseId,
@@ -154,7 +150,7 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/user/verifyinfo/{userVerifyId}", method = RequestMethod.PUT)
     // @ApiOperation(value = "楼栋详情页面审核", notes = "楼栋详情页面审核")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "userVerifyId", value = "审核id"),
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "roleState", value = "1:业主，2:租客，3:家属"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "verifyStatus", value = "0 是未审核1是审核通过2是审核不通过"),

src/main/java/com/huiju/estateagents/property/dao/TdImagesMapper.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TdImages;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 图片表 Mapper 接口
@@ -15,4 +18,15 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdImagesMapper extends BaseMapper<TdImages> {
 
+    List<TdImages> getByUUIDAndByType(Map<String,Object> map);
+
+
+    /**
+     * 批量删除
+     *  根据 uuid 和 type
+     * @param map
+     * @return
+     */
+    int deleteByUuidAndType(Map map);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpAnnouncementMapper.java

@@ -33,4 +33,6 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
      * @return
      */
     List<TpAnnouncement> getAnnouncement(@Param("orgId") Integer orgId, @Param("sum") Integer sum);
+
+    IPage<TpAnnouncement> getWxAnnouncements(Page page, @Param("orgId") Integer orgId,@Param("title") String title);
 }

src/main/java/com/huiju/estateagents/property/dao/TpSocialViewMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.dao;
+
+import com.huiju.estateagents.property.model.TpSocialView;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpSocialViewMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpSocialView record);
+
+    int insertSelective(TpSocialView record);
+
+    TpSocialView selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpSocialView record);
+
+    int updateByPrimaryKey(TpSocialView record);
+
+    Integer selectViewNum(TpSocialView tpSocialView);
+}

src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java

@@ -8,6 +8,9 @@ import com.huiju.estateagents.property.vo.TpTicketVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 工单表 Mapper 接口
@@ -21,4 +24,15 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
 
     IPage<TpTicket> ticketList(Page page, @Param("ticket") TpTicket ticket, @Param("userName") String UserNmae, @Param("updateUserNmae") String updateUserNmae, @Param("orgId") Integer orgId);
     TpTicketVO ticketDetails(@Param("id") Integer id);
+
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param map
+     * @return
+     */
+    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,Map map);
+
+    TpTicket selectTpTicketName(@Param("communityId")Integer communityId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
+
+    void updateTpUserId(@Param("ticketId") Integer ticketId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpTicketRecordCommentMapper.java

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.model.TpTicketRecord;
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 物业端工单追问表 Mapper 接口
@@ -15,4 +19,22 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpTicketRecordCommentMapper extends BaseMapper<TpTicketRecordComment> {
 
+    /**
+     * 根据工单ID,最新的几条 查询出最新的追答记录
+     *
+     *  size 表示最新几条
+     *  tickerId 工单ID
+     *
+     * @param map
+     * @return
+     */
+    List<TpTicketRecordComment> selectByTicketId(Map map);
+
+    /**
+     * 查询出这个处理撞他下所有的回复数据
+     * @param tpTicketRecord
+     * @return
+     */
+    List<TpTicketRecordComment> selectByTicketRecordId(TpTicketRecord tpTicketRecord);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpTicketRecordMapper.java

@@ -5,6 +5,8 @@ import com.huiju.estateagents.property.model.TpTicketRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 工单处理表 Mapper 接口
@@ -25,4 +27,6 @@ public interface TpTicketRecordMapper extends BaseMapper<TpTicketRecord> {
     void updateTicketRecord(TpTicketRecord tpTicketRecord);
 
     String statusName(@Param("status") String status);
+
+    List<TpTicketRecord> getTicketRecordByTicketId(@Param("orgId") String orgId, @Param("ticketId") Integer ticketId);
 }

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.property.model;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -8,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -55,4 +57,21 @@ public class TpAnnouncement implements Serializable {
 
     /**更新时间**/
     private Date updateDate;
+
+
+    /**
+     * 报名状态
+     */
+    @TableField(exist = false)
+    private String signStatus;
+    /**
+     * 签到状态
+     * 0已签到，1未签到
+     */
+    @TableField(exist = false)
+    private  Integer signType;
+
+    @TableField(exist = false)
+    private List<String> imgList;
+
 }

src/main/java/com/huiju/estateagents/property/model/TpSocialView.java

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.property.model;
+
+import java.util.Date;
+
+public class TpSocialView {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer uuid;
+
+    private String socialType;
+
+    private Integer taUserId;
+
+    private String remark;
+
+    private Date createDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(Integer uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getSocialType() {
+        return socialType;
+    }
+
+    public void setSocialType(String socialType) {
+        this.socialType = socialType == null ? null : socialType.trim();
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+}

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -102,4 +104,9 @@ public class TpTicket implements Serializable {
     private LocalDateTime updateDate;
 
 
+    @TableField(exist = false)
+    private String [] tdImagesList;
+
+    @TableField(exist = false)
+    private List<TpTicketRecord> ticketRecordList;
 }

src/main/java/com/huiju/estateagents/property/model/TpTicketRecord.java

@@ -72,4 +72,10 @@ public class TpTicketRecord implements Serializable {
      */
     @TableField(exist = false)
     private String statusName;
+
+    @TableField(exist = false)
+    private String ticketStatusName;
+
+    @TableField(exist = false)
+    private List<TpTicketRecordComment> ticketRecordCommentList;
 }

src/main/java/com/huiju/estateagents/property/service/SocialServiceI.java

@@ -0,0 +1,40 @@
+package com.huiju.estateagents.property.service;
+
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.TpActivity;
+import com.huiju.estateagents.property.model.TpAnnouncement;
+import com.huiju.estateagents.property.model.TpTicket;
+import com.huiju.estateagents.property.model.TpTransaction;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author weichaochao
+ * @Title: SocialServiceI
+ * @date 2018/10/23
+ */
+public interface SocialServiceI {
+
+	/**
+	 * 查看公告详情
+	 * @param id
+	 * @param orgId
+	 * @param userId
+	 * @return
+	 */
+    TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, Integer userId);
+
+
+	/**
+	 * 分页获取公告列表
+	 * @param orgId
+	 * @param title
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean getAnnouncements(Integer orgId, String title, Integer pageNum, Integer pageSize);
+}

src/main/java/com/huiju/estateagents/property/service/TpTicketService.java

@@ -2,7 +2,11 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpTicket;
+import com.huiju.estateagents.property.model.TpTicketRecordComment;
+
+import java.io.IOException;
 
 /**
  * <p>
@@ -65,4 +69,74 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName, String longName);
+
+
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param tpTicket
+     * @param pageCode
+     * @param pageSize
+     * @return 返回 维修/投诉/联系单 各 pageSize 条
+     */
+    ResponseBean getList(TpTicket tpTicket,Integer pageCode, Integer pageSize);
+
+    /**
+     * 根据 小区ID 用户ID 类型 查询数据
+     * @param tpTicket
+     * @param pageNum
+     * @param pageSize
+     * @return 返回 维修/投诉/联系单 记录列表
+     */
+    ResponseBean getByTypeList(TpTicket tpTicket, Integer pageNum, Integer pageSize);
+
+    /**
+     * 获取报修详情
+     * @param orgId
+     * @param ticketId
+     * @return
+     */
+    TpTicket getTicketSchedule(String orgId, Integer ticketId);
+
+
+    /**
+     * 添加 维修/投诉/联系单
+     * @param userElement
+     * @param parameter
+     * @return
+     */
+    ResponseBean addAiTicketService(TaUser userElement, String parameter) throws IOException;
+
+    /**
+     * 回复工单
+     * @param tpTicketRecordComment
+     * @return
+     */
+    @Deprecated
+    Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId);
+
+    /**
+     * 修改 维修/投诉/联系单 内容
+     * @param ticketId
+     * @param parameter
+     * @param userElement
+     */
+    ResponseBean updateTicketContent(Integer ticketId, String parameter,TaUser userElement);
+
+    /**
+     * 终止 维修/投诉/联系单
+     * @param orgId
+     * @param ticketId
+     * @return
+     */
+    ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, TaUser userElement);
+
+    /**
+     * 添加工单对话
+     * @param parameter
+     * @param verifyId
+     * @param orgId
+     * @param userName
+     * @return
+     */
+    ResponseBean addWxRecordComment(String parameter, Integer verifyId, Integer orgId, String userName);
 }

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -0,0 +1,120 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.property.common.Constant;
+import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.dao.*;
+import com.huiju.estateagents.property.model.*;
+import com.huiju.estateagents.property.service.SocialServiceI;
+import com.huiju.estateagents.property.vo.TpTicketVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author weichaochao
+ * @Title: SocialServiceImpl
+ * @date 2018/10/23
+ */
+@Service("SocialService")
+@Transactional
+public class SocialServiceImpl implements SocialServiceI {
+
+    @Autowired
+    private TpAnnouncementMapper tpAnnouncementMapper;
+
+    @Autowired
+    private TpSocialViewMapper tpSocialViewMapper;
+
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
+    @Override
+    @Transactional
+    public TpAnnouncement findAnnouncementDetail(Integer id, Integer orgId, Integer userId) {
+        //更新此用户的查看次数操作
+        Integer allViewNum = updateSocialView(userId, Constant.ANNOUNCEMENT, orgId, id);
+        if (null != allViewNum) {
+            tpAnnouncementMapper.updateByPrimaryKeySelective(id, allViewNum);
+        }
+        TpAnnouncement tpAnnouncement = tpAnnouncementMapper.selectByPrimaryKey(id, orgId);
+//        tpAnnouncement.setUserName(tpUserMapper.selectByPrimaryKey(tpAnnouncement.getCreateUser()).getUserName());
+//        tpAnnouncement.setUserName(tpUserMapper.selectByPrimaryKey(tpAnnouncement.getCreateUser()).getUserName());
+
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("uuid", tpAnnouncement.getId());
+        map.put("type", Constant.ANNOUNCEMENT);
+        // 查询图片
+        List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+        List<String> imgList = tdImagesList.stream().map(e -> new String(e.getImageUrl())).collect(Collectors.toList());
+        tpAnnouncement.setImgList(imgList);
+        return tpAnnouncement;
+    }
+
+    /**
+     * 分页获取公告列表
+     *
+     * @param orgId
+     * @param title
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public ResponseBean getAnnouncements(Integer orgId, String title, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        Map<String, Object> parameter = Maps.newHashMap();
+        //使用分页插件
+        Page<TpAnnouncement> page = new Page<>(pageNum, pageSize);
+        // 获取数据
+        IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title);
+        parameter.put("total", wxAnnouncementsPage.getTotal());
+        parameter.put("list", wxAnnouncementsPage.getRecords());
+        responseBean.addSuccess(parameter);
+        return responseBean;
+    }
+
+
+
+    /**
+     * 更新此用户的查看次数操作
+     *
+     * @param userId
+     * @param socialType
+     * @param orgId
+     * @param uuid
+     */
+    private Integer updateSocialView(Integer userId, String socialType, Integer orgId, Integer uuid) {
+        //检查是否查看过这个帖子
+        TpSocialView tpSocialView = new TpSocialView();
+        tpSocialView.setTaUserId(userId);
+        tpSocialView.setSocialType(socialType);
+        tpSocialView.setCommunityId(orgId);
+        tpSocialView.setUuid(uuid);
+        Integer viewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+
+        //查看过的话查看次数加一
+        if (viewNum == 0) {
+            tpSocialView.setCreateDate(new Date());
+            tpSocialViewMapper.insertSelective(tpSocialView);
+            tpSocialView.setTaUserId(null);
+            Integer allViewNum = tpSocialViewMapper.selectViewNum(tpSocialView);
+            return allViewNum;
+        }
+        return null;
+    }
+}

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
@@ -15,11 +17,12 @@ import com.huiju.estateagents.property.vo.TpTicketVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.time.ZoneId;
+import java.util.*;
 
 /**
  * <p>
@@ -47,9 +50,6 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     private TpTicketRecordCommentMapper tpTicketRecordCommentMapper;
 
-//    @Autowired
-//    private TaUserMapper taUserMapper;
-
     @Autowired
     private MessageMapper messageMapper;
 
@@ -114,9 +114,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         /*查询当前受理人*/
         ticketVO.setTpUserNmae(userMapper.selectByIdUserName(ticketVO.getTpUserId()));
         /*所有物业端本小区的人员*/
-        ticketVO.setUserList(userMapper.getUser( userID,orgId));
+        ticketVO.setTpUsersList(userMapper.getUser( userID,orgId));
         /*本人*/
-        ticketVO.setCurrentUserName(userID);
+        ticketVO.setCurrentUserName(userID.toString());
 
 
         /*查询工单类容的图片*/
@@ -426,4 +426,538 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         response.addSuccess("成功");
         return response;
     }
+
+
+    @Override
+    public ResponseBean getList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
+
+        ResponseBean<Map<String, Object>> responseBean = new ResponseBean();
+        // 最终返回值
+        Map<String, Object> result = Maps.newHashMap();
+
+        Map<String, Object> parameter = Maps.newHashMap();
+        parameter.put("communityId", tpTicket.getOrgId());
+        parameter.put("taUserId", tpTicket.getTaUserId());
+
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 2);
+        // 报修
+        Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, parameter);
+        List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
+        List<TpTicketVO> repairsList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketRepairsList, repairsList);
+
+        // 投诉
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 1);
+        Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
+        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, parameter);
+        List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
+        List<TpTicketVO> complaintList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketComplaintList, complaintList);
+
+        // 联系工单
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", 3);
+        Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
+        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, parameter);
+        List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
+        List<TpTicketVO> liaisonList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
+        Long[] arr = new Long[]{pageComplaint.getTotal(), pageLiaison.getTotal(), pageRepairs.getTotal()};
+        Arrays.sort(arr);
+        result.put("repairs", repairsList);
+        result.put("complaint", complaintList);
+        result.put("liaison", liaisonList);
+        result.put("total", arr[2]);
+
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
+
+    /**
+     * 公共方法, 获取一条数据
+     *
+     * @param map
+     * @return
+     */
+    private TpTicketRecordComment getTicketRecordComment(Map map) {
+        List<TpTicketRecordComment> list = tpTicketRecordCommentMapper.selectByTicketId(map);
+        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) {
+
+        // 获取联系号码簿（物业号码）
+        // List<TpannouncementTel> tpannouncementTel = tpannouncementTelMapper.getTpannouncementTel();
+
+        // 查询参数
+        Map<String, Object> lastRecordMap = Maps.newHashMap();
+        // 表示查询出最新的一条
+        lastRecordMap.put("size", 1);
+
+        source.stream().forEach(e -> {
+            TpTicketVO tpTicketVO = new TpTicketVO();
+            BeanUtils.copyProperties(e, tpTicketVO);
+            // 设置工单编号
+            lastRecordMap.put("tickerId", e.getId());
+            TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            List<TpTicketRecord> recordList = tpTicketRecordMapper.getTicketRecordByTicketId(e.getOrgId() + "", e.getId());
+            // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
+            String repairType = e.getRepairType();
+            String repairName = repairType == null ?
+                    null : "0".equals(repairType) ?
+                    "公共区域" : "1".equals(repairType) ?
+                    "房屋质量" : "2".equals(repairType) ?
+                    "户内设施" : null;
+            tpTicketVO.setRepairName(repairName);
+            tpTicketVO.setStatus(recordList.get(recordList.size() - 1).getStatus());
+            tpTicketVO.setTicketStatusName(recordList.get(recordList.size() - 1).getTicketStatusName());
+            tpTicketVO.setTicketRecordDate(Date.from(recordList.get(recordList.size() - 1).getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
+            tpTicketVO.setTicketStatusContent(recordList.get(recordList.size() - 1).getContent());
+            if (null != comment) {
+                tpTicketVO.setCommentContent(comment.getContent());
+                tpTicketVO.setCommentCreateDate(Date.from(comment.getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
+            }
+
+//            // 0:待分配  1:拒绝受理 2:待处理 3:正在处理 4:待评价 5:已评价 6:被终止
+//
+//            // 0:待分配  需要出现物业号码簿
+//            if ("0".equals(e.getStatus())) {
+//                Map<String, Object> map = Maps.newHashMap();
+//                map.put("message","联系物业号码簿");
+//                map.put("data",tpannouncementTel);
+//                tpTicketVO.setContactBook(map);
+//            }
+
+            target.add(tpTicketVO);
+        });
+    }
+
+    @Override
+    public ResponseBean getByTypeList(TpTicket tpTicket, Integer pageNum, Integer pageSize) {
+
+        ResponseBean response = new ResponseBean();
+
+        Map<String, Object> parameter = Maps.newHashMap();
+        parameter.put("communityId", tpTicket.getOrgId());
+        parameter.put("taUserId", tpTicket.getTaUserId());
+
+        //  1：投诉   2：报修 3：联系物业
+        parameter.put("type", tpTicket.getType());
+
+        Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, parameter);
+        List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
+
+        List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
+        tpTicketVOConvert(tpTicketList, tpTicketVOList);
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("pagelist", tpTicketVOList);
+        map.put("total", pagelist.getTotal());
+
+        response.addSuccess(map);
+
+        return response;
+    }
+
+    /**
+     * 获取报修详情
+     *
+     * @param orgId
+     * @param ticketId
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public TpTicket getTicketSchedule(String orgId, Integer ticketId) {
+        //查看工单详情
+        TpTicket ticket = tpTicketMapper.selectById(ticketId);
+        if (null != ticket) {
+            //工单进度
+            List<TpTicketRecord> ticketRecordList = tpTicketRecordMapper.getTicketRecordByTicketId(orgId, ticketId);
+            //工单回复
+            ticketRecordList.stream().forEach(tpTicketRecord -> {
+                List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(tpTicketRecord);
+                //遍历工单下每条对话信息的id去查对话图片
+                for (TpTicketRecordComment tpTicketRecordComment : ticketRecordCommentList) {
+                    Map<String, Object> map = Maps.newHashMap();
+                    map.put("uuid", tpTicketRecordComment.getId());
+                    map.put("type", "reply");
+                    List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+                    tpTicketRecordComment.setImgURL(tdImagesList);
+                }
+                tpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
+            });
+
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("uuid", ticket.getId());
+            map.put("type", "service");
+            List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+
+            // 图片数组
+            String[] imgageArr = new String[tdImagesList.size()];
+
+            for (int i = 0; i < tdImagesList.size(); i++) {
+                imgageArr[i] = tdImagesList.get(i).getImageUrl();
+            }
+
+            ticket.setTdImagesList(imgageArr);
+            ticket.setTicketRecordList(ticketRecordList);
+
+//            // 把该工单的消息变为 已读
+//            TpMessage tpMessage = new TpMessage();
+//            tpMessage.setSource("1");
+//            tpMessage.setModelType("1");
+//            tpMessage.setMessageType(ticket.getType());
+//
+//            tpMessage = tpMessageMapper.selectTicketMessage(tpMessage);
+//            tpMessage.setReadStatus("1");
+//
+//            //  变为已读
+//            tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+
+        }
+        return ticket;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean addAiTicketService(TaUser userElement, String parameter) throws IOException {
+        ResponseBean response = new ResponseBean();
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        String imageUrl = (String) jsonObject.get("imageUrl");
+
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter, TpTicket.class);
+
+        /**
+         * 工单表 -> 工单处理表 -> 消息表
+         * 依次插入相关数据, 该工单默认的第一条数据(待分配), 是工单标题,
+         */
+
+        tpTicket.setOrgId(userElement.getOrgId());
+        // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
+        tpTicket.setTaUserId(userElement.getUserId());
+        // 默认待分配
+        tpTicket.setStatus("0");
+        // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
+        tpTicket.setCreateUser(userElement.getUserId());
+        tpTicket.setCreateDate(LocalDateTime.now());
+        tpTicket.setUpdateUser(userElement.getUserId());
+        //tpTicket.setUpdateDate(new Date());
+        //校验此工单是否已存在
+        TpTicket tpTicketName= tpTicketMapper.selectTpTicketName(userElement.getOrgId(),tpTicket.getType(),tpTicket.getTicketTitle());
+        if (null != tpTicketName){
+            response.addError("工单已存在");
+            return  response;
+        }
+        // 插入工单
+        tpTicketMapper.insert(tpTicket);
+        insertTdImage(tpTicket, imageUrl, userElement.getUserId());
+
+        Integer id = tpTicket.getId();
+        TpTicketRecord tpTicketRecord = new TpTicketRecord();
+        //获取当前插入的信息，维护工单记录表
+        TpTicket tpTicketReco = tpTicketMapper.selectById(id);
+        tpTicketRecord.setOrgId(userElement.getOrgId());
+        tpTicketRecord.setTicketId(tpTicketReco.getId());
+        // 1：投诉   2：报修 3：联系物业
+        String typeName = "2".equals(tpTicket.getType()) ? "报修" : "1".equals(tpTicket.getType()) ? "投诉" : "3".equals(tpTicket.getType()) ? "联系工单" : "未知类型";
+        tpTicketRecord.setContent("您的" + typeName + "正在分配物业处理人员, 若长时间无人处理, 请联系物业! 联系物业号码簿 >");
+        tpTicketRecord.setStatus(tpTicketReco.getStatus());
+        tpTicketRecord.setCreateUser(userElement.getUserId());
+        tpTicketRecord.setCreateDate(LocalDateTime.now());
+        // 插入工单处理表
+        tpTicketRecordMapper.insert(tpTicketRecord);
+        // 推物业端，推这个小区下的所有管理员
+//        List<TpUser> tpUserList= tpUserMapper.selectCommunityId(userElement.getOrgId());
+//        for (TpUser tpUser:tpUserList) {
+//            Map<String, Object> mapProp = new HashMap<>();
+//            mapProp.put("communityId", userElement.getOrgId());
+//            mapProp.put("createUserId", userElement.getUserVerifyId());
+//            mapProp.put("ticketId", tpTicket.getId());
+//            mapProp.put("title", tpTicket.getTicketTitle());
+//            mapProp.put("name", userElement.getUserName());
+//            mapProp.put("tpUserId", tpUser.getId());
+//            applicationContext.publishEvent(new MessageEvent(mapProp, Constant.TICKET_ADD, mapProp));
+//        }
+
+
+        response.addSuccess(tpTicketReco);
+        return response;
+    }
+
+    /**
+     * 存入图片
+     *
+     * @param tpTicket
+     * @param imageUrl
+     * @param userId
+     * @throws IOException
+     */
+    private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) {
+        if (null == imageUrl || "".equals(imageUrl)) {
+            return;
+        }
+        String[] imgArr = imageUrl.split(",");
+        for (String img : imgArr) {
+            TdImages tdImages = new TdImages();
+            Integer uuId = tpTicket.getId();
+            tdImages.setImageUrl(img);
+            tdImages.setType(Constant.SERVICE);
+            tdImages.setUuid(uuId);
+            tdImages.setCreateUser(userId);
+            tdImages.setCreateTime(LocalDateTime.now());
+            tdImagesMapper.insert(tdImages);
+        }
+
+    }
+
+
+    /**
+     * 回复工单
+     *
+     * @param tpTicketRecordComment
+     * @return
+     */
+    @Override
+    public Integer updateTicketsReply(TpTicketRecordComment tpTicketRecordComment, Integer userId) {
+        //查询用户名
+        User taUser = userMapper.selectById(userId);
+
+        TpTicket  tpTicket= tpTicketMapper.selectById(tpTicketRecordComment.getTicketId());
+        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(tpTicketRecordComment.getTicketId(), Integer.valueOf(tpTicket.getStatus()));
+
+        tpTicketRecordComment.setUserName(taUser.getUserName());
+        tpTicketRecordComment.setParentId(tpTicketRecordComment.getId());
+        tpTicketRecordComment.setUuid(userId);
+        tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
+        tpTicketRecordComment.setUserType(Constant.TICKET_USER_TYPE);
+        tpTicketRecordComment.setCreateDate(LocalDateTime.now());
+        //插入回复数据
+        return tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseBean updateTicketContent(Integer ticketId, String parameter, TaUser userElement) {
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        String imageUrl = (String) jsonObject.get("imageUrl");
+
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter, TpTicket.class);
+
+        // 删除旧图片链接
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("uuid", ticketId);
+        map.put("type", "service");
+        tdImagesMapper.deleteByUuidAndType(map);
+
+        insertTdImage(tpTicket, imageUrl, userElement.getUserId());
+
+        TpTicket ticket = tpTicketMapper.selectById(ticketId);
+        ticket.setTicketTitle(tpTicket.getTicketTitle());
+        ticket.setTicketContent(tpTicket.getTicketContent());
+
+        tpTicketMapper.updateById(ticket);
+        // 维护1.5版本消息
+//        Integer messageTicket= tpMessageMapper.selectTicket(ticketId);
+//        if (!"".equals(messageTicket)) {
+//            TpMessage tpMessage = new TpMessage();
+//            tpMessage.setMessageContent("工单“" + tpTicket.getTicketTitle() + "”已被分配给您，点击查看并处理");
+//            tpMessage.setUpdateDate(new Date());
+//            tpMessage.setUpdateUser(userElement.getUserVerifyId());
+//            tpMessageMapper.updateTickMessage(tpMessage);
+//        }
+        // 修改消息以后推送物业端
+        // 推物业端，推这个小区下的所有管理员
+//        List<TpUser> tpUserList= tpUserMapper.selectCommunityId(ticket.getOrgId());
+//        for (TpUser tpUser:tpUserList) {
+//            Map<String, Object> mapProp = new HashMap<>();
+//            mapProp.put("communityId", ticket.getOrgId());
+//            mapProp.put("createUserId", userElement.getUserVerifyId());
+//            mapProp.put("ticketId", ticketId);
+//            mapProp.put("title", tpTicket.getTicketTitle());
+//            mapProp.put("name", userElement.getUserName());
+//            mapProp.put("tpUserId", tpUser.getId());
+//            applicationContext.publishEvent(new MessageEvent(mapProp, Constant.TICKET_UPDATE, mapProp));
+//        }
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ResponseBean stopTpTicketRecord(Integer orgId, Integer ticketId, TaUser userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TpTicket tpTicket = new TpTicket();
+            tpTicket.setStatus("6");
+            tpTicket.setId(ticketId);
+            tpTicketMapper.updateById(tpTicket);
+            //根据1.4版本需要被终止时，清空当前工单受理人
+            tpTicketMapper.updateTpUserId(ticketId);
+
+            TpTicketRecord tpTicketRecord = new TpTicketRecord();
+            tpTicketRecord.setStatus("6");
+            tpTicketRecord.setTicketId(ticketId);
+            tpTicketRecord.setOrgId(orgId);
+
+            tpTicketRecord.setContent("您的联系单已被您自己终止，如果仍有问题，可以在服务页新增一个报修/投诉/联系单");
+            tpTicketRecord.setCreateUser(userElement.getUserId());
+            tpTicketRecord.setCreateDate(LocalDateTime.now());
+            tpTicketRecordMapper.insert(tpTicketRecord);
+            // 终止后维护tp_ticket_record_comment对话
+            Integer createUser= tpTicketMapper.selectById(ticketId).getCreateUser();
+            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(createUser);
+
+            User taUser= userMapper.selectById(taUserVerify.getUserId());
+            TpTicketRecordComment tpTicketRecordComment = new TpTicketRecordComment();
+            tpTicketRecordComment.setOrgId(orgId);
+            tpTicketRecordComment.setTicketId(ticketId);
+            tpTicketRecordComment.setTicketRecordId(tpTicketRecord.getId());
+            tpTicketRecordComment.setUuid(userElement.getUserId());
+            tpTicketRecordComment.setUuid(taUserVerify.getId());
+            tpTicketRecordComment.setUserName(taUser.getUserName());
+            tpTicketRecordComment.setContent("业主终止工单，原因——无");
+            tpTicketRecordComment.setCreateDate(LocalDateTime.now());
+            tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+
+            TpTicket ticket= tpTicketMapper.selectById(ticketId);
+            // 推物业端，推这个小区下的所有管理员
+//            List<TpUser> tpUserList= tpUserMapper.selectCommunityId(communityId);
+//            for (TpUser tpUser:tpUserList) {
+//                Map<String, Object> mapProp = new HashMap<>();
+//                mapProp.put("communityId", communityId);
+//                mapProp.put("createUserId", userElement.getUserVerifyId());
+//                mapProp.put("title", ticket.getTicketTitle());
+//                mapProp.put("name", userElement.getUserName());
+//                mapProp.put("ticketId", ticketId);
+//                mapProp.put("tpUserId", tpUser.getId());
+//                applicationContext.publishEvent(new MessageEvent(mapProp, Constant.TICKET_TERMINATION, mapProp));
+//            }
+            return responseBean;
+        } catch (Exception e) {
+            e.printStackTrace();
+            responseBean.addError("服务器异常");
+            return responseBean;
+        }
+    }
+
+    /**
+     * 公共方法
+     * 把工单插入消息表
+     *
+     * @param tpTicket 工单
+     * @param userId   用户id
+     */
+    private Message insertTicketMessage(TpTicket tpTicket, Integer userId) {
+
+        Message tpMessage = new Message();
+        tpMessage.setOrgId(tpTicket.getOrgId());
+        // 消息类型  1：投诉   2：报修 3：联系物业  4： 访客  5:公告  6:系统通知  7:账单 8:活动
+        tpMessage.setMessageType(tpTicket.getType());
+        // 通知方式: APP 内通知
+        tpMessage.setAdviceType("1");
+        // 模板类型为 消息模板
+        tpMessage.setModelType("1");
+        tpMessage.setUuid(userId);
+        // 接收人类型: APP用户
+        tpMessage.setUuidType("1");
+        // 来源: APP 端用户
+        tpMessage.setSource("1");
+        // 这里的消息内容对应, 工单标题
+        tpMessage.setMessageContent(tpTicket.getTicketTitle());
+        tpMessage.setStatus("1");
+        // 阅读状态: 0未阅读
+        tpMessage.setReadStatus("0");
+        tpMessage.setCreateUser(userId);
+        tpMessage.setCreateDate(LocalDateTime.now());
+        tpMessage.setUpdateUser(userId);
+        tpMessage.setUpdateDate(LocalDateTime.now());
+
+        messageMapper.insert(tpMessage);
+
+        return tpMessage;
+
+    }
+    @Override
+    public ResponseBean addWxRecordComment(String parameter, Integer verifyId,Integer communityId,String userName) {
+        ResponseBean response=new ResponseBean();
+        JSONObject object= JSONObject.parseObject(parameter);
+
+        String  content = object.getString("content");
+        Integer  ticketId = object.getInteger("ticketId");
+
+        /*根据工单Id和状态查出工单记录ID*/
+        TpTicket  tpTicket= tpTicketMapper.selectById(ticketId);
+        TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(ticketId, Integer.valueOf(tpTicket.getStatus()));
+        TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
+        tpTicketRecordComment.setOrgId(communityId);
+        tpTicketRecordComment.setContent(content);
+        tpTicketRecordComment.setTicketId(ticketId);
+        tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
+        tpTicketRecordComment.setUuid(verifyId);
+        tpTicketRecordComment.setUserType("1");
+        tpTicketRecordComment.setUserName(userName);
+        tpTicketRecordComment.setCreateDate(LocalDateTime.now());
+        tpTicketRecordCommentMapper.insert(tpTicketRecordComment);
+        JSONArray contentImg = object.getJSONArray("imageUrl");
+        if (null!=contentImg){
+            String[] contentImgArray = contentImg.toArray(new String[]{});
+
+            for (String img : contentImgArray) {
+                TdImages tdImages = new TdImages();
+                tdImages.setImageUrl(img);
+                /*注意reply用于标记工单回复类的图片*/
+                tdImages.setType("reply");
+                tdImages.setUuid(tpTicketRecordComment.getId());
+                tdImages.setCreateTime(LocalDateTime.now());
+                tdImages.setCreateUser(verifyId);
+                tdImagesMapper.insert(tdImages);
+            }
+        }
+        //1.5版本推送消息message
+        //工单消息回复最最后一个物业人员
+
+        Message message = new Message();
+        message.setOrgId(communityId);
+        message.setModelType("1");
+        message.setMessageType(tpTicket.getType());
+        message.setAdviceType("4");
+        //查询当前工单处理
+//        TpTicket ticket= tpTicketMapper.getTicketTpUserId(ticketId,communityId);
+//        //考虑到工单没有分配，物业人员没有追问，只能塞本小区超级管理员ID
+//        TpTicketRecordComment recordComment= tpTicketRecordCommentMapper.getUuID(communityId,ticketId);
+//        Integer uuserID= toCommunitiesMapper.selectAndmin(communityId);
+//        // 查询工单创建人名称
+//        TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(ticket.getCreateUser());
+//        TaUser taUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        // app推送物业端的消息
+//        Map<String,Object> mapPorp = new HashMap<>();
+//        mapPorp.put("communityId",communityId);
+//        mapPorp.put("createUserId",tpTicket.getCreateUser());
+//        mapPorp.put("uuId",recordComment==null?uuserID:recordComment.getUuid());
+//        mapPorp.put("ticketId",ticketId);
+//        mapPorp.put("replyCount","业主"+taUser.getUserName()+"回复了工单“"+ticket.getTicketTitle()+"”，请处理");
+//        mapPorp.put("uuidType",Constant.UUID_TYPE_PROP);
+//        mapPorp.put("source",Constant.SOURCE_APP);
+//        applicationContext.publishEvent(new MessageEvent(tpTicket, Constant.TICKET_REPLY_PROP,mapPorp));
+        response.addSuccess("成功");
+        return response;
+    }
 }

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -6,7 +6,10 @@ import com.huiju.estateagents.property.model.TpTicketRecordComment;
 import com.huiju.estateagents.property.model.User;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * version V1.0
@@ -18,53 +21,77 @@ import java.util.List;
  **/
 @Data
 public class TpTicketVO extends TpTicket {
-    /**
-     * 发起人
-     */
-    private String createUserNmae;
+
+    /** 小区编号 **/
+    private Integer communityId;
+
 
     /**
-     * 受理人
+     * 报修类型的名字
      */
-    private String tpUserNmae;
+    private String repairName;
+
+    /** ====================================== **/
+
+
+    /** 流程状态名称 **/
+    private String ticketStatusName;
+
+    /** 流程状态内容 **/
+    private String ticketStatusContent;
+
+    /** 流程状态时间 **/
+    private Date ticketRecordDate;
+
+    /** 最新进展 **/
+    private String commentContent;
+
+    /** 最新进展的时间 **/
+    private Date commentCreateDate;
+
+    /** 联系物业号码簿 **/
+    private Map<String,Object> contactBook;
+
+    /**投诉流程状态**/
+    private String statusList;
 
     /**
-     *工单内容下的图片
+     * 工单发起人
      */
-    private  List<String> contentImageUrl;
+    private String createUserNmae;
 
     /**
-     * 工单流程状态
+     * 发起人手机号码
      */
-    private List<TpTicketRecord> recordList;
+    private String loginName;
 
     /**
-     * 工单对话图片
+     * 当前受理人
      */
-    private  List<String> ticketRecordCommentImagesUrl;
+    private String tpUserNmae;
 
     /**
-     * 工单对话记录
+     * 物业端所有小区人员
      */
-    private List<TpTicketRecordComment> tpTicketRecordCommentList;
+    private List<User> tpUsersList;
 
     /**
-     * 发起人手机号码
+     * 本人
      */
-    private  String loginName;
+    private  String currentUserName;
 
     /**
-     * 所有当前小区的物业人员
+     * 工单内容图片
      */
-    private List<User> userList;
+    private  List<String> contentImageUrl;
 
     /**
-     * 当前人
+     * 工单流程
      */
-    private Integer CurrentUserName;
+    private List<TpTicketRecord> recordList;
 
     /**
-     * 工单状态集合
+     * 工单创建人房产
      */
-    private List<Integer> statusList;
+    private  String houseProperty;
 }

src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java

@@ -59,9 +59,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
 
-        IPage<TaNews> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
+        IPage<TaNews> page = new Page<>(pageNum,pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);

src/main/resources/mapper/property/TdImagesMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TdImagesMapper">
 
+    <select id="getByUUIDAndByType" parameterType="map" resultType="com.huiju.estateagents.property.model.TdImages">
+        select
+         *
+        from td_images
+        where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+        order by create_time DESC
+    </select>
+
+    <delete id="deleteByUuidAndType" parameterType="map" >
+    delete from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+  </delete>
 </mapper>

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -75,4 +75,30 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+
+  <select id="getWxAnnouncements" resultType="com.huiju.estateagents.property.model.TpAnnouncement">
+    SELECT
+    a.id,
+    a.announcement_title,
+    a.announcement_content,
+    a.create_date,
+    u.user_name as user_name,
+    a.sort,
+    a.view_count
+    FROM
+    tp_announcement a
+    LEFT JOIN tp_user u ON a.create_user = u.id
+    AND u.community_id = #{communityId,jdbcType=INTEGER}
+    WHERE
+    a.community_id = #{communityId,jdbcType=INTEGER}
+    AND ( a.STATUS = 1 OR a.STATUS = 3 )
+    <if test="title != null and title != ''">
+      and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
+    </if>
+    ORDER BY
+    a.sort DESC,
+    a.update_date DESC,
+    a.create_date DESC
+  </select>
 </mapper>

src/main/resources/mapper/property/TpSocialViewMapper.xml

@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.huiju.estateagents.property.dao.TpSocialViewMapper" >
+  <resultMap id="BaseResultMap" type="com.huiju.estateagents.property.model.TpSocialView" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="uuid" property="uuid" jdbcType="INTEGER" />
+    <result column="social_type" property="socialType" jdbcType="VARCHAR" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, uuid, social_type, ta_user_id, remark, create_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_social_view
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
+    insert into tp_social_view (id, community_id, uuid, 
+      social_type, ta_user_id, remark, 
+      create_date)
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, 
+      #{socialType,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
+    insert into tp_social_view
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="uuid != null" >
+        uuid,
+      </if>
+      <if test="socialType != null" >
+        social_type,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
+    update tp_social_view
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="uuid != null" >
+        uuid = #{uuid,jdbcType=INTEGER},
+      </if>
+      <if test="socialType != null" >
+        social_type = #{socialType,jdbcType=VARCHAR},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
+    update tp_social_view
+    set community_id = #{communityId,jdbcType=INTEGER},
+      uuid = #{uuid,jdbcType=INTEGER},
+      social_type = #{socialType,jdbcType=VARCHAR},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectViewNum" resultType="java.lang.Integer" parameterType="com.huiju.estateagents.property.model.TpSocialView">
+    select count(*) from tp_social_view
+    where 1=1
+    <if test="taUserId != null" >
+      and ta_user_id = #{taUserId}
+    </if>
+    and uuid = #{uuid}
+    and community_id = #{communityId}
+    and social_type = #{socialType}
+  </select>
+</mapper>

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -68,4 +68,38 @@
         tp_ticket p
         WHERE p.id=#{id,jdbcType=INTEGER}
     </select>
+
+    <select id="selectByCommuniytIdAndByTaUserIdAndByType" parameterType="map" resultType="com.huiju.estateagents.property.model.TpTicket" >
+        select
+         *
+        from tp_ticket
+        <trim prefix="where" prefixOverrides="and">
+            <if test="communityId != null" >
+                and community_id = #{communityId,jdbcType=INTEGER}
+            </if>
+            <if test="taUserId != null" >
+                and ta_user_id = #{taUserId,jdbcType=INTEGER}
+            </if>
+            <if test="type != null" >
+                and type = #{type,jdbcType=CHAR}
+            </if>
+        </trim>
+        order by create_date DESC
+    </select>
+
+    <select id="selectTpTicketName" resultType="com.huiju.estateagents.property.model.TpTicket">
+    select
+    *
+    from tp_ticket
+    where community_id = #{communityId,jdbcType=INTEGER}
+     and ticket_title= #{ticketTitle,jdbcType=INTEGER}
+     and type = #{type,jdbcType=VARCHAR}
+  </select>
+
+    <update id="updateTpUserId" parameterType="int" >
+    update tp_ticket
+    set
+      tp_user_id =null
+    where id = #{ticketId,jdbcType=INTEGER}
+  </update>
 </mapper>

src/main/resources/mapper/property/TpTicketRecordCommentMapper.xml

@@ -2,4 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TpTicketRecordCommentMapper">
 
+    <select id="selectByTicketId" parameterType="map" resultType="com.huiju.estateagents.property.model.TpTicketRecordComment" >
+    select ttrc.* from tp_ticket tp
+                inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
+                inner join tp_ticket_record_comment ttrc on ttr.id = ttrc.ticket_record_id
+    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+  </select>
+
+    <select id="selectByTicketRecordId" parameterType="com.huiju.estateagents.property.model.TpTicketRecord" resultType="com.huiju.estateagents.property.model.TpTicketRecordComment" >
+        SELECT
+         *
+        FROM
+        tp_ticket_record_comment
+        WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+        AND ticket_record_id = #{id,jdbcType=INTEGER}
+    </select>
 </mapper>

src/main/resources/mapper/property/TpTicketRecordMapper.xml

@@ -39,4 +39,23 @@
         WHERE code= #{status,jdbcType=INTEGER}
           and group_id = 1
     </select>
+
+    <select id="getTicketRecordByTicketId" resultType="com.huiju.estateagents.property.model.TpTicketRecord">
+    SELECT
+        t.id,
+        t.status,
+        t.ticket_id AS ticketId,
+        t.community_id AS communityId,
+        t.content AS content,
+        t.create_date AS createDate,
+        d.NAME AS ticketStatusName
+    FROM
+        tp_ticket_record t
+        LEFT JOIN sys_dictionary d ON t.STATUS = d.CODE
+        AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
+    WHERE
+        community_id = #{communityId,jdbcType=INTEGER}
+        AND ticket_id = #{ticketId,jdbcType=INTEGER}
+    order by t.status
+  </select>
 </mapper>