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

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

@@ -1,7 +1,11 @@
 package com.community.huiju;
 
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson.support.config.FastJsonConfig;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
@@ -22,4 +26,16 @@ public class AppApplication {
 	public RestTemplate restTemplate(){
 		return new RestTemplate();
 	}
+
+	@Bean
+	public HttpMessageConverters fastJsonConfigure(){
+		FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+		FastJsonConfig fastJsonConfig = new FastJsonConfig();
+		fastJsonConfig.setSerializerFeatures(SerializerFeature.PrettyFormat);
+		//日期格式化
+		//fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
+		converter.setFastJsonConfig(fastJsonConfig);
+		return new HttpMessageConverters(converter);
+	}
+
 }

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

@@ -180,5 +180,31 @@ class OpenapiTest {
         
         return data;
 	}
-	
+
+
+
+	/**
+	 * HTTPS方式
+	 * 分页获取监控点信息 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetDoorEventsHistory() throws Exception{
+		String url = OPENAPI_IP_PORT_HTTPS + "/openapi/service/acs/event/getDoorEventsHistory";
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("appkey", APPKEY);//设置APPKEY
+		map.put("time", System.currentTimeMillis());//设置时间参数
+		map.put("pageNo", 1);//设置分页参数
+		map.put("pageSize", 5);//设置分页参数
+		map.put("opUserUuid", OP_USER_UUID);//设置操作用户UUID
+		String params = JSON.toJSONString(map);
+		System.out.println(" ====== getCameras请求参数：【" + params + "】");
+		String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+		System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
+
+		return data;
+	}
+
+
+
 }

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

@@ -302,27 +302,29 @@ public class SocialController extends BaseController {
     @ApiOperation(value = "修改二手租赁帖子", notes = "修改二手租赁帖子")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:帖子id，imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+                    "imageUrl:图片url,transactionTitle:小区标题，transactionContent：小区内容"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/updateTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean ubdateTransaction(HttpSession session, @RequestBody String paramets) {
+    @RequestMapping(value = "/updateTransaction/{id}", method = RequestMethod.PUT)
+    public ResponseBean ubdateTransaction(HttpSession session,@PathVariable("id") String id, @RequestBody String paramets) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.updateTransaction(paramets, userId);
+        ResponseBean response = socialServiceI.updateTransaction(paramets,userId,Integer.valueOf(id));
         return response;
     }
 
     @ApiOperation(value = "删除二手租赁帖子", notes = "删除二手租赁帖子")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "id:帖子id"),
+            @ApiImplicitParam(paramType = "path", dataType = "String", name = "id", value = "id:帖子id"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/deleteTransaction/{Id}", method = RequestMethod.PUT)
-    public ResponseBean deleteTransaction(HttpSession session, @RequestBody String paramets) {
-        ResponseBean response = socialServiceI.deleteransaction(paramets);
+    @RequestMapping(value = "/deleteTransaction/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteTransaction(HttpSession session, @PathVariable("id") String id) {
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        Integer userId = userElement.getId();
+        ResponseBean response = socialServiceI.deleteransaction(Integer.valueOf(id),userId);
         return response;
     }
 

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

@@ -210,6 +210,8 @@ public class UserController extends BaseController {
         Integer id =  userElement.getId();
 
         response = iTaUserService.getUserInfo(id,userId);
+        TaUserVO userVO = (TaUserVO) response.getData();
+        userVO.setToken(session.getId());
 
         return response;
 

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

@@ -110,7 +110,7 @@ public interface SocialServiceI {
 	/**
 	 * 修改当前帖子
 	 */
-	ResponseBean updateTransaction(String paramets,Integer userId);
+	ResponseBean updateTransaction(String paramets,Integer userId,Integer id);
 
 	/**
 	 * 评价工单以及评分
@@ -138,8 +138,8 @@ public interface SocialServiceI {
 
 	/**
 	 * 删除二手租赁帖子
- 	 * @param paramets
+ 	 * @param id
 	 * @return
 	 */
-	ResponseBean deleteransaction(String paramets);
+	ResponseBean deleteransaction(Integer id,Integer userid);
 }

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

