Selaa lähdekoodia

pageNumber 修改

魏熙美 5 vuotta sitten
vanhempi
commit
41280467d0

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingController.java Näytä tiedosto

@@ -248,7 +248,7 @@ public class TaBuildingController extends BaseController {
248 248
      */
249 249
     @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
250 250
     public ResponseBean getWxBuildingList(
251
-            @RequestParam(defaultValue = "1") Integer pageNum,
251
+            @RequestParam(defaultValue = "1") Integer pageNumber,
252 252
             @RequestParam(defaultValue = "10")Integer pageSize,
253 253
             @RequestParam(defaultValue = "false") Boolean mine,
254 254
             @RequestParam(required = false) Integer cityId,
@@ -280,7 +280,7 @@ public class TaBuildingController extends BaseController {
280 280
         List<String[]> priceList = getParamListOf(price);
281 281
         List<String[]> areaList = getParamListOf(area);
282 282
 
283
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
283
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
284 284
     }
285 285
 
286 286
 

+ 5
- 5
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Näytä tiedosto

@@ -128,7 +128,7 @@ public class TaBuildingDynamicController extends BaseController {
128 128
     })
129 129
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
130 130
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
131
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
131
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
132 132
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
133 133
                                                @RequestParam(defaultValue = "false" )boolean mine,
134 134
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
@@ -142,9 +142,9 @@ public class TaBuildingDynamicController extends BaseController {
142 142
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
143 143
             }
144 144
             TaPerson person = taPersons.get(0);
145
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
145
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
146 146
         }else {
147
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
147
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
148 148
         }
149 149
 
150 150
         return responseBean;
@@ -158,7 +158,7 @@ public class TaBuildingDynamicController extends BaseController {
158 158
     })
159 159
     @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
160 160
     public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
