暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -54,6 +54,9 @@ public class TaUser {
     // 角色名称
     private String roleName;
 
+    // 海康人员编号
+    private Long hkPersonNo;
+
     public Integer getId() {
         return id;
     }
@@ -237,4 +240,12 @@ public class TaUser {
     public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
+
+    public Long getHkPersonNo() {
+        return hkPersonNo;
+    }
+
+    public void setHkPersonNo(Long hkPersonNo) {
+        this.hkPersonNo = hkPersonNo;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
+import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.common.hk.HKConstant;
 import com.community.huiju.common.hk.HKOpenApi;
@@ -41,6 +42,8 @@ import java.util.logging.SimpleFormatter;
 @Slf4j
 public class TaUserServiceImpl implements ITaUserService {
 
+    private IdGen idGen = IdGen.get();
+
     @Autowired
     private TaUserMapper taUserMapper;
 
@@ -187,6 +190,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         ResponseBean<TaUserVO> response = new ResponseBean();
         // 开始注册
+        user.setHkPersonNo(idGen.nextId());
         user.setCreateDate(new Date());
         user.setUpdateDate(new Date());
         user.setStatus("1");
@@ -572,7 +576,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 添加人员
         Map<String,Object> parUser = Maps.newHashMap();
-        parUser.put("personNo",user.getId());
+        parUser.put("personNo",user.getHkPersonNo());
         parUser.put("personName",user.getUserName());
         parUser.put("phoneNo",user.getLoginName());
         parUser.put("deptUuid",deptUuid);
@@ -626,7 +630,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         // 人员参数
         Map<String,Object> parUser = Maps.newHashMap();
-        parUser.put("personNo",user.getId());
+        parUser.put("personNo",user.getHkPersonNo());
         parUser.put("personId",user.getHkUserId());
         parUser.put("personName",user.getUserName());
         parUser.put("phoneNo",user.getLoginName());

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

@@ -20,6 +20,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_person_no" property="hkPersonNo" jdbcType="BIGINT" />
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
@@ -27,7 +28,7 @@
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -45,7 +46,7 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date,
+      create_date, update_user, update_date, hk_person_no,
       hk_user_id, hk_card_no, face_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
@@ -54,7 +55,7 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -114,6 +115,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no,
+      </if>
       <if test="hkUserId != null" >
         hk_user_id,
       </if>
@@ -179,6 +183,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -244,6 +251,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         hk_user_id = #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -275,6 +285,7 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
       face_status = #{faceStatus,jdbcType=CHAR}

CODE/smart-community/app-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,5 +1,6 @@
 package com.community.huiju;
 
+import com.community.commom.uuid.IdGen;
 import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.dao.ToCommunitiesMapper;
 import com.community.huiju.dao.TpTicketMapper;
@@ -31,14 +32,20 @@ public class DemoApplicationTests {
 	@Test
 	public void contextLoads() {
 
-		List<ToCommunities> list = toCommunitiesMapper.selectByCommunityName("小区");
-		System.out.println(list);
+//		List<ToCommunities> list = toCommunitiesMapper.selectByCommunityName("小区");
+//		System.out.println(list);
 
 //		TpTicket tpTicket = tpTicketMapper.selectByPrimaryKey(1);
 //		System.out.println(tpTicket);
 
 //		TaUser user = mapper.selectByPrimaryKey(1);
 //		System.out.println(user);
+
+//		IdGen idGen = IdGen.get();
+//		long lo = 454545454;
+//		int in =  454545454;
+//		System.out.println(Long.valueOf(idGen.nextId()).intValue());
+
 	}
 
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/uuid/IdGen.java

@@ -0,0 +1,108 @@
+package com.community.commom.uuid;
+
+/**
+ * ID 生成策略
+ * @author  weiximei
+ */
+public class IdGen {
+
+    private long workerId;
+    private long datacenterId;
+    private long sequence = 0L;
+    private long twepoch = 1288834974657L;
+    //Thu, 04 Nov 2010 01:42:54 GMT
+    private long workerIdBits = 5L;
+    //节点ID长度
+    private long datacenterIdBits = 5L;
+    //数据中心ID长度
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits);
+    //最大支持机器节点数0~31，一共32个
+    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    //最大支持数据中心节点数0~31，一共32个
+    private long sequenceBits = 12L;
+    //序列号12位
+    private long workerIdShift = sequenceBits;
+    //机器节点左移12位
+    private long datacenterIdShift = sequenceBits + workerIdBits;
+    //数据中心节点左移17位
+    private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+    //时间毫秒数左移22位
+    private long sequenceMask = -1L ^ (-1L << sequenceBits);
+    //最大为4095
+    private long lastTimestamp = -1L;
+
+    private static class IdGenHolder {
+        private static final IdGen instance = new IdGen();
+    }
+
+    public static IdGen get(){
+        return IdGenHolder.instance;
+    }
+
+    public IdGen() {
+        this(0L, 0L);
+    }
+
+    public IdGen(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+        //获取当前毫秒数
+        //如果服务器时间有问题(时钟后退) 报错。
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(String.format(
+                    "Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+        //如果上次生成时间和当前时间相同,在同一毫秒内
+        if (lastTimestamp == timestamp) {
+            //sequence自增，因为sequence只有12bit，所以和sequenceMask相与一下，去掉高位
+            sequence = (sequence + 1) & sequenceMask;
+            //判断是否溢出,也就是每毫秒内超过4095，当为4096时，与sequenceMask相与，sequence就等于0
+            if (sequence == 0) {
+                timestamp = tilNextMillis(lastTimestamp);
+                //自旋等待到下一毫秒
+            }
+        } else {
+            sequence = 0L;
+            //如果和上次生成时间不同,重置sequence，就是下一毫秒开始，sequence计数重新从0开始累加
+        }
+        lastTimestamp = timestamp;
+        // 最后按照规则拼出ID。
+        // 000000000000000000000000000000000000000000  00000            00000       000000000000
+        // time                                      datacenterId      workerId     sequence
+        // return ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift)
+        //        | (workerId << workerIdShift) | sequence;
+
+        long longStr= ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift) | (workerId << workerIdShift) | sequence;
+        // System.out.println(longStr);
+        return longStr;
+    }
+
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+
+    public static void main(String[] args) {
+        IdGen idGen = IdGen.get();
+        System.out.println(idGen.nextId());
+    }
+
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -39,6 +39,11 @@ public class TaUser {
 
     private Date updateDate;
 
+    /**
+     * 海康人员编号
+     */
+    private Long hkPersonNo;
+
     // 海康UserId
     private Integer hkUserId;
 
@@ -237,4 +242,12 @@ public class TaUser {
     public void setRoleName(String roleName) {
         this.roleName = roleName;
     }
+
+    public Long getHkPersonNo() {
+        return hkPersonNo;
+    }
+
+    public void setHkPersonNo(Long hkPersonNo) {
+        this.hkPersonNo = hkPersonNo;
+    }
 }

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

@@ -20,6 +20,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_person_no" property="hkPersonNo" jdbcType="BIGINT" />
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
@@ -27,7 +28,7 @@
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
+    create_user, create_date, update_user, update_date, hk_person_no , hk_user_id, hk_card_no, face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -45,7 +46,7 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date,
+      create_date, update_user, update_date, hk_person_no,
       hk_user_id, hk_card_no, face_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
@@ -54,7 +55,7 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -114,6 +115,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no,
+      </if>
       <if test="hkUserId != null" >
         hk_user_id,
       </if>
@@ -179,6 +183,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -244,6 +251,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         hk_user_id = #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -275,6 +285,7 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
       face_status = #{faceStatus,jdbcType=CHAR}

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

@@ -44,9 +44,10 @@ public class BuildingOwnerInfoController extends BaseController {
                     "pageNum第几页;pageSize 一页多少行;")
     })
     @RequestMapping(value = "/building/list", method = RequestMethod.POST)
-    public ResponseBean getList(@RequestBody String parameter){
+    public ResponseBean getList(@RequestBody String parameter, HttpSession session){
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBuildingOwnerInfoService.listQuery(parameter);
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
         return responseBean;
     }
 

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

@@ -44,6 +44,13 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     TaUser selectByTel(@Param("loginName") String ownerTel,@Param("communityId") Integer communityId);
     
     int batchUpdate(List<TaUser> updataTaUserList);
+    
+    /**
+     * 更新角色为业主
+     * @param updataTaUserList
+     * @return
+     */
+    int batchUpdateRole(List<TaUser> updataTaUserList);
 
     /**
      * 根据手机得到用户ID

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

@@ -110,6 +110,11 @@ public class TaUser implements Serializable {
      */
     private LocalDateTime updateDate;
 
+    /**
+     * 海康人员编号
+     */
+    private Long hkPersonNo;
+
     /**
      * 海康人员ID
      */

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

@@ -30,7 +30,6 @@ public class User implements Serializable {
     /**
      * 小区id, 这字段作废不使用
      */
-    @Deprecated
     private Integer communityId;
 
     /**

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

@@ -26,9 +26,10 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
     /**
      * 根据条件查询
      * @param parameter
+     * @param userElement 用户登陆后的信息
      * @return
      */
-    ResponseBean listQuery(String parameter);
+    ResponseBean listQuery(String parameter, UserElement userElement);
 
     /**
      * 修改 楼栋业主信息

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

@@ -80,7 +80,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
-    public ResponseBean listQuery(String parameter) {
+    public ResponseBean listQuery(String parameter, UserElement userElement) {
 
         ResponseBean responseBean = new ResponseBean();
 
@@ -93,6 +93,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
 
         Map<String, Object> map = Maps.newHashMap();
+        // 小区Id
+        map.put("community_id", userElement.getCommunityId());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -144,6 +146,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 物业端的用户,也就是正在操作的物业人员
+        // 物业端用户小区Id不使用! 小区 Id 获取请使用 userElement
         User user = userMapper.selectById(userElement.getId());
 
         /**
@@ -184,8 +187,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return responseBean;
         }
 
-        // 开始修改手机号操作!
-
+        // 开始更新楼栋资料
         BeanTools.copyProperties(tpBuildingOwnerInfo, oldTpBuildingOwnerInfo);
 
         oldTpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
@@ -197,15 +199,29 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             throw new WisdomException("操作失败!");
         }
 
-        // 修改 APP 端业主用户的手机号信息!
+        /**
+         * APP 端这里, 如果楼栋资料库是已认证和已关联的! 那么就不允许修改手机号
+         */
+
         // 开始匹配 APP 端用户表
         // 查询 APP 端业主
-        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
-        if (null != appOwnerUser) {
-            // 修改手机号
-            appOwnerUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+        TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), oldTpBuildingOwnerInfo.getCommunityId());
+        if (null != appOwnerUser
+                && !"1".equals(oldTpBuildingOwnerInfo.getVerifyStatus())
+                && !"1".equals(oldTpBuildingOwnerInfo.getPairStatus())) {
+            // 修改APP端信息
+            appOwnerUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+            appOwnerUser.setVerifyStatus("1");
+            appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
             row = taUserMapper.updateById(appOwnerUser);
 
+            // 更新 楼栋业主信息表 的认证,关联状态
+            // 认证状态  0 是未认证    1是认证通过   2是已作废
+            oldTpBuildingOwnerInfo.setVerifyStatus("1");
+            // 关联状态   0 未关联  1 是已关联
+            oldTpBuildingOwnerInfo.setPairStatus("1");
+            row = tpBuildingOwnerInfoMapper.updateById(oldTpBuildingOwnerInfo);
+
             // 更新APP端用户的角色身份为 业主
             updateAppRole(tpBuildingOwnerInfo.getCommunityId(), appOwnerUser.getId(), Constant.OWNER_ID);
         }
@@ -412,6 +428,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
         if (updataTaUserList.size() > 0){
             taUserMapper.batchUpdate(updataTaUserList);
+            taUserMapper.batchUpdateRole(updataTaUserList);
         }
         responseBean.addSuccess("success");
         return responseBean;

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

@@ -20,6 +20,7 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_person_no" property="hkPersonNo" jdbcType="BIGINT" />
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
@@ -27,7 +28,7 @@
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -45,7 +46,7 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date,
+      create_date, update_user, update_date, hk_person_no,
       hk_user_id, hk_card_no, face_status
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
@@ -54,7 +55,7 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -114,6 +115,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no,
+      </if>
       <if test="hkUserId != null" >
         hk_user_id,
       </if>
@@ -179,6 +183,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -244,6 +251,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      </if>
       <if test="hkUserId != null" >
         hk_user_id = #{hkUserId,jdbcType=INTEGER},
       </if>
@@ -275,6 +285,7 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
       face_status = #{faceStatus,jdbcType=CHAR}
@@ -328,4 +339,14 @@
     where parent_id=#{id,jdbcType=INTEGER};
   </select>
 
+  <update id="batchUpdateRole" parameterType="java.util.ArrayList">
+    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+      update ta_sys_user_role
+      <set>
+        role_id= 1
+      </set>
+      where user_id = ${item.id} and community_id = ${item.communityId}
+    </foreach>
+  </update>
+
 </mapper>

CODE/smart-community/zuul/src/main/java/com/community/huiju/model/TaUser.java

@@ -39,6 +39,14 @@ public class TaUser {
 
     private Date updateDate;
 
+    private Long hkPersonNo;
+
+    private Integer hkUserId;
+
+    private String hkCardNo;
+
+    private String faceStatus;
+
     public Integer getId() {
         return id;
     }
@@ -182,4 +190,37 @@ public class TaUser {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+
+    public Long getHkPersonNo() {
+        return hkPersonNo;
+    }
+
+    public void setHkPersonNo(Long hkPersonNo) {
+        this.hkPersonNo = hkPersonNo;
+    }
+
+    public Integer getHkUserId() {
+        return hkUserId;
+    }
+
+    public void setHkUserId(Integer hkUserId) {
+        this.hkUserId = hkUserId;
+    }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo == null ? null : hkCardNo.trim();
+    }
+
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus == null ? null : faceStatus.trim();
+    }
+
 }

CODE/smart-community/zuul/src/main/resources/mapper/TaUserMapper.xml

@@ -20,11 +20,16 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_person_no" property="hkPersonNo" jdbcType="BIGINT" />
+    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no,
+    face_status
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -42,15 +47,17 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date
-      )
+      create_date, update_user, update_date,
+      hk_person_no, hk_user_id, hk_card_no,
+      face_status)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
       #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
-      )
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR},
+      #{faceStatus,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TaUser" >
     insert into ta_user
@@ -109,6 +116,18 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no,
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id,
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no,
+      </if>
+      <if test="faceStatus != null" >
+        face_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -165,6 +184,18 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        #{hkPersonNo,jdbcType=BIGINT},
+      </if>
+      <if test="hkUserId != null" >
+        #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        #{faceStatus,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -221,6 +252,18 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="hkPersonNo != null" >
+        hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        face_status = #{faceStatus,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -242,7 +285,11 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      face_status = #{faceStatus,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

VUECODE/smart-operate-manage/config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8085/operate-api"',
+  BASE_API: '"http://localhost:8086/operate-api"',
 })