@@ -11,6 +11,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -383,35 +384,41 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTransaction(String paramets,Integer userId) {
+    public ResponseBean updateTransaction(String paramets,Integer userId,Integer id) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String id = (String) jsonObject.get("id");
-        String transactionTitle = (String) jsonObject.get("transactionTitle");
-        String transactionContent = (String) jsonObject.get("transactionContent");
         String imageUrl = (String) jsonObject.get("imageUrl");
-        TpTransaction tpTransaction = JSONObject.parseObject(paramets,TpTransaction.class);
 
-        tdImagesMapper.deleteTdImages( Integer.valueOf(id),Constant.TRANSACTION);
-        try {
-            insertTdImage(tpTransaction, imageUrl, userId,Constant.TRANSACTION);
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new RuntimeException("图片修改异常");
+        TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
+        TpTransaction transaction = tpTransactionMapper.getById(id);
+        transaction.setTransactionTitle(tpTransaction.getTransactionTitle());
+        transaction.setTransactionContent(tpTransaction.getTransactionContent());
+
+
+        if (null != transaction && userId.equals(transaction.getTaUserId())) {
+            tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
+            try {
+                insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
+            } catch (IOException e) {
+                e.printStackTrace();
+                throw new RuntimeException("图片修改异常");
+            }
+            tpTransactionMapper.updateTransaction(Integer.valueOf(id), transaction.getTransactionTitle(), transaction.getTransactionContent(), userId);
+            response.addSuccess("修改成功");
+            return response;
+
         }
-        tpTransactionMapper.updateTransaction(Integer.valueOf(id),transactionTitle,transactionContent,userId);
-        response.addSuccess("修改成功");
+        response.addError("操作失败");
         return response;
     }
 
     @Override
-    public ResponseBean deleteransaction(String paramets) {
+    public ResponseBean deleteransaction(Integer id,Integer userId) {
         ResponseBean responseBean= new ResponseBean();
-        JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String id = (String) jsonObject.get("id");
         TpTransaction tpTransaction=tpTransactionMapper.getById(Integer.valueOf(id));
-        if(null!= tpTransaction) {
+        if(null!= tpTransaction && userId.equals(tpTransaction.getTaUserId())) {
             tpTransaction.setStatus("0");
+            tpTransaction.setUpdateDate(new Date());
             tpTransactionMapper.updateByPrimaryKeySelective(tpTransaction);
             responseBean.addSuccess("删除成功");
         }else {

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

@@ -214,6 +214,7 @@
     <include refid="Base_Column_List" />
     from tp_ticket
       <trim prefix="where" prefixOverrides="and">
+        and status = 1
         <if test="communityId != null" >
           and community_id = #{communityId,jdbcType=INTEGER}
         </if>
@@ -246,5 +247,6 @@
     WHERE
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
+        and status = 1
   </select>
 </mapper>

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

@@ -204,6 +204,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="transactionTitle != null and transactionTitle !=''">
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
     </if>
+    and status = 1
     order by create_date DESC
   </select>
 
@@ -216,6 +217,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="type != null and type != ''">
       and type = #{type,jdbcType=INTEGER}
     </if>
+    and status = 1
     order by create_date DESC
   </select>
 
@@ -234,6 +236,6 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     select
     <include refid="Base_Column_List" />
     from tp_transaction
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and status = 1
   </select>
 </mapper>

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/AppUserController.java

@@ -0,0 +1,16 @@
+package com.community.huiju.controller;
+
+import io.swagger.annotations.Api;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = " App 用户 控制器")
+public class AppUserController {
+
+
+
+}

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

@@ -0,0 +1,85 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TaUserMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUser record);
+
+    int insertSelective(TaUser record);
+
+    TaUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUser record);
+
+    int updateByPrimaryKey(TaUser record);
+
+    /**
+     * 根据loginName和loginPassword 查询用户
+     * @param map
+     * @return 用户
+     */
+    TaUser selectByLoginNameAndByLoginPassword(Map<String, Object> map);
+
+    /**
+     * 根据loginName 查询用户
+     * @param map
+     * @return 用户
+     */
+    TaUser selectByLoginName(Map<String, Object> map);
+
+    /**
+     * 更新当前用户电话
+     * @param record
+     * @return
+     */
+    TaUser updateLongName(TaUser record);
+
+    /**
+     * 查询房屋成员列表
+     * @param parentId
+     * @return
+     */
+    List<TaUser> selectUserListByParentId(Integer parentId);
+
+    /**
+     * 判断当前用户的关联关系
+     * @param userId
+     * @param otherUserID
+     * @return
+     */
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID") Integer otherUserID);
+
+    /**
+     * 查询此电话在小区是否存在
+     * @param communityId
+     * @param phone
+     * @return
+     */
+    TaUser getByLoginName(@Param("id") Integer communityId, @Param("id") String phone);
+
+    /**
+     * 查询 业主/家属/租客 的总数
+     *
+     *  1 业主  2 租客  3 家属
+     * @param roleId 角色ID(业主/家属/租客)
+     * @return
+     */
+    Integer getByUserTypeCount(Integer roleId);
+
+    /**
+     * 获取 家属 总数(包含业主)
+     *
+     *  1 业主  2 租客  3 家属
+     *
+     * @return
+     */
+    Integer getOwnerCount();
+}

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

@@ -0,0 +1,240 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUser {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer buildingOwnerInfoId;
+
+    private String headPortrait;
+
+    private String userName;
+
+    private String loginName;
+
+    private String loginPassword;
+
+    private String email;
+
+    private String gender;
+
+    private String status;
+
+    private String remark;
+
+    private Integer parentId;
+
+    private String acceptAgreementStatus;
+
+    private String verifyStatus;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    // 海康UserId
+    private Integer hkUserId;
+
+    // 海康 卡片号
+    private String hkCardNo;
+
+    // 人脸状态
+    private String faceStatus;
+
+    // 角色编号
+    private Integer role;
+
+    // 角色名称
+    private String roleName;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getBuildingOwnerInfoId() {
+        return buildingOwnerInfoId;
+    }
+
+    public void setBuildingOwnerInfoId(Integer buildingOwnerInfoId) {
+        this.buildingOwnerInfoId = buildingOwnerInfoId;
+    }
+
+    public String getHeadPortrait() {
+        return headPortrait;
+    }
+
+    public void setHeadPortrait(String headPortrait) {
+        this.headPortrait = headPortrait == null ? null : headPortrait.trim();
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName == null ? null : loginName.trim();
+    }
+
+    public String getLoginPassword() {
+        return loginPassword;
+    }
+
+    public void setLoginPassword(String loginPassword) {
+        this.loginPassword = loginPassword == null ? null : loginPassword.trim();
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email == null ? null : email.trim();
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender == null ? null : gender.trim();
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getAcceptAgreementStatus() {
+        return acceptAgreementStatus;
+    }
+
+    public void setAcceptAgreementStatus(String acceptAgreementStatus) {
+        this.acceptAgreementStatus = acceptAgreementStatus == null ? null : acceptAgreementStatus.trim();
+    }
+
+    public String getVerifyStatus() {
+        return verifyStatus;
+    }
+
+    public void setVerifyStatus(String verifyStatus) {
+        this.verifyStatus = verifyStatus == null ? null : verifyStatus.trim();
+    }
+
+    public String getFaceStatus() {
+        return faceStatus;
+    }
+
+    public void setFaceStatus(String faceStatus) {
+        this.faceStatus = faceStatus;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getHkUserId() {
+        return hkUserId;
+    }
+
+    public void setHkUserId(Integer hkUserId) {
+        this.hkUserId = hkUserId;
+    }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo;
+    }
+
+    public Integer getRole() {
+        return role;
+    }
+
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+
+public interface ITaUserService {
+
+    /**
+     * 查询 业主/家属/租客 的总数
+     *
+     * @param
+     * @return
+     */
+    ResponseBean getByUserTypeCount();
+
+}

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

@@ -0,0 +1,50 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.service.ITaUserService;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * app 端用户业务类
+ * @author weiximei
+ */
+@Service("iTaUserService")
+public class TaUserServiceImpl implements ITaUserService {
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Override
+    public ResponseBean getByUserTypeCount() {
+        ResponseBean responseBean = new ResponseBean();
+
+        Map<String,Object> ownerMap = Maps.newHashMap();
+        Integer ownerCount = taUserMapper.getByUserTypeCount(1);
+        ownerMap.put("message","业主总数");
+        ownerMap.put("count",ownerCount);
+        Map<String,Object> tenantMap = Maps.newHashMap();
+        Integer tenantCount = taUserMapper.getByUserTypeCount(2);
+        tenantMap.put("message","租客总数");
+        tenantMap.put("count",tenantCount);
+        Map<String,Object> relationMap = Maps.newHashMap();
+        Integer relationCount = taUserMapper.getByUserTypeCount(3);
+        relationMap.put("message","家属总数");
+        relationMap.put("count",relationCount);
+
+        List<Map<String,Object>> mapList = Lists.newArrayList();
+        mapList.add(ownerMap);
+        mapList.add(tenantMap);
+        mapList.add(relationMap);
+
+        responseBean.addSuccess(mapList);
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,349 @@
+<?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.TaUserMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUser" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="building_owner_info_id" property="buildingOwnerInfoId" jdbcType="INTEGER" />
+    <result column="head_portrait" property="headPortrait" jdbcType="VARCHAR" />
+    <result column="user_name" property="userName" jdbcType="VARCHAR" />
+    <result column="login_name" property="loginName" jdbcType="VARCHAR" />
+    <result column="login_password" property="loginPassword" jdbcType="VARCHAR" />
+    <result column="email" property="email" jdbcType="VARCHAR" />
+    <result column="gender" property="gender" jdbcType="CHAR" />
+    <result column="status" property="status" jdbcType="CHAR" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="accept_agreement_status" property="acceptAgreementStatus" jdbcType="CHAR" />
+    <result column="verify_status" property="verifyStatus" jdbcType="CHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
+    <result column="face_status" property="faceStatus" jdbcType="CHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
+    email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
+    create_user, create_date, update_user, update_date, hk_user_id, hk_card_no, face_status
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_user
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+    insert into ta_user (id, community_id, building_owner_info_id,
+      head_portrait, user_name, login_name,
+      login_password, email, gender,
+      status, remark, parent_id,
+      accept_agreement_status, verify_status, create_user,
+      create_date, update_user, update_date,
+      hk_user_id, hk_card_no, face_status
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
+      #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
+      #{loginPassword,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{gender,jdbcType=CHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
+      #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
+    insert into ta_user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id,
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait,
+      </if>
+      <if test="userName != null" >
+        user_name,
+      </if>
+      <if test="loginName != null" >
+        login_name,
+      </if>
+      <if test="loginPassword != null" >
+        login_password,
+      </if>
+      <if test="email != null" >
+        email,
+      </if>
+      <if test="gender != null" >
+        gender,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        accept_agreement_status,
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id,
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no,
+      </if>
+      <if test="faceStatus != null" >
+        face_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="headPortrait != null" >
+        #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        #{gender,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        #{acceptAgreementStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        #{verifyStatus,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hkUserId != null" >
+        #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        #{faceStatus,jdbcType=CHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
+    update ta_user
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="buildingOwnerInfoId != null" >
+        building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="headPortrait != null" >
+        head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        user_name = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginName != null" >
+        login_name = #{loginName,jdbcType=VARCHAR},
+      </if>
+      <if test="loginPassword != null" >
+        login_password = #{loginPassword,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        gender = #{gender,jdbcType=CHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=CHAR},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="acceptAgreementStatus != null" >
+        accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
+      </if>
+      <if test="verifyStatus != null" >
+        verify_status = #{verifyStatus,jdbcType=CHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hkUserId != null" >
+        hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      </if>
+      <if test="hkCardNo != null" >
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
+      <if test="faceStatus != null" >
+        face_status = #{faceStatus,jdbcType=CHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUser" >
+    update ta_user
+    set community_id = #{communityId,jdbcType=INTEGER},
+      building_owner_info_id = #{buildingOwnerInfoId,jdbcType=INTEGER},
+      head_portrait = #{headPortrait,jdbcType=VARCHAR},
+      user_name = #{userName,jdbcType=VARCHAR},
+      login_name = #{loginName,jdbcType=VARCHAR},
+      login_password = #{loginPassword,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      gender = #{gender,jdbcType=CHAR},
+      status = #{status,jdbcType=CHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      accept_agreement_status = #{acceptAgreementStatus,jdbcType=CHAR},
+      verify_status = #{verifyStatus,jdbcType=CHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      face_status = #{faceStatus,jdbcType=CHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectByLoginNameAndByLoginPassword" parameterType="map" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where login_name=#{loginName,jdbcType=VARCHAR} and login_password = #{loginPassword,jdbcType=VARCHAR}
+  </select>
+
+  <select id="selectByLoginName" parameterType="map" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where login_name=#{loginName,jdbcType=VARCHAR}
+  </select>
+
+  <select id="updateLongName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap">
+    update ta_user
+    set
+    login_name = #{loginName,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectUserListByParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where parent_id = #{parentId}
+  </select>
+
+  <select id="selectTaFaceParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+      <include refid="Base_Column_List" />
+    from ta_user
+    where 1=1
+    <if test="otherUserID != null" >
+     and id = #{otherUserID,jdbcType=INTEGER}
+    </if>
+    <if test="id != null" >
+     and parent_id = #{id}
+    </if>
+    limit 1
+  </select>
+
+  <select id="getByLoginName" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where community_id = #{communityId,jdbcType=INTEGER}
+    <if test="otherUserID != null" >
+      and login_name = #{phone}
+    </if>
+
+  </select>
+
+  <select id="getByUserTypeCount" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+    SELECT COUNT(*)
+    FROM ta_user tu
+    INNER JOIN ta_sys_user_role tsur on tu.id = tsur.user_id where tsur.role_id = #{roleId,jdbcType=INTEGER}
+  </select>
+
+  <select id="getOwnerCount" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+    SELECT COUNT(*)
+    FROM ta_user tu
+    INNER JOIN ta_sys_user_role tsur on tu.id = tsur.user_id where tsur.role_id != 2
+  </select>
+
+</mapper>