提交

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

@@ -43,7 +43,7 @@ public class BaseController {
             throw new WisdomException("用户信息不能为空!");
         }
 
-        log.info("用户当前sessionId：{}", session.getId());
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userVO);
         UserElement userElement = new UserElement();
         BeanUtils.copyProperties(userVO,userElement);
         userElement.setLoginType(Constant.APP_LOGIN_TYPE);
@@ -57,8 +57,8 @@ public class BaseController {
      * @return
      */
     protected UserElement getUserElement(HttpSession session) {
-        log.info("用户当前sessionId：{}", session.getId());
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        log.info("用户当前sessionId：{}, 设置的用户信息: {}", session.getId(), userElement);
         if (null == userElement) {
             throw new WisdomException("用户 session 不存在！");
         }

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

@@ -55,6 +55,7 @@ public class IBuildingOwnerInfoController extends BaseController {
     @RequestMapping(value = "/building/has", method = RequestMethod.GET)
     @ApiOperation(value = "根据 小区、期、楼栋、单元、楼层、户号 （并校验这个用户，是否绑定了这个房产）", notes = "根据 小区、期、楼栋、单元、楼层、户号")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "communityId", value = "小区"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "phaseId", value = "期"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "buildingId", value = "楼栋"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "unitId", value = "单元"),
@@ -62,7 +63,8 @@ public class IBuildingOwnerInfoController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "roomNoId", value = "户号"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    public ResponseBean hasBuilding(@RequestParam(value = "phaseId", required = false) Integer phaseId,
+    public ResponseBean hasBuilding(@RequestParam(value = "communityId", required = false) Integer communityId,
+                                    @RequestParam(value = "phaseId", required = false) Integer phaseId,
                                    @RequestParam(value = "buildingId",required = false) Integer buildingId,
                                    @RequestParam(value = "unitId", required = false) Integer unitId,
                                    @RequestParam(value = "levelId", required = false) Integer levelId,
@@ -71,7 +73,7 @@ public class IBuildingOwnerInfoController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iBuildingOwnerInfo.hasBuild(userElement, phaseId, buildingId, unitId, levelId, roomNoId);
+        responseBean = iBuildingOwnerInfo.hasBuild(userElement, communityId ,phaseId, buildingId, unitId, levelId, roomNoId);
         return responseBean;
     }
 

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

@@ -47,7 +47,7 @@ public class UserController extends BaseController {
     public ResponseBean login(@RequestBody String parameter,
                               HttpSession session){
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"));
+        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),jsonObject.getString("code"), session);
         TaUserVO userVO = (TaUserVO) responseBean.getData();
         if (null != userVO) {
             setUserElement(userVO, session);

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

@@ -28,14 +28,12 @@ public class UserVerifyController extends BaseController {
     private TaUserVerifyServicel taUserVerifyServicel;
 
     @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
-    @ApiOperation(value = "获取当前 一个待审核或审核不通过房产", notes = "获取当前 一个待审核或审核不通过房产")
+    @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")
     })
     public ResponseBean getUserVerify(HttpSession session, @PathVariable("userVerifyId") Integer userVerifyId) {
-        UserElement userElement = getUserElement(session);
-        ResponseBean responseBean = taUserVerifyServicel.getToAuditNotApproved(userElement, userVerifyId);
+        ResponseBean responseBean = taUserVerifyServicel.getToAuditNotApproved(userVerifyId);
         return responseBean;
     }
 
@@ -43,7 +41,7 @@ public class UserVerifyController extends BaseController {
     @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
     })
     public ResponseBean addUserVerify(@RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();

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

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

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

@@ -63,6 +63,11 @@ public class TaUserVerify {
 
     private String communityAddress;
 
+    /**
+     * 审核结果的url
+     */
+    private String verifyUrl;
+
     public Integer getId() {
         return id;
     }
@@ -238,4 +243,12 @@ public class TaUserVerify {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public String getVerifyUrl() {
+        return verifyUrl;
+    }
+
+    public void setVerifyUrl(String verifyUrl) {
+        this.verifyUrl = verifyUrl;
+    }
 }

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

@@ -33,6 +33,6 @@ public interface IBuildingOwnerInfo {
      * @param roomNoId
      * @return
      */
-    ResponseBean hasBuild(UserElement userElement,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+    ResponseBean hasBuild(UserElement userElement, Integer communityId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 
 }

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

@@ -7,6 +7,7 @@ import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaUser;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpSession;
 import java.util.List;
 
 /**
@@ -33,9 +34,10 @@ public interface ITaUserService {
      *
      * @param loginName
      * @param code      验证码
+     * @param session
      * @return 用户对象
      */
-    ResponseBean login(String loginName, String code);
+    ResponseBean login(String loginName, String code, HttpSession session);
 
     /**
      * 注册用户
@@ -50,9 +52,10 @@ public interface ITaUserService {
      *
      * @param response
      * @param currentUser
+     * @param session
      * @return
      */
-    ResponseBean checkLogin(ResponseBean response, TaUser currentUser);
+    ResponseBean checkLogin(ResponseBean response, TaUser currentUser, HttpSession session);
 
     /**
      * 修改当前用户手机号

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

@@ -11,11 +11,10 @@ public interface TaUserVerifyServicel {
 
     /**
      * 获取当前 一个待审核或审核不通过房产 的数据
-     * @param userElement
      * @param userVerifyId
      * @return
      */
-    ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId);
+    ResponseBean getToAuditNotApproved(Integer userVerifyId);
 
     /**
      * 添加 一个审核房产

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

@@ -94,7 +94,7 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
     }
 
     @Override
-    public ResponseBean hasBuild(UserElement userElement,  Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+    public ResponseBean hasBuild(UserElement userElement, Integer communityId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
         // 1.检验该用户关联有没有这个 户号
         List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
@@ -106,7 +106,7 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
         Map<String,Object> result = Maps.newHashMap();
 
         // 2.检验这个户号是否关联了 户主
-        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
+        TaUserVerify ownerUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(communityId, phaseId, buildingId, unitId, levelId, roomNoId);
         if (null != ownerUserVerify) {
             TaUser user = taUserMapper.selectByPrimaryKey(ownerUserVerify.getUserId());
             result.put("ownerName",user.getUserName());
@@ -115,7 +115,7 @@ public class BuildingOwnerInfoImpl implements IBuildingOwnerInfo {
             return responseBean;
         }
 
-        responseBean.addError(UserVerifyEnum.NO_OWNER.getCode(),UserVerifyEnum.NO_OWNER.getMsg());
+        responseBean.addSuccess(UserVerifyEnum.NO_OWNER.getMsg(), result, null);
         return responseBean;
     }
 }

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

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -106,7 +107,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean login(String loginName, String code) {
+    public ResponseBean login(String loginName, String code, HttpSession session) {
         ResponseBean response = new ResponseBean();
 
         // 校验手机号和验证码
@@ -119,7 +120,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
         // 检验登录房产
-        checkLogin(response, currentUser);
+        checkLogin(response, currentUser, session);
 
         return response;
     }
@@ -173,7 +174,7 @@ public class TaUserServiceImpl implements ITaUserService {
      * @return
      */
     @Override
-    public ResponseBean checkLogin(ResponseBean response, TaUser currentUser) {
+    public ResponseBean checkLogin(ResponseBean response, TaUser currentUser, HttpSession session) {
         // 校验用户
         checkBlacklistStatusUser(currentUser);
 
@@ -193,7 +194,11 @@ public class TaUserServiceImpl implements ITaUserService {
         List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectByUserId(currentUser.getId());
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()));
+            String token = null;
+            if (null != session) {
+                token = session.getId();
+            }
+            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token);
             return response;
         }
 
@@ -208,7 +213,11 @@ public class TaUserServiceImpl implements ITaUserService {
 
             return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
-            response.addError(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
+            taUserVerifies.forEach(e->{
+                e.setVerifyUrl(loginCodePerproties.getLoginCode().get("-1") + e.getId());
+            });
+            taUserVO.setUserVerifyList(taUserVerifies);
+            response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode()));
             return response;
         }
 
@@ -1045,7 +1054,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
         String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
                 "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
-        responseBean.addError(UserVerifyEnum.getMsg(resultCode), taUserVO, loginCodePerproties.getLoginCode().get(resultCode));
+        responseBean.addError(UserVerifyEnum.getMsg(resultCode), taUserVO, loginCodePerproties.getLoginCode().get("-1") + taUserVO.getUserVerifyId());
         return responseBean;
     }
 

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

@@ -81,7 +81,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     private TpRoomNoMapper tpRoomNoMapper;
 
     @Override
-    public ResponseBean getToAuditNotApproved(UserElement userElement, Integer userVerifyId) {
+    public ResponseBean getToAuditNotApproved(Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
@@ -125,8 +125,8 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         TpLevel level = tpLevelMapper.selectByPrimaryKey(taUserVerify.getLevelId());
         TpRoomNo roomNo = tpRoomNoMapper.selectByPrimaryKey(taUserVerify.getRoomNoId());
 
+
         taUserVerify.setRoleId(sysRole.getId());
-        taUserVerify.setCommunityId(userElement.getCommunityId());
         taUserVerify.setUserId(userElement.getId());
         taUserVerify.setVerifyStatus("0");
         taUserVerify.setCreateDate(new Date());

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

@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.Date;
 import java.util.Map;
 
@@ -72,11 +74,13 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			result.put("userInfo", userInfo);
 			result.put("openid", openId);
 
-			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()));
+			JSONObject userInfoJSON = JSONObject.parseObject(userInfo);
+			String wxPar = "&openid=" + openId + "&nickname=" + userInfoJSON.getString("nickname");
+			responseBean.addError(UserVerifyEnum.NO_ACCOUNT.getMsg(), result, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_ACCOUNT.getCode()) + URLEncoder.encode(wxPar));
 			return responseBean;
 		}
 
