魏熙美 пре 6 година
родитељ
комит
f3044160ab
21 измењених фајлова са 948 додато и 3 уклоњено
  1. 83
    0
      CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserVerifyController.java
  2. 20
    0
      CODE/foreign-service/src/main/java/com/community/huiju/controller/TpBuildingOwnerInfoController.java
  3. 16
    0
      CODE/foreign-service/src/main/java/com/community/huiju/dao/TaSysRoleMapper.java
  4. 77
    0
      CODE/foreign-service/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java
  5. 16
    0
      CODE/foreign-service/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java
  6. 9
    0
      CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java
  7. 64
    0
      CODE/foreign-service/src/main/java/com/community/huiju/model/TaSysRole.java
  8. 119
    0
      CODE/foreign-service/src/main/java/com/community/huiju/model/TaUserVerify.java
  9. 149
    0
      CODE/foreign-service/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java
  10. 5
    0
      CODE/foreign-service/src/main/java/com/community/huiju/model/TpConfiguration.java
  11. 5
    0
      CODE/foreign-service/src/main/java/com/community/huiju/model/TpEquipmentTree.java
  12. 16
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/ITaSysRoleService.java
  13. 46
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserVerifyService.java
  14. 16
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/ITpBuildingOwnerInfoService.java
  15. 20
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaSysRoleServiceImpl.java
  16. 1
    1
      CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java
  17. 253
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java
  18. 20
    0
      CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpBuildingOwnerInfoServiceImpl.java
  19. 5
    0
      CODE/foreign-service/src/main/resources/mapper/TaUserVerifyMapper.xml
  20. 5
    0
      CODE/foreign-service/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml
  21. 3
    2
      CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

+ 83
- 0
CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserVerifyController.java Прегледај датотеку

@@ -0,0 +1,83 @@
1
+package com.community.huiju.controller;
2
+
3
+
4
+import com.community.huiju.common.base.BaseController;
5
+import com.community.huiju.common.base.ResponseBean;
6
+import com.community.huiju.service.ITaUserVerifyService;
7
+import io.swagger.annotations.Api;
8
+import io.swagger.annotations.ApiImplicitParam;
9
+import io.swagger.annotations.ApiImplicitParams;
10
+import io.swagger.annotations.ApiOperation;
11
+import org.springframework.beans.factory.annotation.Autowired;
12
+import org.springframework.web.bind.annotation.*;
13
+
14
+/**
15
+ * <p>
16
+ * app端用户审核表,存放用户的角色还有房产信息 前端控制器
17
+ * </p>
18
+ *
19
+ * @author jobob
20
+ * @since 2019-05-16
21
+ */
22
+@RestController
23
+@RequestMapping("/")
24
+@Api(value = "用户审核 API", description = "用户审核 API")
25
+public class TaUserVerifyController extends BaseController {
26
+
27
+    @Autowired
28
+    private ITaUserVerifyService iTaUserVerifyService;
29
+
30
+
31
+    @RequestMapping(value = "/user/verify",method = RequestMethod.POST)
32
+    @ApiOperation(value = "添加房产关联", notes = "添加房产关联")
33
+    @ApiImplicitParams({
34
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
35
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "roleId", value = "角色Id:1 户主 2 租客 3 家属"),
36
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
37
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "phaseId", value = "期Id"),
38
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "buildingId", value = "栋Id"),
39
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "unitId", value = "单元Id"),
40
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "levelId", value = "楼层Id"),
41
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "roomNoId", value = "房间号Id"),
42
+
43
+    })
44
+    public ResponseBean addUserVerify(@RequestParam(value = "userId") Integer userId,
45
+                                      @RequestParam(value = "roleId") Integer roleId,
46
+                                      @RequestParam(value = "communityId") Integer communityId,
47
+                                      @RequestParam(value = "phaseId") Integer phaseId,
48
+                                      @RequestParam(value = "buildingId") Integer buildingId,
49
+                                      @RequestParam(value = "unitId") Integer unitId,
50
+                                      @RequestParam(value = "levelId") Integer levelId,
51
+                                      @RequestParam(value = "roomNoId") Integer roomNoId) {
52
+        ResponseBean responseBean = new ResponseBean();
53
+        responseBean = iTaUserVerifyService.addUserVerify(userId, roleId, communityId, phaseId, buildingId, unitId, levelId, roomNoId);
54
+        return responseBean;
55
+    }
56
+
57
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.DELETE)
58
+    @ApiOperation(value = "用户删除房产关联关系", notes = "用户删除房产关联关系")
59
+    @ApiImplicitParams({
60
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
61
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userVerifyId", value = "房产审核Id"),
62
+    })
63
+    public ResponseBean deleteUserVerify(@RequestParam(value = "userId") Integer userId,
64
+                                         @PathVariable(value = "userVerifyId") Integer userVerifyId) {
65
+        ResponseBean responseBean = new ResponseBean();
66
+        responseBean = iTaUserVerifyService.deleteUserVerify(userId, userVerifyId);
67
+        return responseBean;
68
+    }
69
+
70
+    @RequestMapping(value = "/user/verify/list", method = RequestMethod.GET)
71
+    @ApiOperation(value = "查询用户的房产关联关系列表", notes = "查询用户的房产关联关系列表")
72
+    @ApiImplicitParams({
73
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
74
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id")
75
+    })
76
+    public ResponseBean getUserVerify(@RequestParam(value = "userId") Integer userId,
77
+                                      @RequestParam(value = "communityId") Integer communityId) {
78
+        ResponseBean responseBean = new ResponseBean();
79
+        responseBean = iTaUserVerifyService.getUserVerifyByUserIdAndCommunityId(userId, communityId);
80
+        return responseBean;
81
+    }
82
+
83
+}

