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

         System.out.println(data);
     }
 
+
+    /**
+     * 修改电话推送海康
+     * @param personId 人员ID
+     * @param personNo 人员编号
+     * @param personName 姓名
+     * @param phoneNo 电话
+     * @return
+     */
+    public static String HKpersonPhone(Integer personId,Integer personNo,String personName,String phoneNo) {
+
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid", HKConstant.OP_USER_UUID);
+        map.put("personId", personId);
+        map.put("personNo", personNo);
+        map.put("personName", personName);
+        map.put("phoneNo", phoneNo);
+        String params = JSON.toJSONString(map);
+        log.info("修改电话 请求参数：{}",params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("修改电话请求结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("修改电话 请求失败：{}",e);
+            throw new RuntimeException("修改电话失败!");
+        }
+        return data;
+    }
 }

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

     }
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码)"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)

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

         record.setCommunityId(communityId);
         record.setTicketId(Integer.valueOf(ticketId));
         record.setStatus("5");
-        //todo
+        record.setContent(tpTicket.getComment());
         record.setCreateUser(userId);
         record.setCreateDate(new Date());
         tpTicketRecordMapper.insertSelective(record);

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

         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String phone = (String) jsonObject.get("phone");
         String code = (String) jsonObject.get("code");
+        String otherUserId = (String) jsonObject.get("otherUserId");
 
-        TaUser user=taUserMapper.selectByPrimaryKey(id);
+        // 默认为当前用户
+        Integer userId = id;
+
+        if (StringUtils.isNotBlank(otherUserId)) {
+            /**校验otherUserId是否为当前登入用户的家属和业主**/
+            response=getTaFaceParentId( id, Integer.valueOf(otherUserId));
+            if ("1".equals(response.getCode())) {
+                return response;
+            }
+            userId = Integer.valueOf(otherUserId.trim());
+        }
+
+        TaUser user=taUserMapper.selectByPrimaryKey(userId);
         //系统验证码
         String  codes= (String) AppkeyCache.getCache(phone);
         //用户电话
         //当前小区下的电话校验
         TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
         if (null!=loginName)  {
-            response.addError("号码重复");
+            response.addError("号码已占用");
             return response;
         }
-        if(null!=codes && codes.equals(code)){
+        String data=HKOpenApi.HKpersonPhone(user.getHkUserId(),user.getId(),user.getUserName(),phone);
+       try {
+             if (null == data) {
+            throw new RuntimeException("海康人脸推送失敗！");
+        }
+       }catch (Exception e){
+           e.printStackTrace();
+           log.error("海康修改电话失敗！ {}",e);
+           throw new RuntimeException("海康修改电话失敗！");
+       }
+        if(null!=codes && codes.equals(code)){;
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
-            taUser.setId(user.getId());
+            taUser.setId(userId);
             taUserMapper.updateLongName(taUser);
-             response.addSuccess("修改成功");
+            response.addSuccess("修改成功");
             AppkeyCache.setCache(user.getLoginName(),"null");
             return response;
         }else {
             response.addError("验证码错误或电话号码错误");
             return response;
         }
+    }
 
-
-
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserId){
+        ResponseBean  responseBean= new ResponseBean();
+        TaUser  users= taUserMapper.selectByPrimaryKey(otherUserId);
+        if (null == users || !userId.equals(users.getParentId())){
+            responseBean.addError("您输入的家属或租户ID有误");
+            return responseBean;
+        }
+        return responseBean;
     }
 
     @Override

文档/MYSQL/smartCommunity.pdm

 <o:ExtendedDependencySymbol Id="o5">
 <a:CreationDate>1539051658</a:CreationDate>
 <a:ModificationDate>1539071966</a:ModificationDate>
-<a:Rect>((-41635,35510), (-28436,40601))</a:Rect>
-<a:ListOfPoints>((-41235,40201),(-41235,36210),(-28836,36210))</a:ListOfPoints>
+<a:Rect>((-41635,35541), (-28057,40601))</a:Rect>
+<a:ListOfPoints>((-41235,40201),(-41235,36241),(-28457,36241))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o9">
 <a:CreationDate>1539051667</a:CreationDate>
 <a:ModificationDate>1539071966</a:ModificationDate>
-<a:Rect>((-35830,30440), (-28370,36040))</a:Rect>
-<a:ListOfPoints>((-35430,30840),(-35430,35340),(-28770,35340))</a:ListOfPoints>
+<a:Rect>((-36397,30251), (-27996,36113))</a:Rect>
+<a:ListOfPoints>((-35997,30651),(-35997,35413),(-28396,35413))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o12">
 <a:CreationDate>1539051707</a:CreationDate>
 <a:ModificationDate>1539071957</a:ModificationDate>