-		responseBean = iTaUserService.checkLogin(responseBean, taUser);
+		responseBean = iTaUserService.checkLogin(responseBean, taUser, null);
 
 		return responseBean;
 	}
@@ -103,6 +107,10 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		// 检验微信绑定
 		responseBean = checkWX(responseBean, user, parameter);
 
+		// 检验登录房产
+		responseBean = iTaUserService.checkLogin(responseBean, user, null);
+
+
 		return responseBean;
 	}
 
@@ -131,21 +139,14 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 			responseBean.addError("openid 参数缺失！");
 			return responseBean;
 		}
-		JSONObject userInfoJSON = jsonObject.getJSONObject("userInfo");
-		if (null == userInfoJSON) {
-			responseBean.addError("openid 参数缺失！");
-			return responseBean;
-		}
 
 		user.setOpenid(openid);
-		user.setNickname(userInfoJSON.getString("nickname"));
+		user.setNickname(jsonObject.getString("nickname"));
 
 		// 更新用户信息
 		taUserMapper.updateByPrimaryKeySelective(user);
 
-		// 检验登录房产
-		responseBean = iTaUserService.checkLogin(responseBean, user);
-
+		responseBean.addSuccess(user);
 		return responseBean;
 	}
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -1,9 +1,12 @@
 package com.community.huiju.vo;
 