+ 20
- 0
CODE/foreign-service/src/main/java/com/community/huiju/controller/TpBuildingOwnerInfoController.java Прегледај датотеку

@@ -0,0 +1,20 @@
1
+package com.community.huiju.controller;
2
+
3
+
4
+import com.community.huiju.common.base.BaseController;
5
+import org.springframework.web.bind.annotation.RequestMapping;
6
+import org.springframework.web.bind.annotation.RestController;
7
+
8
+/**
9
+ * <p>
10
+ * 楼栋业主资料信息表(户号信息也在里面相当于tp_room_no   PS:共用一张表) 前端控制器
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-05-16
15
+ */
16
+@RestController
17
+@RequestMapping("/")
18
+public class TpBuildingOwnerInfoController extends BaseController {
19
+
20
+}

+ 16
- 0
CODE/foreign-service/src/main/java/com/community/huiju/dao/TaSysRoleMapper.java Прегледај датотеку

@@ -0,0 +1,16 @@
1
+package com.community.huiju.dao;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.community.huiju.model.TaSysRole;
5
+
6
+/**
7
+ * <p>
8
+ * app端角色 Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-05-16
13
+ */
14
+public interface TaSysRoleMapper extends BaseMapper<TaSysRole> {
15
+
16
+}

+ 77
- 0
CODE/foreign-service/src/main/java/com/community/huiju/dao/TaUserVerifyMapper.java Прегледај датотеку

@@ -0,0 +1,77 @@
1
+package com.community.huiju.dao;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.community.huiju.model.TaUserVerify;
5
+import org.apache.ibatis.annotations.Param;
6
+import org.apache.ibatis.annotations.ResultType;
7
+import org.apache.ibatis.annotations.Select;
8
+
9
+import java.util.List;
10
+
11
+/**
12
+ * <p>
13
+ * app端用户审核表,存放用户的角色还有房产信息 Mapper 接口
14
+ * </p>
15
+ *
16
+ * @author jobob
17
+ * @since 2019-05-16
18
+ */
19
+public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
20
+
21
+    /**
22
+     * 根据 小区id 、 期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
23
+     * @param communityId
24
+     * @param phaseId
25
+     * @param buildingId
26
+     * @param unitId
27
+     * @param levelId
28
+     * @param roomNoId
29
+     * @return
30
+     */
31
+    @ResultType(TaUserVerify.class)
32
+    @Select("select  *  from ta_user_verify " +
33
+            "where community_id = #{communityId} " +
34
+            "and phase_id = #{phaseId} " +
35
+            "and building_id = #{buildingId} " +
36
+            "and unit_id = #{unitId} " +
37
+            "and level_id = #{levelId} " +
38
+            "and room_no_id = #{roomNoId} " +
39
+            "and verify_status = 1 " +
40
+            "and role_id = 1")
41
+    TaUserVerify selectCommunityAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
42
+
43
+    /**
44
+     * 根据 用户id, 小区id 、 期、栋、单元、楼层、户号 进行条件查询出 已审核通过的身份
45
+     * @param userId
46
+     * @param communityId
47
+     * @param phaseId
48
+     * @param buildingId
49
+     * @param unitId
50
+     * @param levelId
51
+     * @param roomNoId
52
+     * @return
53
+     */
54
+    @ResultType(TaUserVerify.class)
55
+    @Select("select  *  from ta_user_verify " +
56
+            "where community_id = #{communityId} " +
57
+            "and phase_id = #{phaseId} " +
58
+            "and building_id = #{buildingId} " +
59
+            "and unit_id = #{unitId} " +
60
+            "and level_id = #{levelId} " +
61
+            "and room_no_id = #{roomNoId} " +
62
+            "and user_id = #{userId} " +
63
+            "and verify_status = 1 ")
64
+    List<TaUserVerify> selectAddress(@Param("userId") Integer userId, @Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId);
65
+
66
+    /**
67
+     * 根据 用户id, 审核id 查询
68
+     * @param userId
69
+     * @param userVerifyId
70
+     * @return
71
+     */
72
+    @ResultType(TaUserVerify.class)
73
+    @Select("select  *  from ta_user_verify " +
74
+            "where user_id = #{userId} " +
75
+            "and id = #{userVerifyId} ")
76
+    TaUserVerify selectByUserIdAndUserVerifyId(Integer userId, Integer userVerifyId);
77
+}