-<a:Rect>((-35230,43310), (-26456,50770))</a:Rect>
-<a:ListOfPoints>((-34830,43710),(-34830,50070),(-26856,50070))</a:ListOfPoints>
+<a:Rect>((-35230,43310), (-26066,50841))</a:Rect>
+<a:ListOfPoints>((-34830,43710),(-34830,50141),(-26466,50141))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o15">
 <a:CreationDate>1539065038</a:CreationDate>
 <a:ModificationDate>1539071957</a:ModificationDate>
-<a:Rect>((-41292,50870), (-26756,54462))</a:Rect>
-<a:ListOfPoints>((-40892,54062),(-40892,51570),(-27156,51570))</a:ListOfPoints>
+<a:Rect>((-41292,50870), (-26340,54462))</a:Rect>
+<a:ListOfPoints>((-40892,54062),(-40892,51570),(-26740,51570))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o18">
 <a:CreationDate>1539073099</a:CreationDate>
 <a:ModificationDate>1539073166</a:ModificationDate>
-<a:Rect>((58932,54411), (75089,60101))</a:Rect>
-<a:ListOfPoints>((59332,54811),(74389,54811),(74389,59701))</a:ListOfPoints>
+<a:Rect>((58932,54411), (75089,60288))</a:Rect>
+<a:ListOfPoints>((59332,54811),(74389,54811),(74389,59888))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o22">
 <a:CreationDate>1539073104</a:CreationDate>
 <a:ModificationDate>1539073169</a:ModificationDate>
-<a:Rect>((60280,35769), (76616,43970))</a:Rect>
-<a:ListOfPoints>((60680,36169),(75916,36169),(75916,43570))</a:ListOfPoints>
+<a:Rect>((59632,35769), (76616,44157))</a:Rect>
+<a:ListOfPoints>((60032,36169),(75916,36169),(75916,43757))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o26">
 <a:CreationDate>1539073108</a:CreationDate>
 <a:ModificationDate>1539073166</a:ModificationDate>
-<a:Rect>((52475,61550), (68991,66401))</a:Rect>
-<a:ListOfPoints>((52875,66001),(52875,62250),(68591,62250))</a:ListOfPoints>
+<a:Rect>((52475,61550), (69524,66401))</a:Rect>
+<a:ListOfPoints>((52875,66001),(52875,62250),(69124,62250))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o29">
 <a:CreationDate>1539073112</a:CreationDate>
 <a:ModificationDate>1539073169</a:ModificationDate>
-<a:Rect>((52347,45419), (70518,50972))</a:Rect>
-<a:ListOfPoints>((52747,50572),(52747,46119),(70118,46119))</a:ListOfPoints>
+<a:Rect>((52347,45419), (71051,50972))</a:Rect>
+<a:ListOfPoints>((52747,50572),(52747,46119),(70651,46119))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o31">
 <a:CreationDate>1539141182</a:CreationDate>
 <a:ModificationDate>1539588411</a:ModificationDate>
-<a:Rect>((27170,-3657), (71652,11471))</a:Rect>
-<a:ListOfPoints>((71252,11071),(46762,11071),(46762,-2957),(27570,-2957))</a:ListOfPoints>
+<a:Rect>((27812,-3679), (71652,11471))</a:Rect>
+<a:ListOfPoints>((71252,11071),(46762,11071),(46762,-2979),(28212,-2979))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o35">
 <a:CreationDate>1539141343</a:CreationDate>
 <a:ModificationDate>1539158836</a:ModificationDate>
-<a:Rect>((2962,-5424), (28742,3700))</a:Rect>
-<a:ListOfPoints>((3362,3300),(3362,-4724),(28342,-4724))</a:ListOfPoints>
+<a:Rect>((2962,-5310), (29311,3700))</a:Rect>
+<a:ListOfPoints>((3362,3300),(3362,-4610),(28911,-4610))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o38">
 <a:CreationDate>1539143631</a:CreationDate>
 <a:ModificationDate>1539143655</a:ModificationDate>
-<a:Rect>((40860,-8425), (61150,-2257))</a:Rect>
-<a:ListOfPoints>((60750,-8025),(60750,-2957),(41260,-2957))</a:ListOfPoints>
+<a:Rect>((40212,-8425), (61150,-2279))</a:Rect>
+<a:ListOfPoints>((60750,-8025),(60750,-2979),(40612,-2979))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o41">
 <a:CreationDate>1539151702</a:CreationDate>
 <a:ModificationDate>1539151826</a:ModificationDate>
-<a:Rect>((33900,-16299), (51459,-14899))</a:Rect>
-<a:ListOfPoints>((51059,-15599),(34300,-15599))</a:ListOfPoints>
+<a:Rect>((33936,-16303), (51459,-14903))</a:Rect>
+<a:ListOfPoints>((51059,-15603),(34336,-15603))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o44">
 <a:CreationDate>1539151705</a:CreationDate>
 <a:ModificationDate>1540265419</a:ModificationDate>