+import com.community.huiju.model.TaUserVerify;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 用户数据
  * @author weiximei
@@ -90,4 +93,10 @@ public class TaUserVO {
 
     /** 是否绑定了微信 **/
     private Integer bindingWX;
+
+    /**
+     * 房产列表
+     */
+    private List<TaUserVerify> userVerifyList;
+
 }

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

@@ -32,11 +32,12 @@ welcome:
 # 登陆的状态跳转url配置
 login-code-perproties:
   login-code:
-    1000: /linkBuilding?from=index # 无关联房产
+    1000: linkBuilding?from=index # 无关联房产
     1001: index  # 关联一个审核通过的房产
-    1002: /linkBuildingState?from=index # 关联一个待审核房产
-    1003: /linkBuildingState?from=index # 关联一个审核未通过房产
-    1004:    # 有多个关联房产
+    1002: linkBuildingState?from=index&id= # 关联一个待审核房产
+    1003: linkBuildingState?from=index&id= # 关联一个审核未通过房产
+    1004: userCenter/landList?from=index   # 有多个关联房产
     1005:    # 该房产，暂无审核通过的业主！关联房产的时候，验证是否可以选择业主进行绑定
-    1006: /linkWeChat?from=index # 无关联账号!社交授权登录的时候
-    1007: /register?from=index # 未注册!社交授权登录 关联手机号账号未注册
+    1006: linkWeChat?from=index # 无关联账号!社交授权登录的时候
+    1007: register?from=index # 未注册!社交授权登录 关联手机号账号未注册
+    -1: linkBuildingState?from=index&id= # 审核结果的地址

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

