andrew 4 år sedan
förälder
incheckning
91eaa228de

+ 61
- 1
src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java Visa fil

@@ -21,7 +21,7 @@ import java.util.Map;
21 21
 @RestController
22 22
 
23 23
 @RequestMapping("/api")
24
-@Api(value = "审核用户API", description = "审核用户API")
24
+@Api(value = "审核用户API", tags = "审核用户API")
25 25
 public class UserVerifyController extends BaseController {
26 26
 
27 27
     @Autowired
@@ -167,4 +167,64 @@ public class UserVerifyController extends BaseController {
167 167
         return responseBean;
168 168
     }
169 169
 
170
+
171
+    @RequestMapping(value = "/wx/user/verify/{userVerifyId}", method = RequestMethod.GET)
172
+    @ApiOperation(value = "获取 一个房产信息", notes = "获取 一个房产信息")
173
+    @ApiImplicitParams({
174
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
175
+    })
176
+    public ResponseBean getUserVerify(HttpServletRequest request, @PathVariable("userVerifyId") Integer userVerifyId) {
177
+        ResponseBean responseBean = iTaUserVerifyService.getToAuditNotApproved(userVerifyId);
178
+        return responseBean;
179
+    }
180
+
181
+    @RequestMapping(value = "/wx/user/verify/add", method = RequestMethod.POST)
182
+    @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
183
+    @ApiImplicitParams({
184
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
185
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
186
+    })
187
+    public ResponseBean addUserVerify(@RequestBody String parameter, HttpServletRequest request) {
188
+        ResponseBean responseBean = new ResponseBean();
189
+        TaUser userElement = getTaUser(request);
190
+        responseBean = iTaUserVerifyService.addUserVerify(userElement, parameter);
191
+        return responseBean;
192
+    }
193
+
194
+    @RequestMapping(value = "/wx/user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
195
+    @ApiOperation(value = "删除一个审核的房产", notes = "删除一个审核的房产")
196
+    @ApiImplicitParams({
197
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id")
198
+    })
199
+    public ResponseBean deleteUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpServletRequest request) {
200
+        ResponseBean responseBean = new ResponseBean();
201
+        responseBean = iTaUserVerifyService.deleteUserVerify(userVerifyId);
202
+        return responseBean;
203
+    }
204
+
205
+    @RequestMapping(value = "/wx/current_user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
206
+    @ApiOperation(value = "删除当前用户 关联的房产", notes = "删除当前用户 关联的房产")
207
+    @ApiImplicitParams({
208
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
209
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
210
+    })
211
+    public ResponseBean deleteCurrentUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpServletRequest request) {
212
+        ResponseBean responseBean = new ResponseBean();
213
+        TaUser userElement = getTaUser(request);
214
+        responseBean = iTaUserVerifyService.deleteCurrentUserVerify(userElement, userVerifyId);
215
+        return responseBean;
216
+    }
217
+
218
+    @RequestMapping(value = "/wx/user/verify/list", method = RequestMethod.GET)
219
+    @ApiOperation(value = "获取 当前用户关联的房产列表", notes = "获取 当前用户关联的房产列表")
220
+    @ApiImplicitParams({
221
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
222
+    })
223
+    public ResponseBean getByCurrentUser(HttpServletRequest request) {
224
+        ResponseBean responseBean = new ResponseBean();
225
+        TaUser userElement = getTaUser(request);
226
+        responseBean = iTaUserVerifyService.getByCurrentUser(userElement);
227
+        return responseBean;
228
+    }
229
+
170 230
 }

+ 36
- 0
src/main/java/com/huiju/estateagents/property/model/TaUserVerify.java Visa fil

@@ -145,5 +145,41 @@ public class TaUserVerify implements Serializable {
145 145
     @TableField(exist = false)
146 146
     private String faceImg;
147 147
 
148
+    /**
149
+     * 角色名称
150
+     */
151
+    @TableField(exist = false)
152
+    private String roleName;
153
+
154
+    /**
155
+     * 业主名称
156
+     */
157
+    @TableField(exist = false)
158
+    private String ownerName;
159
+
160
+    /**
161
+     * 小区名称
162
+     */
163
+    @TableField(exist = false)
164
+    private String communityName;
165
+
166
+    /**
167
+     * 小区 省市区
168
+     */
169
+
170
+    private String communityAddress;
171
+
172
+    /**
173
+     * 审核结果的url
174
+     */
175
+    @TableField(exist = false)
176
+    private String verifyUrl;
177
+
178
+    /**
179
+     * 用户手机号
180
+     */
181
+    @TableField(exist = false)
182
+    private String loginName;
183
+
148 184
 
149 185
 }

