合并

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

@@ -53,12 +53,10 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/user/verify/delete/{userVerifyId}", method = RequestMethod.DELETE)
     @ApiOperation(value = "删除一个审核的房产", notes = "删除一个审核的房产")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id"),
-            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "userVerifyId", value = "审核房产 id")
     })
     public ResponseBean deleteUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = getUserElement(session);
         responseBean = taUserVerifyServicel.deleteUserVerify(userVerifyId);
         return responseBean;
     }

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

@@ -115,6 +115,8 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
             return responseBean;
         }
 
+        result.put("ownerName",null);
+        result.put("roleName", null);
         responseBean.addSuccess(UserVerifyEnum.NO_OWNER.getMsg(), result, null);
         return responseBean;
     }

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

@@ -12,6 +12,7 @@ import com.community.huiju.service.IHKService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -40,17 +41,21 @@ public class HKServiceImpl implements IHKService {
     public ResponseBean pushPerson(String appUserId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
+        // 这两个值一般都是同时存在的
+        // 当这两个值不存在的时候，就添加海康人员
+        if (StringUtils.isBlank(user.getHkUserId() + "") && StringUtils.isBlank(user.getHkPersonNo() + "")) {
+            // 设置 海康id
+            user.setHkPersonNo(idGen.nextId());
+            /**
+             * 1.获取部门(比如 住户)
+             * 2.根据部门编号推送 海康
+             */
+            addUserAndOpenCard(responseBean, user);
+        }
 
-        // 设置 海康id
-        user.setHkPersonNo(idGen.nextId());
 
 
         // 推送海康
-        /**
-         * 1.获取部门(比如 住户)
-         * 2.根据部门编号推送 海康
-         */
-        addUserAndOpenCard(responseBean, user);
 
         // 给用户添加 海康门禁权限
         HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));

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

@@ -885,7 +885,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 人脸是否已录入
         TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