+ 16
- 0
CODE/foreign-service/src/main/java/com/community/huiju/dao/TpBuildingOwnerInfoMapper.java Прегледај датотеку

@@ -0,0 +1,16 @@
1
+package com.community.huiju.dao;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.community.huiju.model.TpBuildingOwnerInfo;
5
+
6
+/**
7
+ * <p>
8
+ * 楼栋业主资料信息表(户号信息也在里面相当于tp_room_no   PS:共用一张表) Mapper 接口
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-05-16
13
+ */
14
+public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInfo> {
15
+
16
+}

+ 9
- 0
CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java Прегледај датотеку

@@ -14,6 +14,15 @@ public enum ResponseErrorsMessages {
14 14
     EXISTING_GENDER(1004, "手机号已存在!"),
15 15
     NOT_USER(1004, "用户不存在!"),
16 16
     NOT_LICENSE(44036, "未找到该车辆的月卡信息!"),
17
+    EXIST_OWNER(1005, "已存在业主!"),
18
+    EXIST_BUIDDING_ROLE(1006, "您已在该房产中!"),
19
+    NO_ROLE(1007, "角色不存在!"),
20
+    NO_PHASE(1008, "期/区 不存在!"),
21
+    NO_BUILDING(1009, "楼栋不存在!"),
22
+    NO_UNIT(1010, "单元不存在!"),
23
+    NO_LEVEL(1011, "楼层不存在!"),
24
+    NO_ROOM_NO(1012, "户号不存在!"),
25
+    NOT_USER_VERIFY(1013, "无房产关联关系!")
17 26
     ;
18 27
 
19 28
 

+ 64
- 0
CODE/foreign-service/src/main/java/com/community/huiju/model/TaSysRole.java Прегледај датотеку

@@ -0,0 +1,64 @@
1
+package com.community.huiju.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import com.baomidou.mybatisplus.annotation.TableName;
6
+import lombok.Data;
7
+import lombok.EqualsAndHashCode;
8
+import lombok.experimental.Accessors;
9
+
10
+import java.io.Serializable;
11
+import java.time.LocalDateTime;
12
+import java.util.Date;
13
+
14
+/**
15
+ * <p>
16
+ * app端角色
17
+ * </p>
18
+ *
19
+ * @author jobob
20
+ * @since 2019-05-16
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("ta_sys_role")
26
+public class TaSysRole implements Serializable {
27
+
28
+    private static final long serialVersionUID = 1L;
29
+
30
+    @TableId(value = "id", type = IdType.AUTO)
31
+    private Integer roleId;
32
+
33
+    /**
34
+     * 角色名称
35
+     */
36
+    private String roleName;
37
+
38
+    /**
39
+     * 描述
40
+     */
41
+    private String description;
42
+
43
+    /**
44
+     * 创建人
45
+     */
46
+    private Integer createUser;
47
+
48
+    /**
49
+     * 创建时间
50
+     */
51
+    private Date createDate;
52
+
53
+    /**
54
+     * 更新人
55
+     */
56
+    private Integer updateUser;
57
+
58
+    /**
59
+     * 更新时间
60
+     */
61
+    private Date updateDate;
62
+
63
+
64
+}

+ 119
- 0
CODE/foreign-service/src/main/java/com/community/huiju/model/TaUserVerify.java Прегледај датотеку

@@ -0,0 +1,119 @@
1
+package com.community.huiju.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import com.baomidou.mybatisplus.annotation.TableName;
6
+import lombok.Data;
7
+import lombok.EqualsAndHashCode;
8
+import lombok.experimental.Accessors;
9
+
10
+import java.io.Serializable;
11
+import java.time.LocalDateTime;
12
+import java.util.Date;
13
+
14
+/**
15
+ * <p>
16
+ * app端用户审核表,存放用户的角色还有房产信息
17
+ * </p>
18
+ *
19
+ * @author jobob
20
+ * @since 2019-05-16
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("ta_user_verify")
26
+public class TaUserVerify implements Serializable {
27
+
28
+    private static final long serialVersionUID = 1L;
29
+
30
+    @TableId(value = "id", type = IdType.AUTO)
31
+    private Integer userVerifyId;
32
+
33
+    /**
34
+     * 用户ID
35
+     */
36
+    private Integer userId;
37
+
38
+    /**
39
+     * 小区id
40
+     */
41
+    private Integer communityId;
42
+
43
+    /**
44
+     * 角色ID
45
+     */
46
+    private Integer roleId;
47
+
48
+    /**
49
+     * 期ID
50
+     */
51
+    private Integer phaseId;
52
+
53
+    /**
54
+     * 期
55
+     */
56
+    private String phaseName;
57
+
58
+    /**
59
+     * 楼栋ID
60
+     */
61
+    private Integer buildingId;
62
+
63
+    /**
64
+     * 楼栋
65
+     */
66
+    private String buildingName;
67
+
68
+    /**
69
+     * 单元
70
+     */
71
+    private Integer unitId;
72
+
73
+    /**
74
+     * 单元
75
+     */
76
+    private String unitName;
77
+
78
+    /**
79
+     * 楼层id
80
+     */
81
+    private Integer levelId;
82
+
83
+    /**
84
+     * 楼层
85
+     */
86
+    private String levelName;
87
+
88
+    /**
89
+     * 户号ID
90
+     */
91
+    private Integer roomNoId;
92
+
93
+    /**
94
+     * 户号
95
+     */
96
+    private String roomNoName;
97
+
98
+    /**
99
+     * 认证状态  0 是未审核   1是审核通过   2是审核不通过
100
+     */
101
+    private String verifyStatus;
102
+
103
+    /**
104
+     * 创建时间
105
+     */
106
+    private Date createDate;
107
+
108
+    /**
109
+     * 审核人的姓名
110
+     */
111
+    private String verifyName;
112
+
113
+    /**
114
+     * 备注
115
+     */
116
+    private String remark;
117
+
118
+
119
+}