161
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
161
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
162 162
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
163 163
                                                HttpServletRequest request){
164 164
         String openid = getOpenId(request);
@@ -177,7 +177,7 @@ public class TaBuildingDynamicController extends BaseController {
177 177
                 for(int i = 0; i<saveList.size();i++){
178 178
                     ids.add(saveList.get(i).getSavedTarget());
179 179
                 }
180
-                IPage<TaBuildingDynamic> page = new Page<>(pageNum, pageSize);
180
+                IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
181 181
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
182 182
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
183 183
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java Näytä tiedosto

@@ -253,7 +253,7 @@ public class TaGoodsController extends BaseController {
253 253
             @ApiImplicitParam(dataTypeClass = String.class, name = "buildingId", paramType = "query",value = "项目id")
254 254
     })
255 255
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
256
-    public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
256
+    public ResponseBean wxGoodsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
257 257
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
258 258
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
259 259
                                     HttpServletRequest request){
@@ -267,7 +267,7 @@ public class TaGoodsController extends BaseController {
267 267
         TaPerson person = taPersons.get(0);
268 268
         try {
269 269
             //使用分页插件
270
-            IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
270
+            IPage<TaGoods> pg = new Page<>(pageNumber, pageSize);
271 271
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
272 272
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
273 273
             if (!StringUtils.isEmpty(buildingId)){

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaNewsController.java Näytä tiedosto

@@ -96,7 +96,7 @@ public class TaNewsController extends BaseController {
96 96
      * @return
97 97
      */
98 98
     @RequestMapping(value="/wx/taNews",method= RequestMethod.GET)
99
-    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
99
+    public ResponseBean wxTaNewsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
100 100
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
101 101
                                      @RequestParam(required = false) String buildingId,
102 102
                                      @RequestParam(required = false) Integer cityId,
@@ -115,7 +115,7 @@ public class TaNewsController extends BaseController {
115 115
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
116 116
         }
117 117
 
118
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine,orgId);
118
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNumber, pageSize, buildingId, targets,cityId,mine,orgId);
119 119
         return ResponseBean.success(results);
120 120
     }
121 121
 

+ 3
- 3
src/main/java/com/huiju/estateagents/controller/TaPersonController.java Näytä tiedosto

@@ -581,7 +581,7 @@ public class TaPersonController extends BaseController {
581 581
      * @return
582 582
      */
583 583
     @GetMapping("/wx/agent/recommend/mine")
584
-    public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNum,
584
+    public ResponseBean getAgentIRecommend(@RequestParam(defaultValue = "1") int pageNumber,
585 585
                                            @RequestParam(defaultValue = "10") int pageSize, HttpServletRequest request) {
586 586
         String openid = getOpenId(request);
587 587
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -594,8 +594,8 @@ public class TaPersonController extends BaseController {
594 594
         queryWrapper.eq("person_type", CommConstant.PERSON_ESTATE_AGENT);
595 595
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
596 596
         Page<TaPerson>page = new Page<>();
597
-        page.setPages(pageNum);
598
-        page.setCurrent(pageNum);
597
+        page.setPages(pageNumber);
598
+        page.setCurrent(pageNumber);
599 599
         page.setSize(pageSize);
600 600
         ResponseBean responseBean = new ResponseBean();
601 601
         IPage<TaPerson>data = taPersonService.page(page,queryWrapper);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Näytä tiedosto

@@ -211,14 +211,14 @@ public class TaPointsExchangeController extends BaseController {
211 211
      * @return
212 212
      */
213 213
     @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
214
-    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
214
+    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
215 215
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
216 216
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
217 217
                                              @RequestParam(value = "personId", required = false) String personId){
218 218
         ResponseBean responseBean = new ResponseBean();
219 219
         try {
220 220
             //使用分页插件
221
-            IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
221
+            IPage<TaPointsExchange> pg = new Page<>(pageNumber, pageSize);
222 222
             QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
223 223
             queryWrapper.eq(null != personId, "person_id", personId);
224 224
             queryWrapper.eq(null != buildingId, "building_id",buildingId);

+ 3
- 3
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java Näytä tiedosto

@@ -81,12 +81,12 @@ public class TaPointsRecordsController extends BaseController {
81 81
 
82 82
     /**
83 83
      * 分页查询列表
84
-     * @param pageNum
84
+     * @param pageNumber
85 85
      * @param pageSize
86 86
      * @return
87 87
      */
88 88
     @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
89
-    public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
89
+    public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
90 90
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
91 91
                                               HttpServletRequest request){
92 92
         ResponseBean responseBean = new ResponseBean();
@@ -99,7 +99,7 @@ public class TaPointsRecordsController extends BaseController {
99 99
             }
100 100
             TaPerson person = taPersons.get(0);
101 101
             //使用分页插件
102
-            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
102
+            IPage<TaPointsRecords> pg = new Page<>(pageNumber, pageSize);
103 103
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
104 104
             queryWrapper.eq("person_id",person.getPersonId());
105 105
             queryWrapper.orderByDesc("create_date");

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaPolicyController.java Näytä tiedosto

@@ -100,13 +100,13 @@ public class TaPolicyController extends BaseController {
100 100
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query",value = "城市ID")
101 101
     })
102 102
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
103
-    public ResponseBean taPolicyListCity(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
103
+    public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
104 104
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
105 105
                                          @RequestParam(value ="cityId", required = false) Integer cityId){
106 106
         ResponseBean responseBean = new ResponseBean();
107 107
         try {
108 108
             //使用分页插件
109
-            IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
109
+            IPage<TaPolicy> pg = new Page<>(pageNumber, pageSize);
110 110
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
111 111
             queryWrapper.eq("city_id",cityId);
112 112
             queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBizEventController.java Näytä tiedosto

@@ -95,12 +95,12 @@ public class TdBizEventController extends BaseController {
95 95
      * @return
96 96
      */
97 97
     @RequestMapping(value="/wx/tdBizEvent",method= RequestMethod.GET)
98
-    public ResponseBean tdBizEventListWx(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
98
+    public ResponseBean tdBizEventListWx(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
99 99
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
100 100
         ResponseBean responseBean = new ResponseBean();
101 101
         try {
102 102
             //使用分页插件
103
-            IPage<TdBizEvent> pg = new Page<>(pageNum, pageSize);
103
+            IPage<TdBizEvent> pg = new Page<>(pageNumber, pageSize);
104 104
             QueryWrapper<TdBizEvent> queryWrapper = new QueryWrapper<>();
105 105
             queryWrapper.orderByDesc("event_id");
106 106
 

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.java Näytä tiedosto

@@ -67,7 +67,7 @@ public class TdBizEventTypeController extends BaseController {
67 67
      * @return
68 68
      */
69 69
     @RequestMapping(value="/wx/tdBizEventType",method= RequestMethod.GET)
70
-    public ResponseBean tdBizEventTypeListWx(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
70
+    public ResponseBean tdBizEventTypeListWx(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNum,
71 71
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
72 72
         ResponseBean responseBean = new ResponseBean();
73 73
         try {

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java Näytä tiedosto

@@ -97,14 +97,14 @@ public class TdBuildingTypeController extends BaseController {
97 97
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行")
98 98
     })
99 99
     @RequestMapping(value="/wx/tdBuildingType",method= RequestMethod.GET)
100
-    public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
100
+    public ResponseBean tdWxBuildingTypeList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
101 101
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
102 102
                                              HttpServletRequest request){
103 103
         ResponseBean responseBean = new ResponseBean();
104 104
         Integer orgId = getOrgId(request);
105 105
         try {
106 106
             //使用分页插件
107
-            IPage<TdBuildingType> pg = new Page<>(pageNum, pageSize);
107
+            IPage<TdBuildingType> pg = new Page<>(pageNumber, pageSize);
108 108
             QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
109 109
             queryWrapper.eq("status", 1);
110 110
             queryWrapper.orderByDesc("create_date");

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java Näytä tiedosto

@@ -103,7 +103,7 @@ public class TdPointsRulesController extends BaseController {
103 103
             @ApiImplicitParam(dataTypeClass = String.class, name = "type", paramType = "query",value = "类型")
104 104
     })
105 105
     @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
106
-    public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
106
+    public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
107 107
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
108 108
                                             @RequestParam(value ="buildingId", required = false) String buildingId,
109 109
                                             @RequestParam(value = "type", required = false) String type,
@@ -111,7 +111,7 @@ public class TdPointsRulesController extends BaseController {
111 111
         ResponseBean responseBean = new ResponseBean();
112 112
         try {
113 113
             //使用分页插件
114
-            IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
114
+            IPage<TdPointsRules> pg = new Page<>(pageNumber, pageSize);
115 115
 
116 116
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
117 117
             queryWrapper.orderByDesc("create_date");