+ 38
- 1
src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java Visa fil

@@ -3,7 +3,6 @@ package com.huiju.estateagents.property.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.center.taUser.entity.TaUser;
6
-import com.huiju.estateagents.property.common.UserElement;
7 6
 import com.huiju.estateagents.property.model.TaUserVerify;
8 7
 
9 8
 /**
@@ -43,4 +42,42 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
43 42
      */
44 43
     ResponseBean verifyinfoAdd(TaUser userElement, Integer userVerifyId, String verifyStatus, String roleState, String remark);
45 44
 
45
+
46
+    /**
47
+     * 获取当前 一个房产审核数据 的数据
48
+     * @param userVerifyId
49
+     * @return
50
+     */
51
+    ResponseBean getToAuditNotApproved(Integer userVerifyId);
52
+
53
+    /**
54
+     * 添加 一个审核房产
55
+     * @param userElement
56
+     * @param parameter
57
+     * @return
58
+     */
59
+    ResponseBean addUserVerify(TaUser userElement, String parameter);
60
+
61
+    /**
62
+     * 根据id 删除 审核表
63
+     * @param userVerifyId
64
+     * @return
65
+     */
66
+    ResponseBean deleteUserVerify(Integer userVerifyId);
67
+
68
+    /**
69
+     * 获取 当前用户绑定的房产列表
70
+     * @param userElement
71
+     * @return
72
+     */
73
+    ResponseBean getByCurrentUser(TaUser userElement);
74
+
75
+    /**
76
+     * 根据房产id  删除当前用户的房产
77
+     * @param userElement
78
+     * @param userVerifyId
79
+     * @return
80
+     */
81
+    ResponseBean deleteCurrentUserVerify(TaUser userElement, Integer userVerifyId);
82
+
46 83
 }

+ 149
- 0
src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java Visa fil

@@ -1,5 +1,6 @@
1 1
 package com.huiju.estateagents.property.service.impl;
2 2
 
3
+import com.alibaba.fastjson.JSONObject;
3 4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -20,6 +21,10 @@ import org.springframework.stereotype.Service;
20 21
 import org.springframework.transaction.annotation.Transactional;
21 22
 
22 23
 import java.time.LocalDateTime;
24
+import java.util.Date;
25
+import java.util.HashMap;
26
+import java.util.List;
27
+import java.util.Map;
23 28
 