+ 149
- 0
CODE/foreign-service/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java Прегледај датотеку

@@ -0,0 +1,149 @@
1
+package com.community.huiju.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import com.baomidou.mybatisplus.annotation.TableName;
6
+import lombok.Data;
7
+import lombok.EqualsAndHashCode;
8
+import lombok.experimental.Accessors;
9
+
10
+import java.io.Serializable;
11
+import java.time.LocalDateTime;
12
+import java.util.Date;
13
+
14
+/**
15
+ * <p>
16
+ * 楼栋业主资料信息表(户号信息也在里面相当于tp_room_no   PS:共用一张表)
17
+ * </p>
18
+ *
19
+ * @author jobob
20
+ * @since 2019-05-16
21
+ */
22
+@Data
23
+@EqualsAndHashCode(callSuper = false)
24
+@Accessors(chain = true)
25
+@TableName("tp_building_owner_info")
26
+public class TpBuildingOwnerInfo implements Serializable {
27
+
28
+    private static final long serialVersionUID = 1L;
29
+
30
+    @TableId(value = "id", type = IdType.AUTO)
31
+    private Integer buildingOwnerInfoId;
32
+
33
+    /**
34
+     * 小区id
35
+     */
36
+    private Integer communityId;
37
+
38
+    /**
39
+     * 身份证号码
40
+     */
41
+    private String idCard;
42
+
43
+    /**
44
+     * 期区ID
45
+     */
46
+    private Integer phaseId;
47
+
48
+    /**
49
+     * 期区名称
50
+     */
51
+    private String phaseName;
52
+
53
+    /**
54
+     * 楼栋ID
55
+     */
56
+    private Integer buildingId;
57
+
58
+    /**
59
+     * 楼栋姓名
60
+     */
61
+    private String buildingName;
62
+
63
+    /**
64
+     * 单元ID
65
+     */
66
+    private Integer unitId;
67
+
68
+    /**
69
+     * 单元名称
70
+     */
71
+    private String unitName;
72
+
73
+    /**
74
+     * 楼层ID
75
+     */
76
+    private Integer levelId;
77
+
78
+    /**
79
+     * 楼层名字
80
+     */
81
+    private String levelName;
82
+
83
+    /**
84
+     * 户号ID
85
+     */
86
+    private Integer roomNoId;
87
+
88
+    /**
89
+     * 户号姓名
90
+     */
91
+    private String roomNoName;
92
+
93
+    /**
94
+     * 业主姓名
95
+     */
96
+    private String ownerName;
97
+
98
+    /**
99
+     * 业主手机号
100
+     */
101
+    private String ownerTel;
102
+
103
+    /**
104
+     * 性别 1:男   2:女
105
+     */
106
+    private String gender;
107
+
108
+    /**
109
+     * 关联状态   0 未关联  1 是已关联
110
+     */
111
+    private String pairStatus;
112
+
113
+    /**
114
+     * 认证状态  0 是未认证    1是认证通过   2是已作废
115
+     */
116
+    private String verifyStatus;
117
+
118
+    /**
119
+     * 排序
120
+     */
121
+    private String sort;
122
+
123
+    /**
124
+     * 创建人
125
+     */
126
+    private Integer createUser;
127
+
128
+    /**
129
+     * 创建时间
130
+     */
131
+    private Date createDate;
132
+
133
+    /**
134
+     * 更新人
135
+     */
136
+    private Integer updateUser;
137
+
138
+    /**
139
+     * 更新时间
140
+     */
141
+    private Date updateDate;
142
+
143
+    /**
144
+     * 审核id
145
+     */
146
+    private Integer taUserVerifyId;
147
+
148
+
149
+}

+ 5
- 0
CODE/foreign-service/src/main/java/com/community/huiju/model/TpConfiguration.java Прегледај датотеку

@@ -1,6 +1,8 @@
1 1
 package com.community.huiju.model;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
3 4
 import com.baomidou.mybatisplus.annotation.TableField;
5
+import com.baomidou.mybatisplus.annotation.TableId;
4 6
 import com.baomidou.mybatisplus.annotation.TableName;
5 7
 import lombok.Data;
6 8
 import lombok.EqualsAndHashCode;
