完成

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -871,9 +871,6 @@ public class TaUserServiceImpl implements ITaUserService {
 
         BeanTools.copyProperties(user, userVO);
 
-        // 房产状态
-        userVO.setVerifyStatus(user.getVerifyStatus());
-
         // 默认未绑定微信
         userVO.setBindingWX(Constant.NO_BINDING_WX);
 
@@ -889,6 +886,10 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 根据 审核id 查询 出审核的数据，里面有角色id
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(user.getUserVerifyId());
+
+        // 房产状态
+        userVO.setVerifyStatus(userVerify.getVerifyStatus());
+
         userVO.setAddressBuilding(userVerify.getPhaseName() + userVerify.getBuildingName() + userVerify.getUnitName() + userVerify.getLevelName() + userVerify.getRoomNoName());
 
         // 角色

CODE/smart-community/app-api/src/main/resources/mapper/TaUserVerifyMapper.xml

@@ -161,7 +161,7 @@
         #{verifyName,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
-        #{remark,,jdbcType=VARCHAR},
+        #{remark,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -217,7 +217,7 @@
         verify_name = #{verifyName,jdbcType=VARCHAR},
       </if>
       <if test="remark != null">
-        remark = #{remark,,jdbcType=VARCHAR}
+        remark = #{remark,jdbcType=VARCHAR}
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,32 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\hk\HttpClientSSLUtils$2.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\uuid\IdGen.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\hk\HttpClientSSLUtils.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\redis\FastJsonSerializer.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\mode\HkResponseBean.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\uuid\IdGen$IdGenHolder.class
+com\community\commom\utils\PayPriceUtils.class
+com\community\commom\hk\HttpClientSSLUtils$1.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\hk\Digests.class
+com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,29 @@
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/BuildingOwnerInfoController.java

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaFace;
 import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TaUserVerify;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.community.huiju.service.ITaFaceService;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.service.ITaUserVerifyService;
 import com.google.common.collect.Maps;
@@ -53,6 +55,9 @@ public class BuildingOwnerInfoController extends BaseController {
     @Autowired
     private ITaUserService iTaUserService;
 
+    @Autowired
+    private ITaFaceService iTaFaceService;
+
     @ApiOperation(value = "获取楼栋业主信息", notes = "根据条件获取")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "buildingId栋;" +
@@ -89,18 +94,31 @@ public class BuildingOwnerInfoController extends BaseController {
         // true 标识业主 false 非业主
         map.put("boolRole", false);
 
+        // 默认人脸未录入
+        map.put("face", "unregister");
+
         QueryWrapper<TaUserVerify> userVerifyQueryWrapper = new QueryWrapper<>();
         userVerifyQueryWrapper.eq("phase_id", userVerify.getPhaseId());
         userVerifyQueryWrapper.eq("building_id", userVerify.getBuildingId());
         userVerifyQueryWrapper.eq("unit_id", userVerify.getUnitId());
         userVerifyQueryWrapper.eq("level_id", userVerify.getLevelId());
         userVerifyQueryWrapper.eq("room_no_id", userVerify.getRoomNoId());
+        userVerifyQueryWrapper.eq("user_id", userVerify.getUserId());
         userVerifyQueryWrapper.eq("role_id", 1);
         TaUserVerify userVerifyOne = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
-        if (null == userVerifyOne) {
+        if (null != userVerifyOne) {
             map.put("boolRole", true);
         }
 
+        // 人脸是否录入
+        QueryWrapper<TaFace> faceQueryWrapper = new QueryWrapper<>();
+        faceQueryWrapper.eq("ta_user_verify_id", userVerify.getId());
+        TaFace face = iTaFaceService.getOne(faceQueryWrapper);
+        if (null != face) {
+            map.put("face", "register");
+        }
+
+
         responseBean.addSuccess(map);
         return responseBean;
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -146,7 +146,7 @@ public class UserVerifyController extends BaseController {
         userVerifyQueryWrapper.eq("role_id", 1);
         userVerifyQueryWrapper.eq("verify_status", 1);
         TaUserVerify userVerify = iTaUserVerifyService.getOne(userVerifyQueryWrapper);
-        if (null == userVerify) {
+        if (null != userVerify) {
             map.put("boolRole", true);
         }
         return map;

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaFaceMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaFace;
+
+/**
+ * <p>
+ * 人脸检测图片 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-11
+ */
+public interface TaFaceMapper extends BaseMapper<TaFace> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaFace.java

@@ -0,0 +1,63 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 人脸检测图片
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_face")
+public class TaFace implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 用户审核表id
+     */
+    private Integer taUserVerifyId;
+
+    /**
+     * 上传的图片
+     */
+    private String faceImg;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -149,4 +149,10 @@ public class TpBuildingOwnerInfo implements Serializable {
      */
     @TableField(exist = false)
     private String updateName;
+
+    /**
+     * 审核id
+     */
+    @TableField(exist = false)
+    private Integer userVerifyId;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaFaceService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaFace;
+
+/**
+ * <p>
+ * 人脸检测图片 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-11
+ */
+public interface ITaFaceService extends IService<TaFace> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -150,6 +150,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             responseBean.addError("审核不存在！");
             return responseBean;
         }
+        if (!"0".equals(userVerify.getVerifyStatus())) {
+            responseBean.addError("只能审核待审核状态！");
+            return responseBean;
+        }
 
         // 判断当前是否存在审核通过的业主
         // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaFaceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaFaceMapper;
+import com.community.huiju.model.TaFace;
+import com.community.huiju.service.ITaFaceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人脸检测图片 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-11
+ */
+@Service
+public class TaFaceServiceImpl extends ServiceImpl<TaFaceMapper, TaFace> implements ITaFaceService {
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -61,6 +61,7 @@
     <select id="selectListByParams" resultType="com.community.huiju.model.TpBuildingOwnerInfo">
         SELECT
             t.id,
+            u.id as userVerifyId,
             t.community_id as communityId,
             t.owner_tel as ownerTel,
             t.owner_name as ownerName,

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -125,14 +125,9 @@ export function updateBuilding(data) {
     url: '/building/update',
     method: 'put',
     data: {
-      id: data.id,
-      phase: data.phase,
-      building: data.building,
-      unit: data.unit,
-      level: data.level,
-      roomNo: data.roomNo,
-      ownerName: data.ownerName,
-      ownerTel: data.ownerTel
+      userVerifyId: data.userVerifyId,
+      roleId: data.roleId,
+      verifyStatus: data.verifyStatus
     }
   })
 }
@@ -140,7 +135,7 @@ export function updateBuilding(data) {
 // 根据楼栋信息 id 查询
 export function getByIdBuildingId(buildingId) {
   return request({
-    url: '/building/' + buildingId,
+    url: '/building/verify/' + buildingId,
     method: 'get'
   })
 }

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -2,7 +2,7 @@
   <div class="root">
     <el-form ref="ruleForm" :model="listQuery" :rules="rules" label-width="100px" class="add-ruleForm">
       <el-form-item label="手机号" prop="ownerTel" placeholder="手机号">
-        <span>{{ listQuery.ownerTel }}</span>
+        <span>{{ ownerTel }}</span>
       </el-form-item>
       <el-form-item label="身份" prop="roleId">
         <el-select v-model="listQuery.roleId" placeholder="身份">
@@ -12,8 +12,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="审核">
-        <el-radio v-model="listQuery.gender" label="1">通过</el-radio>
-        <el-radio v-model="listQuery.gender" label="2">不通过</el-radio>
+        <el-radio v-model="listQuery.verifyStatus" label="true">通过</el-radio>
+        <el-radio v-model="listQuery.verifyStatus" label="false">不通过</el-radio>
       </el-form-item>
       <div>
         <el-form-item label="注册状态：" >
@@ -30,7 +30,7 @@
         </el-form-item>
       </div>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
       </el-form-item>
     </el-form>
@@ -42,7 +42,8 @@ export default {
   data() {
     return {
       listQuery: {
-        ownerTel: '',
+        userVerifyId: '',
+        verifyStatus: '',
         roleId: ''
       },
       isRegistered: true, // true 未注册 false 注册
@@ -83,27 +84,76 @@ export default {
     }
   },
   mounted() {
-    this.query.id
+    this.listQuery.userVerifyId = this.$route.query.id
+    this.getByBuildId()
   },
   methods: {
     submitForm(formName) { // 提交
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.addBuilding()
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
+      this.updateBuilding()
     },
     resetForm(formName) { // 重置
-      // 重置为未注册
-      this.isRegistered = true
       // 重置为非业主
       this.roleDisabled = false
 
       console.log(this.isRegistered)
       this.$refs[formName].resetFields()
+    },
+    getByBuildId() {
+      this.$store.dispatch('GetByIdBuildingId', this.listQuery.userVerifyId).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+
+        const resData = res.data
+        // 显示数据
+        const resInfo = resData.info
+        this.userName = resInfo.userName
+        this.idCard = resInfo.idCard
+        this.gender = resInfo.gender === '1' ? '男' : '女'
+        this.ownerTel = resInfo.loginName
+
+        if (resData.boolRole === true) {
+          // 表示已经是业主
+          this.roleDisabled = true
+        }
+      }).catch(() => {
+        console.log('GetByIdBuildingId error')
+      })
+    },
+    updateBuilding() { // 审核用户
+      if (this.listQuery.roleId === '') {
+        this.$message.error('请选择审身份!')
+        return
+      }
+      if (this.listQuery.verifyStatus === '') {
+        this.$message.error('请选择审核项!')
+        return
+      }
+      this.$store.dispatch('UpdateBuilding', this.listQuery).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.$message.error(res.message)
+          return
+        }
+        this.$message.success(res.message)
+        this.$router.go(-1)
+      }).catch(() => {
+        console.log('UpdateBuilding error')
+      })
+    },
+    taUserHasOwner() { // 根据 期/栋/单元/楼层/户号 校验是否有业主
+      this.$store.dispatch('TaUserHasOwner', this.listQuery).then((res) => {
+        this.roleDisabled = false
+        const resData = res.data
+        if (resData.boolRole === true) {
+          // 表示已经是业主
+          this.roleDisabled = true
+        }
+      }).catch(() => {
+        console.log('TaUserHasOwner error')
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -196,7 +196,7 @@ export default {
       // 设置为 空
       this.deleteIds = []
       for (let i = 0; i < data.length; i++) {
-        this.deleteIds.push(data[i].id)
+        this.deleteIds.push(data[i].userVerifyId)
       }
     },
     getPhase() { // 获取期