-        if (null == face) {
+        if (null != face) {
             userVO.setFace("register");
         } else {
             userVO.setFace("unregister");

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

@@ -210,7 +210,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
-        if (null != userVerify && userElement.getUserVerifyId().intValue()  == userVerify.getId().intValue()) {
+        if (null != userVerify && null != userElement.getUserVerifyId()  && userElement.getUserVerifyId().intValue()  == userVerify.getId().intValue()) {
             responseBean.addError("无法删除当前登录的房产！");
             return responseBean;
         }

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/operate-api/src/main/java/com/community/huiju/model/ToCommunities.java

@@ -46,7 +46,29 @@ public class ToCommunities {
     private String city;
     
     private String district;
-    
+
+    // =============================================================
+
+    /**
+     * 物业人员数量
+     */
+    private Integer propertyNum;
+
+    /**
+     * 已核实业主数量
+     */
+    private Integer verifyOwnerNum;
+
+    /**
+     * 已核实家属数量
+     */
+    private Integer verifyRelationNum;
+
+    /**
+     * 已核实租客数量
+     */
+    private Integer verifyTenantNum;
+
 
     public Integer getId() {
         return id;
@@ -183,4 +205,36 @@ public class ToCommunities {
     public void setDistrict(String district) {
         this.district = district;
     }
+
+    public Integer getPropertyNum() {
+        return propertyNum;
+    }
+
+    public void setPropertyNum(Integer propertyNum) {
+        this.propertyNum = propertyNum;
+    }
+
+    public Integer getVerifyOwnerNum() {
+        return verifyOwnerNum;
+    }
+
+    public void setVerifyOwnerNum(Integer verifyOwnerNum) {
+        this.verifyOwnerNum = verifyOwnerNum;
+    }
+
+    public Integer getVerifyRelationNum() {
+        return verifyRelationNum;
+    }
+
+    public void setVerifyRelationNum(Integer verifyRelationNum) {
+        this.verifyRelationNum = verifyRelationNum;
+    }
+
+    public Integer getVerifyTenantNum() {
+        return verifyTenantNum;
+    }
+
+    public void setVerifyTenantNum(Integer verifyTenantNum) {
+        this.verifyTenantNum = verifyTenantNum;
+    }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToCommunitiesMapper.xml

@@ -196,7 +196,11 @@
       c.update_date,
       n.province,
       a.city,
-      t.district
+      t.district,
+      (select count(*) from tp_user where community_id=c.id and status=1) as propertyNum,
+      (select count(*) from ta_user_verify where community_id=c.id and role_id=1 and verify_status=1) as verifyOwnerNum,
+      (select count(*) from ta_user_verify where community_id=c.id and role_id=3 and verify_status=1) as verifyRelationNum,
+      (select count(*) from ta_user_verify where community_id=c.id and role_id=2 and verify_status=1) as verifyTenantNum
     FROM
       to_communities c
     LEFT JOIN sys_nation n ON c.province_id = n.id

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -31,4 +33,26 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
     int batchUpdate(List<TpBuildingOwnerInfo> list);
 	
 	List<TpBuildingOwnerInfo> selectListByParams(Page page,@Param("tpBuildingOwnerInfo") TpBuildingOwnerInfo tpBuildingOwnerInfo);
+
+    /**
+     * 更具 小区、期、楼栋、单元、楼层、户号、手机号 查询
+     * @param communityId
+     * @param phaseId
+     * @param buildingId
+     * @param unitId
+     * @param levelId
+     * @param roomNoId
+     * @param ownerTel
+     * @return
+     */
+	@ResultType(TpBuildingOwnerInfo.class)
+	@Select("select * FROM tp_building_owner_info tpio " +
+            "WHERE tpio.community_id = #{communityId} " +
+            "and tpio.phase_id = #{phaseId} " +
+            "and tpio.building_id = #{buildingId} " +
+            "and tpio.unit_id = #{unitId} " +
+            "and tpio.level_id = #{levelId} " +
+            "AND tpio.room_no_id = #{roomNoId} " +
+            "AND tpio.owner_tel = #{ownerTel}")
+    TpBuildingOwnerInfo selectCommunityIdAndAddress(@Param("communityId") Integer communityId, @Param("phaseId") Integer phaseId, @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId, @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId, @Param("ownerTel") String ownerTel);
 }

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

@@ -39,6 +39,21 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
+    @Autowired
+    private TpPhaseMapper tpPhaseMapper;
+
+    @Autowired
+    private TpBuildingMapper tpBuildingMapper;
+
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+    @Autowired
+    private TpLevelMapper tpLevelMapper;
+
+    @Autowired
+    private TpRoomNoMapper tpRoomNoMapper;
+
     @Override
     public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -70,6 +85,17 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
 
         User user = userMapper.selectById(userElement.getId());
         String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
+
+        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
+                userVerify.getBuildingId(), userVerify.getUnitId(),
+                userVerify.getLevelId(), userVerify.getRoomNoId(),
+                taUser.getLoginName());
+        // 插入楼栋资料库
+        // 保证这个用户在这个小区的房产中只存在一个数据
+        if (verifyStatus && null == tpBuildingOwnerInfo) {
+            insertBuildingOwnerInfo(userVerify, user);
+        }
         userVerify.setVerifyStatus(status);
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
@@ -78,6 +104,46 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         return responseBean;
     }
 
+    /**
+     * 插入楼栋资料库
+     *
+     * @param user 物业人员
+     * @param userVerify 审核数据
+     * @return TpBuildingOwnerInfo
+     */
+    private TpBuildingOwnerInfo insertBuildingOwnerInfo(TaUserVerify userVerify, User user) {
+        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
+        TpPhase tpPhase = tpPhaseMapper.selectById(userVerify.getPhaseId());
+        TpBuilding tpBuilding = tpBuildingMapper.selectById(userVerify.getBuildingId());
+        TpUnit tpUnit = tpUnitMapper.selectById(userVerify.getUnitId());
+        TpLevel tpLevel = tpLevelMapper.selectById(userVerify.getLevelId());
+        TpRoomNo tpRoomNo = tpRoomNoMapper.selectById(userVerify.getRoomNoId());
+
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+        tpBuildingOwnerInfo.setCommunityId(userVerify.getCommunityId());
+        tpBuildingOwnerInfo.setIdCard(taUser.getIdCard());
+        tpBuildingOwnerInfo.setPhaseId(tpPhase.getId());
+        tpBuildingOwnerInfo.setPhaseName(tpPhase.getName());
+        tpBuildingOwnerInfo.setBuildingId(tpBuilding.getId());
+        tpBuildingOwnerInfo.setBuildingName(tpBuilding.getName());
+        tpBuildingOwnerInfo.setUnitId(tpUnit.getId());
+        tpBuildingOwnerInfo.setUnitName(tpUnit.getName());
+        tpBuildingOwnerInfo.setLevelId(tpLevel.getId());
+        tpBuildingOwnerInfo.setLevelName(tpLevel.getName());
+        tpBuildingOwnerInfo.setRoomNoId(tpRoomNo.getId());
+        tpBuildingOwnerInfo.setRoomNoName(tpRoomNo.getName());
+        tpBuildingOwnerInfo.setOwnerName(taUser.getUserName());
+        tpBuildingOwnerInfo.setOwnerTel(taUser.getLoginName());
+        tpBuildingOwnerInfo.setGender(taUser.getGender());
+        tpBuildingOwnerInfo.setPairStatus("1");
+        tpBuildingOwnerInfo.setVerifyStatus("1");
+        tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
+        tpBuildingOwnerInfo.setCreateUser(user.getId());
+
+        tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+        return tpBuildingOwnerInfo;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean verifyinfoAdd(UserElement userElement, Integer userVerifyId, String verifyStatus, String roleState) {
@@ -88,23 +154,28 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             responseBean.addError("审核数据不存在！");
             return responseBean;
         }
+        // 被审核的用户(APP端)
+        TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
+        // 物业人员
+        User user = userMapper.selectById(userElement.getId());
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
+                userVerify.getBuildingId(), userVerify.getUnitId(),
+                userVerify.getLevelId(), userVerify.getRoomNoId(),
+                taUser.getLoginName());
 
         userVerify.setVerifyStatus(verifyStatus);
         userVerify.setRoleId(Integer.valueOf(roleState));
         // 审核通过的情况
         if ("1".equals(verifyStatus) && StringUtils.isNotBlank(roleState)) {
             userVerify.setRoleId(Integer.valueOf(roleState));
+            // 只有这个人在当前房产没有楼栋资料的时候才添加
+            if (null == tpBuildingOwnerInfo) {
+                // 添加楼栋数据
+                insertBuildingOwnerInfo(userVerify, user);
+            }
         }
         taUserVerifyMapper.updateById(userVerify);
 
-
-        // 审核成功后更新building_owner_info里面的时间
-//        Integer BuildingID= taUserMapper.selectById(userVerify.getUserId()).getBuildingOwnerInfoId();
-//        TpBuildingOwnerInfo tpBuildingOwnerInfo= tpBuildingOwnerInfoMapper.selectById(BuildingID);
-//         LocalDateTime time = LocalDateTime.now();
-//         tpBuildingOwnerInfo.setUpdateDate(time);
-//        tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
-
         responseBean.addSuccess("操作成功！");
 
         return responseBean;

VUECODE/smart-operate-manage/src/views/banner/addBanner/index.vue

@@ -156,7 +156,8 @@ export default {
       showURLVisible: true,
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
-        { id: 2, value: '服务banner' }
+        { id: 2, value: '服务banner' },
+        { id: 3, value: '广告banner' }
       ]
     }
   },

VUECODE/smart-operate-manage/src/views/banner/ediBanner/index.vue

@@ -159,7 +159,8 @@ export default {
       showURLVisible: true,
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
-        { id: 2, value: '服务banner' }
+        { id: 2, value: '服务banner' },
+        { id: 3, value: '广告banner' }
       ]
     }
   },