@@ -26,6 +28,9 @@ public class TpConfiguration implements Serializable {
26 28
 
27 29
     private static final long serialVersionUID = 1L;
28 30
 
31
+    @TableId(value = "id", type = IdType.AUTO)
32
+    private Integer configurationId;
33
+
29 34
     /**
30 35
      * 配置key
31 36
      */

+ 5
- 0
CODE/foreign-service/src/main/java/com/community/huiju/model/TpEquipmentTree.java Прегледај датотеку

@@ -1,5 +1,7 @@
1 1
 package com.community.huiju.model;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
3 5
 import com.baomidou.mybatisplus.annotation.TableName;
4 6
 import lombok.Data;
5 7
 import lombok.EqualsAndHashCode;
@@ -25,6 +27,9 @@ public class TpEquipmentTree implements Serializable {
25 27
 
26 28
     private static final long serialVersionUID = 1L;
27 29
 
30
+    @TableId(value = "id", type = IdType.AUTO)
31
+    private Integer equipmentTreeId;
32
+
28 33
     /**
29 34
      * 小区id
30 35
      */

+ 16
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/ITaSysRoleService.java Прегледај датотеку

@@ -0,0 +1,16 @@
1
+package com.community.huiju.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.community.huiju.model.TaSysRole;
5
+
6
+/**
7
+ * <p>
8
+ * app端角色 服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-05-16
13
+ */
14
+public interface ITaSysRoleService extends IService<TaSysRole> {
15
+
16
+}

+ 46
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserVerifyService.java Прегледај датотеку

@@ -0,0 +1,46 @@
1
+package com.community.huiju.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.community.huiju.common.base.ResponseBean;
5
+import com.community.huiju.model.TaUserVerify;
6
+
7
+/**
8
+ * <p>
9
+ * app端用户审核表,存放用户的角色还有房产信息 服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-05-16
14
+ */
15
+public interface ITaUserVerifyService extends IService<TaUserVerify> {
16
+
17
+    /**
18
+     * 添加 房产关联
19
+     * @param userId
20
+     * @param communityId
21
+     * @param phaseId
22
+     * @param buildingId
23
+     * @param unitId
24
+     * @param levelId
25
+     * @param roomNoId
26
+     * @return
27
+     */
28
+    ResponseBean addUserVerify(Integer userId, Integer roleId,Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
29
+
30
+    /**
31
+     * 删除房产关联关系
32
+     * @param userId
33
+     * @param userVerifyId
34
+     * @return
35
+     */
36
+    ResponseBean deleteUserVerify(Integer userId, Integer userVerifyId);
37
+
38
+    /**
39
+     * 查询 房产关联关系列表,根据 用户Id 和 小区Id
40
+     * @param userId
41
+     * @param communityId
42
+     * @return
43
+     */
44
+    ResponseBean getUserVerifyByUserIdAndCommunityId(Integer userId, Integer communityId);
45
+
46
+}

+ 16
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/ITpBuildingOwnerInfoService.java Прегледај датотеку

@@ -0,0 +1,16 @@
1
+package com.community.huiju.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.community.huiju.model.TpBuildingOwnerInfo;
5
+
6
+/**
7
+ * <p>
8
+ * 楼栋业主资料信息表(户号信息也在里面相当于tp_room_no   PS:共用一张表) 服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-05-16
13
+ */
14
+public interface ITpBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo> {
15
+
16
+}

+ 20
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaSysRoleServiceImpl.java Прегледај датотеку

@@ -0,0 +1,20 @@
1
+package com.community.huiju.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.community.huiju.model.TaSysRole;
5
+import com.community.huiju.dao.TaSysRoleMapper;
6
+import com.community.huiju.service.ITaSysRoleService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * app端角色 服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2019-05-16
16
+ */
17
+@Service
18
+public class TaSysRoleServiceImpl extends ServiceImpl<TaSysRoleMapper, TaSysRole> implements ITaSysRoleService {
19
+
20
+}

+ 1
- 1
CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java Прегледај датотеку

@@ -102,7 +102,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
102 102
         userUpdateWrapper.set(StringUtils.isNotBlank(gender), "gender", gender);
103 103
         userUpdateWrapper.set(StringUtils.isNotBlank(phone), "login_name", phone);
104 104
         userUpdateWrapper.set("update_user", userId);
105
-        userUpdateWrapper.set("update_date", LocalDateTime.now());
105
+        userUpdateWrapper.set("update_date", new Date());
106 106
 
107 107
         this.update(userUpdateWrapper);
108 108
         user = this.getById(userId);

+ 253
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java Прегледај датотеку

@@ -0,0 +1,253 @@
1
+package com.community.huiju.service.impl;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.community.huiju.common.base.ResponseBean;
6
+import com.community.huiju.dao.*;
7
+import com.community.huiju.enums.ResponseErrorsMessages;
8
+import com.community.huiju.exception.WisdomException;
9
+import com.community.huiju.model.*;
10
+import com.community.huiju.service.ITaUserVerifyService;
11
+import org.apache.commons.collections.CollectionUtils;
12
+import org.apache.http.util.Asserts;
13
+import org.springframework.beans.factory.annotation.Autowired;
14
+import org.springframework.stereotype.Service;
15
+import org.springframework.transaction.annotation.Transactional;
16
+
17
+import java.util.Date;
18
+import java.util.List;
19
+
20
+/**
21
+ * <p>
22
+ * app端用户审核表,存放用户的角色还有房产信息 服务实现类
23
+ * </p>
24
+ *
25
+ * @author jobob
26
+ * @since 2019-05-16
27
+ */
28
+@Service
29
+public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaUserVerify> implements ITaUserVerifyService {
30
+
31
+    @Autowired
32
+    private TaUserVerifyMapper taUserVerifyMapper;
33
+
34
+    @Autowired
35
+    private TaUserMapper taUserMapper;
36
+
37
+    @Autowired
38
+    private TaSysRoleMapper taSysRoleMapper;
39
+
40
+    @Autowired
41
+    private TpPhaseMapper tpPhaseMapper;
42
+
43
+    @Autowired
44
+    private TpBuildingMapper tpBuildingMapper;
45
+
46
+    @Autowired
47
+    private TpUnitMapper tpUnitMapper;
48
+
49
+    @Autowired
50
+    private TpLevelMapper tpLevelMapper;
51
+
52
+    @Autowired
53
+    private TpRoomNoMapper tpRoomNoMapper;
54
+
55
+    @Autowired
56
+    private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
57
+
58
+    @Override
59
+    @Transactional(rollbackFor = Exception.class)
60
+    public ResponseBean addUserVerify(Integer userId, Integer roleId, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
61
+        ResponseBean responseBean = new ResponseBean();
62
+
63
+        TaUser taUser = taUserMapper.selectById(userId);
64
+        if (null == taUser) {
65
+            responseBean.addError(ResponseErrorsMessages.NOT_USER.getCode(), ResponseErrorsMessages.NOT_USER.getMsg());
66
+            return responseBean;
67
+        }
68
+
69
+        TaSysRole taSysRole = taSysRoleMapper.selectById(roleId);
70
+        if (null == taSysRole) {
71
+            responseBean.addError(ResponseErrorsMessages.NO_ROLE.getCode(), ResponseErrorsMessages.NO_ROLE.getMsg());
72
+            return responseBean;
73
+        }
74
+
75
+        QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
76
+        phaseQueryWrapper.eq("community_id", communityId);
77
+        phaseQueryWrapper.eq("id", phaseId);
78
+        TpPhase tpPhase = tpPhaseMapper.selectOne(phaseQueryWrapper);
79
+        if (null == tpPhase) {
80
+            responseBean.addError(ResponseErrorsMessages.NO_PHASE.getCode(), ResponseErrorsMessages.NO_PHASE.getMsg());
81
+            return responseBean;
82
+        }
83
+
84
+        QueryWrapper<TpBuilding> buildingQueryWrapper = new QueryWrapper<>();
85
+        buildingQueryWrapper.eq("community_id", communityId);
86
+        buildingQueryWrapper.eq("phase_id", phaseId);
87
+        buildingQueryWrapper.eq("id", buildingId);
88
+        TpBuilding tpBuilding = tpBuildingMapper.selectOne(buildingQueryWrapper);
89
+        if (null == tpBuilding) {
90
+            responseBean.addError(ResponseErrorsMessages.NO_BUILDING.getCode(), ResponseErrorsMessages.NO_BUILDING.getMsg());
91
+            return responseBean;
92
+        }
93
+
94
+        QueryWrapper<TpUnit> unitQueryWrapper = new QueryWrapper<>();
95
+        unitQueryWrapper.eq("community_id", communityId);
96
+        unitQueryWrapper.eq("phase_id", phaseId);
97
+        unitQueryWrapper.eq("building_id", buildingId);
98
+        unitQueryWrapper.eq("id", unitId);
99
+        TpUnit tpUnit = tpUnitMapper.selectOne(unitQueryWrapper);
100
+        if (null == tpUnit) {
101
+            responseBean.addError(ResponseErrorsMessages.NO_UNIT.getCode(), ResponseErrorsMessages.NO_UNIT.getMsg());
102
+            return responseBean;
103
+        }
104
+
105
+        QueryWrapper<TpLevel> levelQueryWrapper = new QueryWrapper<>();
106
+        levelQueryWrapper.eq("community_id", communityId);
107
+        levelQueryWrapper.eq("phase_id", phaseId);
108
+        levelQueryWrapper.eq("building_id", buildingId);
109
+        levelQueryWrapper.eq("unit_id", unitId);
110
+        levelQueryWrapper.eq("id", levelId);
111
+        TpLevel tpLevel = tpLevelMapper.selectOne(levelQueryWrapper);
112
+        if (null == tpLevel) {
113
+            responseBean.addError(ResponseErrorsMessages.NO_LEVEL.getCode(), ResponseErrorsMessages.NO_LEVEL.getMsg());
114
+            return responseBean;
115
+        }
116
+
117
+        QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
118
+        roomNoQueryWrapper.eq("community_id", communityId);
119
+        roomNoQueryWrapper.eq("phase_id", phaseId);
120
+        roomNoQueryWrapper.eq("building_id", buildingId);
121
+        roomNoQueryWrapper.eq("unit_id", unitId);
122
+        roomNoQueryWrapper.eq("level_id", levelId);
123
+        roomNoQueryWrapper.eq("id", roomNoId);
124
+        TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
125
+        if (null == tpRoomNo) {
126
+            responseBean.addError(ResponseErrorsMessages.NO_ROOM_NO.getCode(), ResponseErrorsMessages.NO_ROOM_NO.getMsg());
127
+            return responseBean;
128
+        }
129
+
130
+
131
+        // 校验身份
132
+        verifyBuidingRole(userId, roleId, true,communityId, phaseId, buildingId, unitId, levelId, roomNoId);
133
+
134
+        // 插入房产审核表,默认审核通过
135
+        TaUserVerify taUserVerify = new TaUserVerify();
136
+        taUserVerify.setUserId(taUser.getUserId());
137
+        taUserVerify.setCommunityId(communityId);
138
+        taUserVerify.setRoleId(taSysRole.getRoleId());
139
+        taUserVerify.setPhaseId(tpPhase.getPhaseId());
140
+        taUserVerify.setPhaseName(tpPhase.getName());
141
+        taUserVerify.setBuildingId(tpBuilding.getBuildingId());
142
+        taUserVerify.setBuildingName(tpBuilding.getName());
143
+        taUserVerify.setUnitId(tpUnit.getUnitId());
144
+        taUserVerify.setUnitName(tpUnit.getName());
145
+        taUserVerify.setLevelId(tpLevel.getLevelId());
146
+        taUserVerify.setLevelName(tpLevel.getName());
147
+        taUserVerify.setRoomNoId(tpRoomNo.getRoomNoId());
148
+        taUserVerify.setRoomNoName(tpRoomNo.getName());
149
+        taUserVerify.setVerifyStatus("1");
150
+        taUserVerify.setCreateDate(new Date());
151
+        taUserVerify.setVerifyName("大苏");
152
+
153
+        taUserVerifyMapper.insert(taUserVerify);
154
+
155
+        // 开始插入 楼栋资料库
156
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
157
+        tpBuildingOwnerInfo.setCommunityId(communityId);
158
+        tpBuildingOwnerInfo.setPhaseId(tpPhase.getPhaseId());
159
+        tpBuildingOwnerInfo.setPhaseName(tpPhase.getName());
160
+        tpBuildingOwnerInfo.setBuildingId(tpBuilding.getBuildingId());
161
+        tpBuildingOwnerInfo.setBuildingName(tpBuilding.getName());
162
+        tpBuildingOwnerInfo.setUnitId(tpUnit.getUnitId());
163
+        tpBuildingOwnerInfo.setUnitName(tpUnit.getName());
164
+        tpBuildingOwnerInfo.setLevelId(tpLevel.getLevelId());
165
+        tpBuildingOwnerInfo.setLevelName(tpLevel.getName());
166
+        tpBuildingOwnerInfo.setRoomNoId(tpRoomNo.getRoomNoId());
167
+        tpBuildingOwnerInfo.setRoomNoName(tpRoomNo.getName());
168
+        tpBuildingOwnerInfo.setOwnerName(taUser.getUserName());
169
+        tpBuildingOwnerInfo.setOwnerTel(taUser.getLoginName());
170
+        tpBuildingOwnerInfo.setGender(taUser.getGender());
171
+        tpBuildingOwnerInfo.setPairStatus("1");
172
+        tpBuildingOwnerInfo.setVerifyStatus("1");
173
+        tpBuildingOwnerInfo.setCreateDate(new Date());
174
+        // tpBuildingOwnerInfo.setCreateUser(taUser.getUserId());
175
+        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getUserVerifyId());
176
+
177
+        tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
178
+
179
+        responseBean.addSuccess(taUserVerify);
180
+        return responseBean;
181
+    }
182
+
183
+    /**
184
+     * 检查房产是否存在业主
185
+     * 检查这个用户是否在这个房产存在合法角色
186
+     *
187
+     * @param userId
188
+     * @param roleId
189
+     * @param hasOwner 是否执行业主校验
190
+     * @param communityId
191
+     * @param phaseId
192
+     * @param buildingId
193
+     * @param unitId
194
+     * @param levelId
195
+     * @param roomNoId
196
+     */
197
+    private void verifyBuidingRole(Integer userId, Integer roleId, boolean hasOwner, Integer communityId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId){
198
+        if (roleId == 1 && hasOwner) {
199
+            // 查询这个房产是否存在业主
200
+            TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(communityId, phaseId, buildingId, unitId, levelId, roomNoId);
201
+            if (null != userVerify) {
202
+                throw new WisdomException(ResponseErrorsMessages.EXIST_OWNER.getCode(), ResponseErrorsMessages.EXIST_OWNER.getMsg());
203
+            }
204
+        }
205
+
206
+        List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectAddress(userId, communityId, phaseId, buildingId, unitId, levelId, roomNoId);
207
+        if (CollectionUtils.isNotEmpty(userVerifyList) && userVerifyList.size() > 0) {
208
+            throw new WisdomException(ResponseErrorsMessages.EXIST_BUIDDING_ROLE.getCode(), ResponseErrorsMessages.EXIST_BUIDDING_ROLE.getMsg());
209
+        }
210
+    }
211
+
212
+    @Override
213
+    @Transactional(rollbackFor = Exception.class)
214
+    public ResponseBean deleteUserVerify(Integer userId, Integer userVerifyId) {
215
+        ResponseBean responseBean = new ResponseBean();
216
+
217
+        // 判断用户是否存在
218
+        // 判断是否是这个用户关联房产
219
+        // 删除楼栋资料库
220
+
221
+        TaUser taUser = taUserMapper.selectById(userId);
222
+        if (null == taUser) {
223
+            responseBean.addError(ResponseErrorsMessages.NOT_USER.getCode(), ResponseErrorsMessages.NOT_USER.getMsg());
224
+            return responseBean;
225
+        }
226
+
227
+        TaUserVerify hasUserVerify = taUserVerifyMapper.selectByUserIdAndUserVerifyId(userId, userVerifyId);
228
+        if (null == hasUserVerify) {
229
+            responseBean.addError(ResponseErrorsMessages.NOT_USER_VERIFY.getCode(), ResponseErrorsMessages.NOT_USER_VERIFY.getMsg());
230
+            return responseBean;
231
+        }
232
+
233
+        this.removeById(userVerifyId);
234
+
235
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
236
+        buildingOwnerInfoQueryWrapper.eq("ta_user_verify_id", userVerifyId);
237
+        tpBuildingOwnerInfoMapper.delete(buildingOwnerInfoQueryWrapper);
238
+
239
+        responseBean.addSuccess("操作成功!");
240
+        return responseBean;
241
+    }
242
+
243
+    @Override
244
+    public ResponseBean getUserVerifyByUserIdAndCommunityId(Integer userId, Integer communityId) {
245
+        ResponseBean responseBean = new ResponseBean();
246
+        QueryWrapper<TaUserVerify> taUserVerifyQueryWrapper = new QueryWrapper<>();
247
+        taUserVerifyQueryWrapper.eq("community_id", communityId);
248
+        taUserVerifyQueryWrapper.eq("user_id", userId);
249
+        List<TaUserVerify> list = this.list(taUserVerifyQueryWrapper);
250
+        responseBean.addSuccess(list);
251
+        return responseBean;
252
+    }
253
+}

+ 20
- 0
CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TpBuildingOwnerInfoServiceImpl.java Прегледај датотеку

@@ -0,0 +1,20 @@
1
+package com.community.huiju.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.community.huiju.model.TpBuildingOwnerInfo;
5
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
6
+import com.community.huiju.service.ITpBuildingOwnerInfoService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ * 楼栋业主资料信息表(户号信息也在里面相当于tp_room_no   PS:共用一张表) 服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2019-05-16
16
+ */
17
+@Service
18
+public class TpBuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInfoMapper, TpBuildingOwnerInfo> implements ITpBuildingOwnerInfoService {
19
+
20
+}

+ 5
- 0
CODE/foreign-service/src/main/resources/mapper/TaUserVerifyMapper.xml Прегледај датотеку

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.community.huiju.dao.TaUserVerifyMapper">
4
+
5
+</mapper>

+ 5
- 0
CODE/foreign-service/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml Прегледај датотеку

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.community.huiju.dao.TpBuildingOwnerInfoMapper">
4
+
5
+</mapper>

+ 3
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java Прегледај датотеку

@@ -555,7 +555,7 @@ public class TaUserServiceImpl implements ITaUserService {
555 555
         // 插入楼栋资料库
556 556
         TpBuildingOwnerInfo buildingInfo = getBuildingInfo(userElement, user.getLoginName());
557 557
         if (null == buildingInfo) {
558
-            insertTpBuildingOwnerInfo(userElement, user, null);
558
+            insertTpBuildingOwnerInfo(userElement, user, null, userVerify);
559 559
         }
560 560
 
561 561
         // 推送海康
@@ -611,7 +611,7 @@ public class TaUserServiceImpl implements ITaUserService {
611 611
      * @param user
612 612
      * @param userId 创建人
613 613
      */
614
-    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId) {
614
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (UserElement userElement, TaUser user, Integer userId, TaUserVerify taUserVerify) {
615 615
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
616 616
         // 查询 期/楼栋/单元/层/户号
617 617
         TpPhase phase = tpPhaseMapper.selectByPrimaryKey(userElement.getPhaseId());
@@ -642,6 +642,7 @@ public class TaUserServiceImpl implements ITaUserService {
642 642
         // tpBuildingOwnerInfo.setCreateUser(userId);
643 643
         tpBuildingOwnerInfo.setVerifyStatus("1");
644 644
         tpBuildingOwnerInfo.setPairStatus("1");
645
+        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
645 646
 
646 647
         // 添加的时候, 默认是当前操作的小区
647 648
         tpBuildingOwnerInfo.setCommunityId(userElement.getCommunityId());