合并

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

@@ -322,7 +322,7 @@ public class HKOpenApi {
         parMap.put("personIds",personIds);
         parMap.put("doorGroupUuids","");
         // TODO 目前写死
-        parMap.put("doorUuids","efcb9a3fe4e64e2f9c0f546c54465524,94bac7e217fb4a698ad086876d347c6a,369b49476a364f87b1c50e99435ecca8,22d8a043cd3f41c5bf1bd976ab5ee65d,111013a57112473a9dfe0d6cd15e2745");
+        parMap.put("doorUuids","91b8ce635b634d468cde925af6e4274c,d40b23e316364bb5a276b99bb6327181,7f866e918ab8452f9eb1d8a25e481530,8b8256fc605d428c9dc797451e3dc432,84d619c5e84942f68047f0bca93fc041");
         String params =  JSON.toJSONString(parMap);
         log.info("根据人员ID集添加权限请求参数：{}", params);
         String data = null;
@@ -351,7 +351,7 @@ public class HKOpenApi {
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
         // TODO 目前写死
-        parMap.put("deviceUuids","dfd80b22f00545b8b36fa981019df83c,d60ba7a952a94da5ba6daaa2cd62ec20,c8cbac0b4a514ad0921a3f12a542f2d3,c8cbac0b4a514ad0921a3f12a542f2d3,765532274ae84f9bb495d801444a7f1e");
+        parMap.put("deviceUuids","fe471fe7c95f408a9e41e029dc0687cf,fe471fe7c95f408a9e41e029dc0687cf,992f53f2c87b4d2a87cf517e7b57366f,a792802b88f749c9b4c6fbf8a610111e,3bff3477889c4b3c983871ea46b66605");
         String params =  JSON.toJSONString(parMap);
         log.info("根据设备UUID集异动下载门禁权限请求参数：{}", params);
         String data = null;
@@ -447,7 +447,7 @@ public class HKOpenApi {
         parMap.put("time", System.currentTimeMillis());
         parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
         // TODO 目前写死的
-        parMap.put("deviceUuids","d60ba7a952a94da5ba6daaa2cd62ec20,dfd80b22f00545b8b36fa981019df83c,765532274ae84f9bb495d801444a7f1e");
+        parMap.put("deviceUuids","992f53f2c87b4d2a87cf517e7b57366f,a792802b88f749c9b4c6fbf8a610111e,3bff3477889c4b3c983871ea46b66605");
         parMap.put("personIds",personIds);
         parMap.put("type",1);
         String params =  JSON.toJSONString(parMap);
@@ -953,13 +953,7 @@ public class HKOpenApi {
 
     public static void main(String[] args) {
         // getDefaultUserUuid();
-        String nickname = null;
-        try {
-            nickname = new String("æ\u009D¨é¡º".getBytes("ISO-8859-1"), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        System.out.println(nickname);
+        downloadFaceAndFingerInfos("2227");
     }
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/LoginCodePerproties.java

@@ -19,13 +19,14 @@ import java.util.Map;
 @NoArgsConstructor
 public class LoginCodePerproties {
 
+    /**
+     * 状态url集合
+     */
     private Map<String, String> loginCode;
 
-    public Map<String, String> getLoginCode() {
-        return loginCode;
-    }
+    /**
+     * app 请求地址
+     */
+    private String appUrl;
 
-    public void setLoginCode(Map<String, String> loginCode) {
-        this.loginCode = loginCode;
-    }
 }

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

@@ -55,7 +55,7 @@ public class WxLoginController extends BaseController {
 	@RequestMapping(value = "/wx/associated", method = RequestMethod.POST)
 	@ApiOperation(value = "手机号和验证码 关联微信账号", notes = "手机号和验证码 关联微信账号")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;openid微信标识;nickname微信用户名称")
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
 	})
 	public ResponseBean associatedWX(@RequestBody String parameter, HttpSession session) {
 		ResponseBean responseBean = new ResponseBean();
@@ -69,7 +69,7 @@ public class WxLoginController extends BaseController {
 
 	@ApiOperation(value = "注册", notes = "注册")
 	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码;openid微信标识;nickname微信用户名称")
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户姓名;idCard身份证;gender性别(1：男  2：女);loginName手机号;code验证码;openid微信标识;nickname微信用户名称;headimgurl微信头像")
 	})
 	@RequestMapping(value = "/wx/register",method = RequestMethod.POST)
 	public ResponseBean register(@RequestBody String parameter, HttpServletRequest request ,HttpSession session) {

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

@@ -67,4 +67,13 @@ public interface TpBuildingOwnerInfoMapper {
                                                           @Param("buildingId") Integer buildingId, @Param("unitId") Integer unitId,
                                                           @Param("levelId") Integer levelId, @Param("roomNoId") Integer roomNoId,
                                                           @Param("phone") String phone);
+
+    /**
+     * 根据 审核id 查询楼栋资料信息
+     * @param userVerifyId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_building_owner_info where ta_user_verify_id = #{userVerifyId}")
+    TpBuildingOwnerInfo selectByUserVerifyId(@Param("userVerifyId") Integer userVerifyId);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
 import com.community.commom.utils.DateUtils;
+import com.community.huiju.common.perproties.LoginCodePerproties;
 import com.community.huiju.dao.ToBannerMapper;
 import com.community.huiju.dao.TpCarouselSettingMapper;
 import com.community.huiju.model.ToBanner;
@@ -25,6 +26,9 @@ public class BannerServiceImpl implements BannerServiceI {
     @Autowired
     private TpCarouselSettingMapper tpCarouselSettingMapper;
 
+    @Autowired
+    private LoginCodePerproties loginCodePerproties;
+
     @Override
     public ToBanner viewBannerImg(Integer bannerId) {
         return toBannerMapper.selectByCommunityId(bannerId);
@@ -39,7 +43,7 @@ public class BannerServiceImpl implements BannerServiceI {
         List<ToBanner> bannersList = toBannerMapper.selectAllByNum(nowTime, bannerNum, bannerPosition, communityId);
         bannersList.stream().forEach(banner -> {
             if (banner.getBannerType().equals(Constant.BANNER_TYPE_ARTICLE)){
-                banner.setExternalLink("http://101.132.102.231:8011/#/bannerDetail?from=index&id="+banner.getId());
+                banner.setExternalLink(loginCodePerproties.getAppUrl() + "bannerDetail?from=index&id="+banner.getId());
             }
         });
         return bannersList;

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

@@ -249,6 +249,10 @@ public class FaceServicelimpl implements FaceServiceI {
         ResponseBean response = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if (null == userVerify) {
+            response.addError("当前房产审核记录不存在！");
+            return response;
+        }
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
 
         //身份为家属租客，状态为已停用
@@ -261,11 +265,9 @@ public class FaceServicelimpl implements FaceServiceI {
         TaFace face = taFaceMapper.getByUserVerifyId(userVerifyId);
         if (null == face) {
             boolean isA = true;
-            if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus()) && "1".equals(taUser.getVerifyStatus())) {
+            if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
                 ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid);
                 if (responseBean.getCode().equals("0")) {
-                    taUser.setFaceStatus("1");
-                    taUserMapper.updateByPrimaryKeySelective(taUser);
                     responseBean.addSuccess("图片录入成功");
                 } else {
                     responseBean.addError(responseBean.getMessage());

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

@@ -895,17 +895,15 @@ public class TaUserServiceImpl implements ITaUserService {
          * 获取 业主的信息，只能根据 审核表，获取 楼栋信息，来查询出当前房产的 业主是谁
          */
 
-        // TODO 楼栋资料库查询有变动
-        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(user.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
-
-        if (null != tpBuildingOwnerInfo) {
-            //查询当前人业主或租客的信息
-            Map<String, Object> map = Maps.newHashMap();
-            map.put("loginName", tpBuildingOwnerInfo.getOwnerTel());
-            TaUser proprietorUser = taUserMapper.selectByLoginName(map);
-            userVO.setProprietorID(proprietorUser.getId());
-            userVO.setProprietorPhone(proprietorUser.getLoginName());
-            userVO.setProprietorName(proprietorUser.getUserName());
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(user.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(), userVerify.getLevelId(), userVerify.getRoomNoId());
+        // 存在这个房产没有业主的情况
+        if (null != ownerUserVerify) {
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByUserVerifyId(ownerUserVerify.getId());
+            if (null != tpBuildingOwnerInfo) {
+                userVO.setProprietorID(ownerUserVerify.getUserId());
+                userVO.setProprietorPhone(tpBuildingOwnerInfo.getOwnerTel());
+                userVO.setProprietorName(tpBuildingOwnerInfo.getOwnerName());
+            }
         }
 
         return userVO;
@@ -1007,7 +1005,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
             // 人脸是否已录入
             TaFace face = taFaceMapper.getByUserVerifyId(userVerify.getId());
-            if (null == face) {
+            if (null != face) {
                 taUserVO.setFace("register");
             } else {
                 taUserVO.setFace("unregister");

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

@@ -75,7 +75,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			result.put("openid", openId);
 
 			JSONObject userInfoJSON = JSONObject.parseObject(userInfo);
-			String wxPar = "&openid=" + URLEncoder.encode(openId) + "&nickname=" + URLEncoder.encode(userInfoJSON.getString("nickname"));
+			String wxPar = "&openid=" + URLEncoder.encode(openId) + "&nickname=" + URLEncoder.encode(userInfoJSON.getString("nickname")) + "&headimgurl=" + URLEncoder.encode(userInfoJSON.getString("headimgurl"));
 			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()) + wxPar);
 			return responseBean;
 		}
@@ -120,6 +120,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public ResponseBean associatedWX(String parameter) {
 		ResponseBean responseBean = new ResponseBean();
 
@@ -181,6 +182,13 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			e.printStackTrace();
 		}
 
+		// 微信头像
+		String headimgurl = jsonObject.getString("headimgurl");
+		// 用户头像为空的时候，并且微信头像不为空的时候，就把微信头像设置为用户头像
+		if (StringUtils.isBlank(user.getHeadPortrait()) && StringUtils.isNotBlank(headimgurl)) {
+			user.setHeadPortrait(headimgurl);
+		}
+
 		user.setOpenid(openid);
 		user.setNickname(nickname);
 
@@ -263,6 +271,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		ResponseBean responseBean = new ResponseBean();
 		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
 		taUser.setOpenid("");
+		taUser.setNickname("");
 		taUserMapper.updateByPrimaryKeySelective(taUser);
 
 		responseBean.addSuccess("操作成功！");
@@ -270,6 +279,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public ResponseBean bundlingWX(UserElement userElement, String wxcode) {
 		ResponseBean responseBean = new ResponseBean();
 
@@ -280,12 +290,18 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		String userInfo = getWXuserInfo(codeResponse.getAccessToken(), openId);
 		JSONObject userInfoJSON = JSONObject.parseObject(userInfo);
 		String nickname = userInfoJSON.getString("nickname");
+		// 微信头像
+		String headimgurl = userInfoJSON.getString("headimgurl");
 		try {
 			nickname = new String(nickname.getBytes("ISO-8859-1"), "UTF-8");
 		} catch (UnsupportedEncodingException e) {
 			e.printStackTrace();
 		}
 		TaUser taUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+		// 当用户头像为空的时候，并且微信头像不为空的时候，就把微信头像设置为用户头像
+		if (StringUtils.isBlank(taUser.getHeadPortrait()) && StringUtils.isNotBlank(headimgurl)) {
+			taUser.setHeadPortrait(headimgurl);
+		}
 		taUser.setOpenid(openId);
 		taUser.setNickname(nickname);
 		taUserMapper.updateByPrimaryKeySelective(taUser);

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -31,6 +31,7 @@ welcome:
 
 # 登陆的状态跳转url配置
 login-code-perproties:
+  app-url: http://106.14.20.193:8011/#/
   login-code:
     1000: linkBuilding?from=index # 无关联房产
     1001: index  # 关联一个审核通过的房产

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

@@ -604,14 +604,25 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
 				tpPhase.setCommunityId(communityId);
 				tpPhase.setCreateDate(LocalDateTime.now());
-				tpPhaseMapper.insert(tpPhase);
-				//重置Last
-				lastPhaseName = tpBuildingOwnerInfo.getPhaseName();
-				lastBuildingName = "";
-				lastUnitName = "";
-				lastLevelName = "";
-				lastRoomNoName = "";
-				lastPhaseId = tpPhase.getId();
+
+				QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
+				phaseQueryWrapper.eq("community_id", communityId);
+				phaseQueryWrapper.eq("`NAME`", tpBuildingOwnerInfo.getPhaseName());
+				TpPhase selectOne = tpPhaseMapper.selectOne(phaseQueryWrapper);
+				// 判断是否存在库里
+				if (null != selectOne) {
+					lastPhaseName = selectOne.getName();
+					lastPhaseId = selectOne.getId();
+				} else {
+					tpPhaseMapper.insert(tpPhase);
+					//重置Last
+					lastPhaseName = tpBuildingOwnerInfo.getPhaseName();
+					lastBuildingName = "";
+					lastUnitName = "";
+					lastLevelName = "";
+					lastRoomNoName = "";
+					lastPhaseId = tpPhase.getId();
+				}
 			}
 			//插入楼栋数据
 			if (!tpBuildingOwnerInfo.getBuildingName().equals(lastBuildingName)){
@@ -621,9 +632,20 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuilding.setPhaseName(lastPhaseName);
 				tpBuilding.setName(tpBuildingOwnerInfo.getBuildingName());
 				tpBuilding.setCreateDate(LocalDateTime.now());
-				tpBuildingMapper.insert(tpBuilding);
-				lastBuildingName = tpBuildingOwnerInfo.getBuildingName();
-				lastBuildingId = tpBuilding.getId();
+
+				QueryWrapper<TpBuilding> buildingQueryWrapper = new QueryWrapper<>();
+				buildingQueryWrapper.eq("community_id", communityId);
+				buildingQueryWrapper.eq("phase_id", lastPhaseId);
+				buildingQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getBuildingName());
+				TpBuilding selectOne = tpBuildingMapper.selectOne(buildingQueryWrapper);
+				if (null != selectOne) {
+					lastBuildingName = selectOne.getName();
+					lastBuildingId = selectOne.getId();
+				} else {
+					tpBuildingMapper.insert(tpBuilding);
+					lastBuildingName = tpBuildingOwnerInfo.getBuildingName();
+					lastBuildingId = tpBuilding.getId();
+				}
 			}
 			//插入单元信息
 			if (!tpBuildingOwnerInfo.getUnitName().equals(lastUnitName)){
@@ -635,9 +657,22 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpUnit.setBuildingName(lastBuildingName);
 				tpUnit.setName(tpBuildingOwnerInfo.getUnitName());
 				tpUnit.setCreateDate(LocalDateTime.now());
-				tpUnitMapper.insert(tpUnit);
-				lastUnitName = tpBuildingOwnerInfo.getUnitName();
-				lastUnitId = tpUnit.getId();
+
+				QueryWrapper<TpUnit> unitQueryWrapper = new QueryWrapper<>();
+				unitQueryWrapper.eq("community_id", communityId);
+				unitQueryWrapper.eq("phase_id", lastPhaseId);
+				unitQueryWrapper.eq("building_id", lastBuildingId);
+				unitQueryWrapper.eq("`name`",tpBuildingOwnerInfo.getUnitName());
+				TpUnit selectOne = tpUnitMapper.selectOne(unitQueryWrapper);
+				// 校验是否存在库里
+				if (null != selectOne) {
+					lastUnitName = selectOne.getName();
+					lastUnitId = selectOne.getId();
+				} else {
+					tpUnitMapper.insert(tpUnit);
+					lastUnitName = tpBuildingOwnerInfo.getUnitName();
+					lastUnitId = tpUnit.getId();
+				}
 			}
 			//插入楼层信息
 			if (!tpBuildingOwnerInfo.getLevelName().equals(lastLevelName)){
@@ -651,9 +686,23 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpLevel.setUnitName(lastUnitName);
 				tpLevel.setName(tpBuildingOwnerInfo.getLevelName());
 				tpLevel.setCreateDate(LocalDateTime.now());
-				tpLevelMapper.insert(tpLevel);
-				lastLevelName = tpBuildingOwnerInfo.getLevelName();
-				lastLevelId = tpLevel.getId();
+
+				QueryWrapper<TpLevel> levelQueryWrapper = new QueryWrapper<>();
+				levelQueryWrapper.eq("community_id", communityId);
+				levelQueryWrapper.eq("phase_id", lastPhaseId);
+				levelQueryWrapper.eq("building_id", lastBuildingId);
+				levelQueryWrapper.eq("unit_id", lastUnitId);
+				levelQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getLevelName());
+				TpLevel selectOne = tpLevelMapper.selectOne(levelQueryWrapper);
+				// 校验是否存在库里
+				if (null != selectOne) {
+					lastLevelName = selectOne.getName();
+					lastLevelId = selectOne.getId();
+				} else {
+					tpLevelMapper.insert(tpLevel);
+					lastLevelName = tpBuildingOwnerInfo.getLevelName();
+					lastLevelId = tpLevel.getId();
+				}
 			}
 			//插入房间号信息
 			if (!tpBuildingOwnerInfo.getRoomNoName().equals(lastRoomNoName)){
@@ -669,7 +718,18 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpRoomNo.setLevelName(lastLevelName);
 				tpRoomNo.setName(tpBuildingOwnerInfo.getRoomNoName());
 				tpRoomNo.setCreateDate(LocalDateTime.now());
-				tpRoomNoMapper.insert(tpRoomNo);
+
+				QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
+				roomNoQueryWrapper.eq("community_id", communityId);
+				roomNoQueryWrapper.eq("phase_id", lastPhaseId);
+				roomNoQueryWrapper.eq("building_id", lastBuildingId);
+				roomNoQueryWrapper.eq("unit_id", lastUnitId);
+				roomNoQueryWrapper.eq("level_id", lastLevelId);
+				roomNoQueryWrapper.eq("`name`", tpBuildingOwnerInfo.getRoomNoName());
+				TpRoomNo selectOne = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
+				if (null == selectOne) {
+					tpRoomNoMapper.insert(tpRoomNo);
+				}
 			}
 		}
 	}

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

@@ -115,6 +115,12 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
 
+        // 推送海康
+        ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+        if (!"0".equals(pushHKPerson.getCode())) {
+            throw new WisdomException("设备推送失败！");
+        }
+
         String[] messageArr= new messagePush().messagePushAll( );
         for (String count : messageArr) {
             Message message = new Message();