VUECODE/smart-operate-manage/src/views/banner/index.vue

@@ -163,7 +163,8 @@ export default {
       formLabelWidth: '120px',
       bannerPositionArr: [
         { id: 1, value: '首页banner' },
-        { id: 2, value: '服务banner' }
+        { id: 2, value: '服务banner' },
+        { id: 3, value: '广告banner' }
       ],
       deleteBannerId: []
     }

VUECODE/smart-operate-manage/src/views/community/communityTable.vue

@@ -41,22 +41,22 @@
       </el-table-column>
       <el-table-column label="物业人员数量" align="center">
         <template slot-scope="scope">
-          <span>52</span>
+          <span>{{ scope.row.propertyNum }}</span>
         </template>
       </el-table-column>
       <el-table-column label="已核业主数量" align="center">
         <template slot-scope="scope">
-          <span>123</span>
+          <span>{{ scope.row.verifyOwnerNum }}</span>
         </template>
       </el-table-column>
       <el-table-column label="已核家属数量" align="center">
         <template slot-scope="scope">
-          <span>345</span>
+          <span>{{ scope.row.verifyRelationNum }}</span>
         </template>
       </el-table-column>
       <el-table-column label="已核租客数量" align="center">
         <template slot-scope="scope">
-          <span>234</span>
+          <span>{{ scope.row.verifyTenantNum }}</span>
         </template>
       </el-table-column>
       <el-table-column label="物业管理员" align="center">