VUECODE/smart-operate-manage/config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://101.132.102.231:8085/operate-api"',
+  BASE_API: '"http://101.132.102.231:8086/operate-api"',
 }

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

@@ -24,7 +24,7 @@
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           class="avatar-uploader"
-          action="http://101.132.102.231:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8086/operate-api/uploadimage"
           name="uploadFiles">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>

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

@@ -24,7 +24,7 @@
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
           class="avatar-uploader"
-          action="http://101.132.102.231:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8086/operate-api/uploadimage"
           name="uploadFiles">
           <img v-if="imageUrl" :src="imageUrl" class="avatar">
           <i v-else class="el-icon-plus avatar-uploader-icon"/>

VUECODE/smart-property-manage/config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://localhost:8085/property-api"',
+  BASE_API: '"http://localhost:8086/property-api"',
 })

VUECODE/smart-property-manage/config/prod.env.js

@@ -1,5 +1,5 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://101.132.102.231:8085/property-api"',
+  BASE_API: '"http://101.132.102.231:8086/property-api"',
 }

VUECODE/smart-property-manage/src/utils/ajax.js

@@ -18,6 +18,7 @@ const Axios = axios.create({
 Axios.interceptors.request.use((config) => {
   config.headers['Content-Type'] = config.headerData ? config.headerData : 'multipart/form-data'
   config.headers['X-Auth-Token'] = getToken()
+  config.headers['Login-Type'] = 'web'
   // config.urlData = { ...config.urlData,  }
   // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
   const urlData = qs.stringify(config.urlData)

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

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图 *">
         <el-upload
           class="avatar-uploader"
-          action="http://101.132.102.231:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8086/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">

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

@@ -22,7 +22,7 @@
       <el-form-item :label-width="formLabelWidth" label="banner图">
         <el-upload
           class="avatar-uploader"
-          action="http://101.132.102.231:8085/operate-api/uploadimage"
+          action="http://101.132.102.231:8086/operate-api/uploadimage"
           name="uploadFiles"
           :show-file-list="false"
           :on-success="handleAvatarSuccess">

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

@@ -17,10 +17,10 @@
         <el-input v-model="ruleForm.roomNo"/>
       </el-form-item>
       <el-form-item label="业主姓名" prop="ownerName">
-        <el-input v-model="ruleForm.ownerName"/>
+        <el-input v-model="ruleForm.ownerName" />
       </el-form-item>
       <el-form-item label="业主手机号" prop="ownerTel">
-        <el-input v-model="ruleForm.ownerTel"/>
+        <el-input v-model="ruleForm.ownerTel" :disabled="isOwnerTel"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
@@ -43,6 +43,7 @@ export default {
         ownerName: '',
         ownerTel: ''
       },
+      isOwnerTel: false, // 手机号是否可以编辑 true 不可编辑  false 为可编辑
       listQuery: [], // 查询的参数
       rules: {
         building: [
@@ -120,6 +121,10 @@ export default {
         this.ruleForm.roomNo = data.roomNo
         this.ruleForm.ownerName = data.ownerName
         this.ruleForm.ownerTel = data.ownerTel
+        if (data.verifyStatus === '1') {
+          // 不可编辑手机号
+          this.isOwnerTel = true
+        }
       }).catch(() => {
         console.log('error GetByIdBuildingId')
       })

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

@@ -70,7 +70,7 @@
       <el-table-column prop="ownerName" label="业主姓名" align="center"/>
       <el-table-column prop="ownerTel" label="手机号码" align="center" />
       <el-table-column prop="pairStatus" label="关联业主状态" align="center" >
-        <template slot-scope="scope">{{ scope.row.pairStatus === '1' ? '已关联':'未关联' }}</template>
+        <template slot-scope="scope">{{ scope.row.verifyStatus === '1' ? '已关联':'未关联' }}</template>
       </el-table-column>
       <el-table-column prop="createDate" label="创建时间" align="center" >
         <template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template>
@@ -78,9 +78,9 @@
     </el-table>
     <div class="block">
       <el-pagination
-        :current-page="listQuery.pageNum"
+        :current-page.sync="listQuery.pageNum"
         :page-sizes="[10, 20, 50, 100]"
-        :page-size="listQuery.pageSize"
+        :page-size.sync="listQuery.pageSize"
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange"
@@ -133,6 +133,7 @@ export default {
 
     const query = this.$route.params.listQuery
     if (query !== undefined) {
+      console.log('参数:', query)
       this.listQuery = query
     }