@@ -243,11 +243,29 @@
       remark = #{remark,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="selectByUserId" resultMap="BaseResultMap" parameterType="integer">
+  <select id="selectByUserId" resultType="com.community.huiju.model.TaUserVerify" parameterType="integer">
     select
-    <include refid="Base_Column_List"/>
-    from ta_user_verify
-    where user_id = #{userId,jdbcType=INTEGER}
+    tuv.id as id,
+    tuv.user_id as userId,
+    tuv.community_id as communityId,
+    tuv.role_id as roleId,
+    tuv.phase_id as phaseId,
+    tuv.phase_name as phaseName,
+    tuv.building_id as buildingId,
+    tuv.building_name as buildingName,
+    tuv.unit_id as unitId,
+    tuv.unit_name as unitName,
+    tuv.level_id as levelId,
+    tuv.level_name as levelName,
+    tuv.room_no_id as roomNoId,
+    tuv.room_no_name as roomNoName,
+    tuv.verify_status as verifyStatus,
+    tuv.create_date as createDate,
+    tuv.verify_name as verifyName,
+    tuv.remark as remark,
+    (select community_name from to_communities where id=tuv.community_id) as communityName
+    from ta_user_verify tuv
+    where tuv.user_id = #{userId,jdbcType=INTEGER}
   </select>
   <select id="selectCommunityAndAddress" resultMap="BaseResultMap">
     select

CODE/smart-community/community-common/src/main/java/com/community/commom/session/UserElement.java

@@ -3,6 +3,7 @@ package com.community.commom.session;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import java.io.Serializable;
 
@@ -56,4 +57,22 @@ public class UserElement implements Serializable {
     /** 当前登录 户号id **/
     private Integer roomNoId;
 
+    @Override
+    public String toString() {
+        return "UserElement{" +
+                "id=" + id +
+                ", communityId=" + communityId +
+                ", userName='" + userName + '\'' +
+                ", loginName='" + loginName + '\'' +
+                ", email='" + email + '\'' +
+                ", status='" + status + '\'' +
+                ", loginType='" + loginType + '\'' +
+                ", userVerifyId=" + userVerifyId +
+                ", phaseId=" + phaseId +
+                ", buildingId=" + buildingId +
+                ", unitId=" + unitId +
+                ", levelId=" + levelId +
+                ", roomNoId=" + roomNoId +
+                '}';
+    }
 }

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/property-api/src/main/java/com/community/huiju/controller/TpConfigurationController.java

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备配置表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+public class TpConfigurationController extends BaseController {
+
+}

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

@@ -0,0 +1,52 @@
+package com.community.huiju.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TpEquipment;
+import com.community.huiju.service.ITpEquipmentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * <p>
+ * 设备表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "设备表", description = "设备表")
+public class TpEquipmentController extends BaseController {
+
+    @Autowired
+    private ITpEquipmentService iTpEquipmentService;
+
+    @RequestMapping(value = "/equipment", method = RequestMethod.GET)
+    @ApiOperation(value = "根据类型查询设备表", notes = "根据类型查询设备表")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "type", value = "1 监控 2 访客机 3 可是对讲"),
+        @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    public ResponseBean getAll(@RequestParam("type") Integer type, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTpEquipmentService.getAllByCommunityAndEquipmentType(userElement, type);
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备树 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@RestController
+@RequestMapping("/")
+public class TpEquipmentTreeController extends BaseController {
+
+}

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

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpConfiguration;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 设备配置表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpConfigurationMapper extends BaseMapper<TpConfiguration> {
+
+}

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

@@ -0,0 +1,42 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpEquipment;
+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;
+
+/**
+ * <p>
+ * 设备表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpEquipmentMapper extends BaseMapper<TpEquipment> {
+
+    /**
+     * 根据小区id 和 类型查询
+     * @param communityId
+     * @param equipmentType
+     * @return
+     */
+    @ResultType(TpEquipment.class)
+    @Select("select " +
+            "tm.*, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.url_id) as url, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_guard_tel_id) as securityGuardTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.security_room_tel_id) as securityRoomTel, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.address_id) as address, " +
+            "(select configuration_value FROM tp_configuration WHERE id = tm.uuid_id)as uuid " +
+            "FROM " +
+            "tp_equipment tm " +
+            "where tm.community_id = #{communityId} and tm.equipment_type = #{equipmentType}")
+    List<TpEquipment> selectAllByCommunityAndEquipmentType(@Param("communityId") Integer communityId, @Param("equipmentType") Integer equipmentType);
+
+}

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

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TpEquipmentTree;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 设备树 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Mapper
+public interface TpEquipmentTreeMapper extends BaseMapper<TpEquipmentTree> {
+
+}

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

