Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -642,7 +642,7 @@ public class HKOpenApi {
      * @param phoneNo 电话
      * @return
      */
-    public static String HKpersonPhone(Integer personId,Integer personNo,String personName,String phoneNo) {
+    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo) {
 
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();

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

@@ -41,6 +41,7 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
     public ResponseBean login(@RequestBody String parameter,
@@ -64,6 +65,7 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
@@ -76,7 +78,8 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "查看房屋成员列表", notes = "查看房屋成员列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/roomUserList", method = RequestMethod.GET)
     public ResponseBean accessTicket(HttpSession session){
@@ -91,6 +94,7 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
     public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
@@ -111,6 +115,7 @@ public class UserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/user/dependentsOrTenants",method = RequestMethod.PUT)
     public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
@@ -133,6 +138,7 @@ public class UserController extends BaseController {
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
                     "type(2租客 3家属)"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)
@@ -158,6 +164,7 @@ public class UserController extends BaseController {
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
                     "type(2租客 3家属)"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/updateTenantsOrDependents",method = RequestMethod.POST)
@@ -182,6 +189,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/modifyUserHeadPortrait",method = RequestMethod.PUT)
@@ -199,6 +207,7 @@ public class UserController extends BaseController {
     @ApiOperation(value = "获取用户信息", notes = "获取用户信息, 携带userId表示查询租客或者家属")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "userId",value = "租客或者家属的ID(可选值)"),
     })
     @RequestMapping(value = "/user/info",method = RequestMethod.GET)
@@ -220,7 +229,8 @@ public class UserController extends BaseController {
 
     @ApiOperation(value = "游客登录", notes = "游客登录")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id")
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
     @RequestMapping(value = "/user/temporary/{communityId}", method = RequestMethod.POST)
     public ResponseBean temporaryLogin(@PathVariable Integer communityId, HttpSession session) {

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

@@ -35,7 +35,7 @@ public interface ITaUserService {
     ResponseBean register(TaUser user);
 
     /**
-     * 修改当前用户信息
+     * 修改当前用户手机号
      * @param id
      * @return
      */

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
+import com.community.commom.utils.BeanTools;
 import com.community.commom.utils.MD5Utils;
 import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.code.cache.AppkeyCache;
@@ -216,6 +217,7 @@ public class TaUserServiceImpl implements ITaUserService {
             TpBuildingOwnerInfo buildingOwnerInfo = buildingOwnerInfoList.get(0);
             user.setBuildingOwnerInfoId(buildingOwnerInfo.getId());
             user.setVerifyStatus("1");
+            user.setUserName(buildingOwnerInfo.getOwnerName());
             // 标记位1, 业主身份
             roleType = 1;
 
@@ -292,16 +294,13 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("号码已占用");
             return response;
         }
-        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getId(),user.getUserName(),phone);
-       try {
-             if (null == data) {
-            throw new RuntimeException("海康人脸推送失敗！");
+        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getHkPersonNo(),user.getUserName(),phone);
+        JSONObject jsonobject = JSONObject.parseObject(data);
+        int errorCode = jsonobject.getInteger("errorCode");
+        if (errorCode!=0){
+            response.addError("海康电话已存在,推送海康电话修改失败");
+            return response;
         }
-       }catch (Exception e){
-           e.printStackTrace();
-           log.error("海康修改电话失敗！ {}",e);
-           throw new RuntimeException("海康修改电话失敗！");
-       }
         if(null!=codes && codes.equals(code)){;
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
@@ -367,7 +366,7 @@ public class TaUserServiceImpl implements ITaUserService {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(user.getId());
-        BeanUtils.copyProperties(user,taUser);
+        BeanTools.copyProperties(user, taUser);
 
         int result = taUserMapper.updateByPrimaryKeySelective(taUser);
 

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

@@ -134,17 +134,21 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     public ResponseBean update(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
+
         TpBuildingOwnerInfo tpBuildingOwnerInfo = JSONObject.parseObject(parameter, TpBuildingOwnerInfo.class);
         if (!AccountValidatorUtil.isPhone(tpBuildingOwnerInfo.getOwnerTel())){
             responseBean.addError("请输入正取的手机号!");
             return responseBean;
         }
 
-
         TpBuildingOwnerInfo oldTpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(tpBuildingOwnerInfo.getId());
         if (null == oldTpBuildingOwnerInfo) {
             throw new WisdomException("%s 数据不存在!", tpBuildingOwnerInfo.getId());
         }
+        if ("1".equals(oldTpBuildingOwnerInfo.getVerifyStatus())) {
+            responseBean.addError("不能修改已认证的楼栋业主信息!");
+            return responseBean;
+        }
 
         // 物业端的用户,也就是正在操作的物业人员
         // 物业端用户小区Id不使用! 小区 Id 获取请使用 userElement
@@ -290,6 +294,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         if (null != appOwnerUser) {
             // 更新 APP 端用户认证的状态
             appOwnerUser.setBuildingOwnerInfoId(tpBuildingOwnerInfo.getId());
+            appOwnerUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+
             // 认证状态  0 是未认证    1是认证通过   2是已作废
             // 标记位已认证
             appOwnerUser.setVerifyStatus("1");

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

@@ -23,7 +23,7 @@
         <el-input v-model="ruleForm.ownerTel" :disabled="isOwnerTel"/>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
         <el-button @click="backIndex">返回</el-button>
       </el-form-item>
     </el-form>

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

@@ -286,7 +286,19 @@ export default {
         this.$message.error('请选择一行数据进行修改!')
         return
       }
-      this.$router.push({ name: 'building-edi', params: { id: ids[0], listQuery: this.listQuery }})
+      this.$store.dispatch('GetByIdBuildingId', ids[0]).then((res) => {
+        const resCode = res.code
+        if (resCode === '0') {
+          const resData = res.data
+          if (resData.verifyStatus === '1') {
+            this.$message.error('不能修改已认证的楼栋业主信息!')
+            return
+          }
+        }
+        this.$router.push({ name: 'building-edi', params: { id: ids[0], listQuery: this.listQuery }})
+      }).catch(() => {
+        console.log('error GetByIdBuildingId')
+      })
     },
     formatDate(val) {
       var value = new Date(val)

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

@@ -31,7 +31,10 @@
       <el-table-column prop="ownerName" label="姓名" align="center"/>
       <el-table-column prop="ownerTel" label="手机号" align="center" />
       <el-table-column prop="gender" label="性别" align="center">
-        <template slot-scope="scope">{{ scope.row.gender =='1' ? '男':'女' }}</template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.gender==1">{{ '男' }}</span>
+          <span v-if="scope.row.gender==2">{{ '女' }}</span>
+        </template>      
       </el-table-column>
       <el-table-column prop="idCard" label="身份证号" align="center" />
       <!-- <el-table-column prop="name" label="所在户" width="180" /> -->