Browse Source

* 代码优化

顾绍勇 5 years ago
parent
commit
58c36cef8d

+ 3
- 3
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java View File

433
                                                  HttpServletRequest request) {
433
                                                  HttpServletRequest request) {
434
         ResponseBean responseBean = new ResponseBean();
434
         ResponseBean responseBean = new ResponseBean();
435
         try {
435
         try {
436
-            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), getPersonId(request), pageNumber, pageSize);
436
+            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), pageNumber, pageSize);
437
             logger.info("listHouseByRaiseRecordId 返回结果:", JSONObject.toJSONString(responseBean));
437
             logger.info("listHouseByRaiseRecordId 返回结果:", JSONObject.toJSONString(responseBean));
438
         } catch (Exception e) {
438
         } catch (Exception e) {
439
             logger.error("listHouseByRaiseRecordId 异常:", e);
439
             logger.error("listHouseByRaiseRecordId 异常:", e);
453
      * @return
453
      * @return
454
      */
454
      */
455
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.GET)
455
     @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.GET)
456
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId,
456
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId, String personId,
457
                                             HttpServletRequest request) {
457
                                             HttpServletRequest request) {
458
         ResponseBean responseBean = new ResponseBean();
458
         ResponseBean responseBean = new ResponseBean();
459
         try {
459
         try {
460
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request),raiseHouseId, getPersonId(request));
460
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request),raiseHouseId, personId);
461
             logger.info("updateLockingStatus 返回结果:", JSONObject.toJSONString(responseBean));
461
             logger.info("updateLockingStatus 返回结果:", JSONObject.toJSONString(responseBean));
462
         } catch (Exception e) {
462
         } catch (Exception e) {
463
             logger.error("updateLockingStatus 异常:", e);
463
             logger.error("updateLockingStatus 异常:", e);

+ 0
- 12
src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java View File

92
      */
92
      */
93
     @TableField(exist = false)
93
     @TableField(exist = false)
94
     private String raiseHouseId;
94
     private String raiseHouseId;
95
-
96
-    /**
97
-     * 是否展示锁定按钮 true展示
98
-     */
99
-    @TableField(exist = false)
100
-    private Boolean showLocking;
101
-
102
-    /**
103
-     * 是否展示解锁按钮 true展示
104
-     */
105
-    @TableField(exist = false)
106
-    private Boolean showUnLocking;
107
 }
95
 }

+ 1
- 2
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java View File

131
      *
131
      *
132
      * @param raiseRecordId
132
      * @param raiseRecordId
133
      * @param orgId
133
      * @param orgId
134
-     * @param personId
135
      * @param pageNumber
134
      * @param pageNumber
136
      * @param pageSize
135
      * @param pageSize
137
      * @return
136
      * @return
138
      */
137
      */
139
-    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize);
138
+    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
140
 
139
 
141
     /**
140
     /**
142
      * 更新房源锁定状态
141
      * 更新房源锁定状态

+ 4
- 24
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java View File

569
     }
569
     }
570
 
570
 
571
     @Override
571
     @Override
572
-    public ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize) {
573
-        logger.info("listHouseByRaiseRecordId 接收参数:raiseRecordId:{},orgId:{},personId:{},pageNumber:{},pageSize:{}",
574
-                raiseRecordId, orgId, personId, pageNumber, pageSize);
572
+    public ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize) {
573
+        logger.info("listHouseByRaiseRecordId 接收参数:raiseRecordId:{},orgId:{},pageNumber:{},pageSize:{}",
574
+                raiseRecordId, orgId, pageNumber, pageSize);
575
 
575
 
576
         ResponseBean responseBean = new ResponseBean();
576
         ResponseBean responseBean = new ResponseBean();
577
         IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
577
         IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
578
-        taHousingResourcesMapper.listHouseByRaiseRecordId(pg, raiseRecordId, orgId);
579
-        if (CollectionUtils.isEmpty(pg.getRecords())) {
580
-            responseBean.addSuccess(pg);
581
-            return responseBean;
582
-        }
583
-
584
-        pg.getRecords().stream().forEach(record -> {
585
-            if (StringUtils.isEmpty(record.getLockingPersonId()) && !"locked".equals(record.getHouseLockingStatus())) {
586
-                record.setShowLocking(true);
587
-            } else {
588
-                record.setShowLocking(false);
589
-            }
590
-
591
-            if (personId.equals(record.getLockingPersonId()) && "locked".equals(record.getHouseLockingStatus())) {
592
-                record.setShowUnLocking(true);
593
-            } else {
594
-                record.setShowUnLocking(false);
595
-            }
596
-        });
597
-
598
-        responseBean.addSuccess(pg);
578
+        responseBean.addSuccess(taHousingResourcesMapper.listHouseByRaiseRecordId(pg, raiseRecordId, orgId));
599
         return responseBean;
579
         return responseBean;
600
     }
580
     }
601
 
581