@@ -0,0 +1,73 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 设备配置表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_configuration")
+public class TpConfiguration implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 配置key
+     */
+    private String key;
+
+    /**
+     * 配置项名称
+     */
+    private String configurationName;
+
+    /**
+     * 配置类型: 1字符串  2多列值
+     */
+    private Integer configurationType;
+
+    /**
+     * 配置值
+     */
+    private String configurationValue;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTiem;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+
+}

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

@@ -0,0 +1,123 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 设备表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_equipment")
+public class TpEquipment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备url地址，对应 配置tp_configuration 表id
+     */
+    private Integer urlId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 安保人员电话，对应 配置tp_configuration 表id
+     */
+    private Integer securityGuardTelId;
+
+    /**
+     * 保安室电话，对应 配置tp_configuration 表id
+     */
+    private Integer securityRoomTelId;
+
+    /**
+     * 设备地址，对应 配置tp_configuration 表id
+     */
+    private Integer addressId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+    /**
+     * 设备UUID ，对应 配置tp_configuration 表id
+     */
+    private Integer uuidId;
+    /**
+     * 设备类型，1 监控 2 访客机 3 可是对讲 (看字典表)
+     */
+    private String equipmentType;
+
+    /**
+     * 设备树id，对应 tp_equipment_tree 表id
+     */
+    private Integer equipmentTreeId;
+
+    // =======================
+
+    /**
+     * url
+     */
+    @TableField(exist = false)
+    private String url;
+
+    /**
+     * 安保人员电话
+     */
+    @TableField(exist = false)
+    private String securityGuardTel;
+
+    /**
+     * 安保室电话
+     */
+    @TableField(exist = false)
+    private String securityRoomTel;
+
+    /**
+     * 设备地址
+     */
+    @TableField(exist = false)
+    private String address;
+
+    /**
+     * UUID
+     */
+    @TableField(exist = false)
+    private String uuid;
+}

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

