Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -225,7 +225,7 @@ public class TaUserController extends BaseController {
      * @return
      */
     @PutMapping(value = "/admin/update/password")
-    public ResponseBean updatePassword(
+    public ResponseBean updatePassword( @RequestParam String originalPassword,
                                         @RequestParam String newPassword,
                                         HttpServletRequest request) {
 
@@ -234,6 +234,14 @@ public class TaUserController extends BaseController {
         }
 
         Integer userId = getUserId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaUser taUser = iTaUserService.getById(userId);
+        if (!password.equals(taUser.getLoginPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         try {
             iTaUserService.resetPassword(userId, newPassword);
             return ResponseBean.success("操作成功！");

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

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

src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java

@@ -128,7 +128,7 @@ public class TaBuildingDynamicController extends BaseController {
     })
     @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                @RequestParam(defaultValue = "false" )boolean mine,
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
@@ -142,9 +142,9 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }
 
         return responseBean;
@@ -158,7 +158,7 @@ public class TaBuildingDynamicController extends BaseController {
     })
     @RequestMapping(value = "/wx/save/buildingDynamiceList", method = RequestMethod.GET)
     public ResponseBean wxSaveBuildingDynamiceList(@RequestParam(value = "buildingId", required = false)String buildingId,
-                                               @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
+                                               @RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
                                                HttpServletRequest request){
         String openid = getOpenId(request);
@@ -177,7 +177,7 @@ public class TaBuildingDynamicController extends BaseController {
                 for(int i = 0; i<saveList.size();i++){
                     ids.add(saveList.get(i).getSavedTarget());
                 }
-                IPage<TaBuildingDynamic> page = new Page<>(pageNum, pageSize);
+                IPage<TaBuildingDynamic> page = new Page<>(pageNumber, pageSize);
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

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

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

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

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

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

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

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

src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java

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

src/main/java/com/huiju/estateagents/controller/TaPolicyController.java

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

src/main/java/com/huiju/estateagents/controller/TdBizEventController.java

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

src/main/java/com/huiju/estateagents/controller/TdBizEventTypeController.java

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

src/main/java/com/huiju/estateagents/controller/TdBuildingTypeController.java

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

src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java

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