-<a:Rect>((8509,-17049), (28622,6535))</a:Rect>
-<a:ListOfPoints>((8909,6135),(19883,6135),(19883,-7738),(27922,-7738),(27922,-16649))</a:ListOfPoints>
+<a:Rect>((8509,-16978), (29259,6535))</a:Rect>
+<a:ListOfPoints>((8909,6135),(19883,6135),(19883,-7738),(28559,-7738),(28559,-16578))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o60">
 <a:CreationDate>1539222729</a:CreationDate>
 <a:ModificationDate>1540265419</a:ModificationDate>
-<a:Rect>((-11147,7821), (-5449,9221))</a:Rect>
-<a:ListOfPoints>((-5849,8521),(-10747,8521))</a:ListOfPoints>
+<a:Rect>((-11680,7772), (-5449,9172))</a:Rect>
+<a:ListOfPoints>((-5849,8472),(-11280,8472))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o63">
 <a:CreationDate>1539222732</a:CreationDate>
 <a:ModificationDate>1539243723</a:ModificationDate>
-<a:Rect>((-26436,6041), (-21943,7441))</a:Rect>
-<a:ListOfPoints>((-22343,6741),(-26036,6741))</a:ListOfPoints>
+<a:Rect>((-26436,6058), (-21410,7458))</a:Rect>
+<a:ListOfPoints>((-21810,6758),(-26036,6758))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <o:ExtendedDependencySymbol Id="o99">
 <a:CreationDate>1541398705</a:CreationDate>
 <a:ModificationDate>1541398762</a:ModificationDate>
-<a:Rect>((-29636,-4158), (-21720,-2758))</a:Rect>
-<a:ListOfPoints>((-29236,-3458),(-22120,-3458))</a:ListOfPoints>
+<a:Rect>((-30308,-4166), (-21072,-2766))</a:Rect>
+<a:ListOfPoints>((-29908,-3466),(-21472,-3466))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
 <a:CreationDate>1539050106</a:CreationDate>
 <a:ModificationDate>1539071938</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-47752,24061), (-35289,32760))</a:Rect>
+<a:Rect>((-47172,24399), (-35869,32422))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539050408</a:CreationDate>
 <a:ModificationDate>1539071966</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-29256,34771), (-19824,38969))</a:Rect>
+<a:Rect>((-28840,34870), (-20240,38870))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539050486</a:CreationDate>
 <a:ModificationDate>1539071957</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-27156,49471), (-17724,53669))</a:Rect>
+<a:Rect>((-26740,49570), (-18140,53570))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539051910</a:CreationDate>
 <a:ModificationDate>1539163569</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((19640,82219), (31235,88217))</a:Rect>
+<a:Rect>((20172,82444), (30703,87992))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539052628</a:CreationDate>
 <a:ModificationDate>1539163568</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-1088,80266), (13968,90764))</a:Rect>
+<a:Rect>((-370,80678), (13250,90352))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539072138</a:CreationDate>
 <a:ModificationDate>1539073165</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((46921,31370), (60680,40968))</a:Rect>
+<a:Rect>((47569,31745), (60032,40593))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539072161</a:CreationDate>
 <a:ModificationDate>1539073169</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((70118,43570), (81714,48668))</a:Rect>
+<a:Rect>((70651,43757), (81181,48481))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539072390</a:CreationDate>
 <a:ModificationDate>1539073166</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((68591,59701), (80187,64799))</a:Rect>
+<a:Rect>((69124,59888), (79654,64612))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539140734</a:CreationDate>
 <a:ModificationDate>1539143624</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((27502,-7138), (41260,660))</a:Rect>
+<a:Rect>((28150,-6838), (40612,360))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539143694</a:CreationDate>
 <a:ModificationDate>1539151826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((27802,-19168), (41560,-12270))</a:Rect>
+<a:Rect>((28450,-18906), (40912,-12532))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539222681</a:CreationDate>
 <a:ModificationDate>1539243723</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-22343,4652), (-10747,9750))</a:Rect>
+<a:Rect>((-21810,4839), (-11280,9563))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1539759734</a:CreationDate>
 <a:ModificationDate>1539759734</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-73048,46909), (-61018,53807))</a:Rect>
+<a:Rect>((-72492,47171), (-61574,53545))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1541397368</a:CreationDate>
 <a:ModificationDate>1541397370</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-22120,-8257), (-8361,1341))</a:Rect>
+<a:Rect>((-21472,-7882), (-9009,966))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
 <a:CreationDate>1541398568</a:CreationDate>
 <a:ModificationDate>1541398762</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-43428,-5909), (-29236,-1711))</a:Rect>
+<a:Rect>((-42756,-5809), (-29908,-1809))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>