24 29
 /**
25 30
  * 审核 业务实现
@@ -279,4 +284,148 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
279 284
 
280 285
         return responseBean;
281 286
     }
287
+
288
+
289
+
290
+    @Override
291
+    public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
292
+        ResponseBean responseBean = new ResponseBean();
293
+        TaUserVerify taUserVerify = taUserVerifyMapper.selectById(userVerifyId);
294
+        TaUser currentUser = taUserMapper.selectById(taUserVerify.getUserId());
295
+        taUserVerify.setLoginName(currentUser.getLoginName());
296
+
297
+        // 开始查询 业主
298
+        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
299
+        if (null != userVerify) {
300
+            TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
301
+            taUserVerify.setOwnerName(taUser.getUserName());
302
+        }
303
+
304
+        responseBean.addSuccess(taUserVerify);
305
+        return responseBean;
306
+    }
307
+
308
+    @Override
309
+    public ResponseBean addUserVerify(TaUser userElement, String parameter) {
310
+        ResponseBean responseBean = new ResponseBean();
311
+
312
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
313
+        TaUserVerify taUserVerify = jsonObject.toJavaObject(TaUserVerify.class);
314
+
315
+        // 通过 角色名称 查询出角色的id
316
+        String roleName = jsonObject.getString("roleName");
317
+
318
+        // 校验是否有审核通过的业主
319
+        TaUserVerify hasUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
320
+        if (null != hasUserVerify) {
321
+            responseBean.addError("此房产已存在户主!");
322
+            return responseBean;
323
+        }
324
+
325
+
326
+        // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
327
+//        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(), taUserVerify.getCommunityId(),
328
+//                taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
329
+//                taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
330
+//        if (null != userVerifyList && userVerifyList.size() > 0) {
331
+//            responseBean.addError("您已提交了这个房产的审核!请等待户主或者物业审核后,再进行下一步操作!");
332
+//            return responseBean;
333
+//        }
334
+
335
+
336
+        // 查询 期/栋/单元/楼层/户号 -> 设置 相应 id 和 name
337
+        TpPhase phase = tpPhaseMapper.selectById(taUserVerify.getPhaseId());
338
+        TpBuilding building = tpBuildingMapper.selectById(taUserVerify.getBuildingId());
339
+        TpUnit unit = tpUnitMapper.selectById(taUserVerify.getUnitId());
340
+        TpLevel level = tpLevelMapper.selectById(taUserVerify.getLevelId());
341
+        TpRoomNo roomNo = tpRoomNoMapper.selectById(taUserVerify.getRoomNoId());
342
+
343
+
344
+//        taUserVerify.setRoleId(sysRole.getId());
345
+        taUserVerify.setUserId(userElement.getUserId());
346
+        taUserVerify.setVerifyStatus("0");
347
+        taUserVerify.setCreateDate(LocalDateTime.now());
348
+        taUserVerify.setPhaseName(phase.getName());
349
+        taUserVerify.setBuildingName(building.getName());
350
+        taUserVerify.setUnitName(unit.getName());
351
+        taUserVerify.setLevelName(level.getName());
352
+        taUserVerify.setRoomNoName(roomNo.getName());
353
+
354
+        int rows = taUserVerifyMapper.insert(taUserVerify);
355
+        if (rows <= 0) {
356
+            responseBean.addError("操作失败!");
357
+            return responseBean;
358
+        }
359
+//        // 推送消息
360
+//        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
361
+//        if (null != userVerify){
362
+//            // 先推app
363
+//            Map<String,Object> map = new HashMap<>();
364
+//            map.put("communityId",userVerify.getCommunityId());
365
+//            map.put("createUserId",userVerify.getId());
366
+//            map.put("userVerify",userVerify.getId());
367
+//            map.put("name",userElement.getUserName());
368
+//            map.put("roleName",sysRole.getDescription());
369
+//            applicationContext.publishEvent(new MessageEvent(sysRole, Constant.CUSTOMER_SUBMIT_VERIFY,map));
370
+//        }
371
+//        // 推物业端,推这个小区下的所有管理员
372
+//        List<TpUser> tpUserList= tpUserMapper.selectCommunityId(taUserVerify.getCommunityId());
373
+//        for (TpUser tpUser:tpUserList) {
374
+//            Map<String, Object> mapProp = new HashMap<>();
375
+//            mapProp.put("communityId", taUserVerify.getCommunityId());
376
+//            mapProp.put("createUserId", taUserVerify.getId());
377
+//            mapProp.put("userVerifyId", taUserVerify.getId());
378
+//            mapProp.put("name", userElement.getUserName());
379
+//            mapProp.put("tpUserId", tpUser.getId());
380
+//            applicationContext.publishEvent(new MessageEvent(mapProp, Constant.CUSTOMER_SUBMIT_PROP_VERIFY, mapProp));
381
+//        }
382
+        responseBean.addSuccess(taUserVerify);
383
+        return responseBean;
384
+    }
385
+
386
+    @Override
387
+    public ResponseBean deleteUserVerify(Integer userVerifyId) {
388
+        ResponseBean responseBean = new ResponseBean();
389
+
390
+        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
391
+        if ("1".equals(userVerify.getVerifyStatus())) {
392
+            responseBean.addError("已审核通过的房产,无法删除!");
393
+            return responseBean;
394
+        }
395
+
396
+        taUserVerifyMapper.deleteById(userVerifyId);
397
+        responseBean.addSuccess("操作成功!");
398
+        return responseBean;
399
+    }
400
+
401
+    @Override
402
+    public ResponseBean getByCurrentUser(TaUser userElement) {
403
+        ResponseBean responseBean = new ResponseBean();
404
+
405
+//        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectByUserId(userElement.getId());
406
+//        userVerifyList.forEach(e -> {
407
+//            // 角色
408
+//            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(e.getRoleId());
409
+//            e.setRoleName(taSysRole.getRoleName());
410
+//            // 小区名称 、省市区
411
+//            setUserVoProperties(e.getCommunityId(), e);
412
+//        });
413
+//
414
+//        responseBean.addSuccess(userVerifyList);
415
+        return responseBean;
416
+    }
417
+
418
+
419
+    @Override
420
+    @Transactional(rollbackFor = Exception.class)
421
+    public ResponseBean deleteCurrentUserVerify(TaUser userElement, Integer userVerifyId) {
422
+        ResponseBean responseBean = new ResponseBean();
423
+
424
+        TaUserVerify userVerify = taUserVerifyMapper.selectById(userVerifyId);
425
+
426
+        taUserVerifyMapper.deleteById(userVerifyId);
427
+
428
+        responseBean.addSuccess("操作成功!");
429
+        return responseBean;
430
+    }
282 431
 }