@@ -0,0 +1,68 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 设备树
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_equipment_tree")
+public class TpEquipmentTree implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 名称
+     */
+    private String equipmentName;
+
+    /**
+     * 父节点id
+     */
+    private Integer pid;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 修改人
+     */
+    private Integer updateUser;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpConfiguration;
+
+/**
+ * <p>
+ * 设备配置表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+public interface ITpConfigurationService extends IService<TpConfiguration> {
+
+}

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

@@ -0,0 +1,26 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.TpEquipment;
+
+/**
+ * <p>
+ * 设备表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-04-15
+ */
+public interface ITpEquipmentService extends IService<TpEquipment> {
+
+    /**
+     * 根据小区id 和 设备类型
+     * @param userElement
+     * @param equipmentType
+     * @return
+     */
+    ResponseBean getAllByCommunityAndEquipmentType(UserElement userElement, Integer equipmentType);
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TpEquipmentTree;
+
+/**
+ * <p>
+ * 设备树 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+public interface ITpEquipmentTreeService extends IService<TpEquipmentTree> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpConfigurationMapper;
+import com.community.huiju.model.TpConfiguration;
+import com.community.huiju.service.ITpConfigurationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Service
+public class TpConfigurationServiceImpl extends ServiceImpl<TpConfigurationMapper, TpConfiguration> implements ITpConfigurationService {
+
+}

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

@@ -0,0 +1,35 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TpEquipmentMapper;
+import com.community.huiju.model.TpEquipment;
+import com.community.huiju.service.ITpEquipmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Service
+public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEquipment> implements ITpEquipmentService {
+
+    @Autowired
+    private TpEquipmentMapper tpEquipmentMapper;
+
+    @Override
+    public ResponseBean getAllByCommunityAndEquipmentType(UserElement userElement, Integer equipmentType) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectAllByCommunityAndEquipmentType(userElement.getCommunityId(), equipmentType);
+        responseBean.addSuccess(tpEquipments);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TpEquipmentTreeMapper;
+import com.community.huiju.model.TpEquipmentTree;
+import com.community.huiju.service.ITpEquipmentTreeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备树 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-04-15
+ */
+@Service
+public class TpEquipmentTreeServiceImpl extends ServiceImpl<TpEquipmentTreeMapper, TpEquipmentTree> implements ITpEquipmentTreeService {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpConfigurationMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpEquipmentMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.dao.TpEquipmentTreeMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/equipment.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+export function getAll(data) {
+  return request({
+    url: '/equipment',
+    method: 'get',
+    params: {
+      type: data.type
+    }
+  })
+}
+

VUECODE/smart-property-manage/src/store/index.js

@@ -20,6 +20,7 @@ import tels from './modules/tels'
 import menu from './modules/menu'
 import message from './modules/message'
 import buildingTree from './modules/buildingTree'
+import equipment from './modules/equipment'
 
 Vue.use(Vuex)
 
@@ -43,7 +44,8 @@ const store = new Vuex.Store({
     tels,
     menu,
     message,
-    buildingTree
+    buildingTree,
+    equipment
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/equipment.js

@@ -0,0 +1,24 @@
+import { getAll } from '@/api/equipment'
+
+const equipment = {
+  state: {
+
+  },
+  mutations: {
+
+  },
+  actions: {
+    EquipmentGetAll({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        getAll(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default equipment
+

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -116,6 +116,33 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="工区监控" name="monitoring">
+        <span style="display: flex; justify-content: center;">可配置项</span>
+        <div style="display: flex; justify-content: center; flex-wrap: wrap;">
+          <el-form v-for="(item, index) in equipmentList" ref="monitoringForm" label-width="120px" style="margin-top: 20px;">
+            <div>
+              <el-form-item label="编号">
+                <span>{{ item.id }}</span>
+              </el-form-item>
+              <el-form-item label="视频流地址">
+                <el-input :value="item.url" :disabled="true" name="name"/>
+              </el-form-item>
+              <el-form-item label="地址">
+                <el-input :value="item.address" :disabled="true" name="address"/>
+              </el-form-item>
+              <el-form-item label="安保人员电话">
+                <el-input :value="item.securityGuardTel" :disabled="true" name="phone"/>
+              </el-form-item>
+              <el-form-item label="保安室电话">
+                <el-input :value="item.securityRoomTel" :disabled="true" name="phone-2"/>
+              </el-form-item>
+            </div>
+            <el-form-item>
+              <el-button type="primary" @click="monitoringSubmit(item.id, index)" >确认</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -132,6 +159,9 @@ export default {
         remark: '',
         pageNum: 1,
         pageSize: 100
+      },
+      monitoring: { // 监控数据
+
       },
       indexData: [], // APP端菜单列表数据
       propertyList: [], // 物业数据列表
@@ -139,7 +169,9 @@ export default {
       announcementBannerNum: 0, // banner数量
       activityBannerNum: 0, // 活动banner数量
       announcementBannerBool: false, // 是否显示公告的保存按钮
-      activityBannerNumBool: false // 是否显示活动的保存按钮
+      activityBannerNumBool: false, // 是否显示活动的保存按钮
+      equipmentList: [] // 处理过后的监控数据
+      // equipmentRequestList: [] // 监控数据，后台获取的
     }
   },
   mounted() {
@@ -169,6 +201,13 @@ export default {
       if (tabName === 'property') {
         this.getPropertyData()
       }
+      if (tabName === 'monitoring') {
+        // 监控
+        this.equipmentGetAll()
+      }
+    },
+    monitoringSubmit(id, index) { // 监控提交
+      console.log('monitoringForm : ', this.$refs.monitoringForm)
     },
     onSubmit() {
       this.getPropertyData()
@@ -301,6 +340,14 @@ export default {
       }).catch(() => {
         console.log('error CarouselGetBanner')
       })
+    },
+    equipmentGetAll() {
+      const eqData = { type: 1 }
+      this.$store.dispatch('EquipmentGetAll', eqData).then((res) => {
+        this.equipmentList = res.data
+      }).catch(() => {
+        console.log('EquipmentGetAll error')
+      })
     }
   }
 }