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

# Conflicts:
#	文档/需求/app接口需求-第二版.xlsx

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

@@ -37,6 +37,7 @@ public class TicketController {
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区编号"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum",value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少数据"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     public ResponseBean getService(@PathVariable(value = "communityId") String communityId,
                                    @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
@@ -74,6 +75,7 @@ public class TicketController {
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize", value = "一页多少数据"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "type", value = "工单类型 (0报修/1投诉/2联系单)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     public ResponseBean getServiceList(@PathVariable(value = "communityId") String communityId,
                                        @RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,
@@ -117,6 +119,7 @@ public class TicketController {
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketContent",value = "工单内容"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "ticketTitle",value = "工单标题"),
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "repairType",value = "报修房屋类型"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/addAlltpTicket",method = RequestMethod.POST)
     @ResponseBody

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

@@ -40,15 +40,14 @@ public class UserController {
     @ApiOperation(value = "登录", notes = "根据登录名和验证码")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "communityId",value = "小区"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "loginName",value = "登陆名(手机号)"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码")
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "loginName(登陆名(手机号)) code(验证码)"),
     })
     @RequestMapping(value = "/user/login/{communityId}",method = RequestMethod.POST)
-    public ResponseBean login(@RequestParam(value = "loginName") String loginName,
-                              @RequestParam(value = "code",defaultValue = "") String code,
+    public ResponseBean login(@RequestBody String parameter,
                               @PathVariable(value = "communityId") String communityId,
                               HttpSession session){
-        ResponseBean responseBean = iTaUserService.login(loginName,communityId,code);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        ResponseBean responseBean = iTaUserService.login(jsonObject.getString("loginName"),communityId, jsonObject.getString("code"));
         TaUserVO userVO = (TaUserVO) responseBean.getData();
 
         if (null != userVO) {
@@ -63,7 +62,8 @@ public class UserController {
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "登陆(手机号)"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码")
+            @ApiImplicitParam(paramType = "query",dataType = "String",name = "code",value = "验证码"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
             @RequestMapping(value = "/user/phone",method = RequestMethod.PUT)
     public ResponseBean update(@RequestBody String paramets, HttpSession session){
@@ -86,16 +86,17 @@ public class UserController {
     }
     @ApiOperation(value = "修改用户名和性别", notes = "修改用户名和性别")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userName",value = "用户民"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "gender",value = "性别")
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/update/info",method = RequestMethod.PUT)
-    public ResponseBean updateUserNameAndGender(@RequestBody TaUser user,
+    public ResponseBean updateUserNameAndGender(@RequestBody String parameter,
                                                 HttpSession session){
         ResponseBean response = new ResponseBean();
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
 
+        TaUser user = JSONObject.parseObject(parameter,TaUser.class);
         user.setId(userElement.getId());
 
         response = iTaUserService.modifyUser(user);
@@ -105,8 +106,8 @@ public class UserController {
 
     @ApiOperation(value = "租客或家属 启用或者停用", notes = "租客或家属 启用或者停用")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "userId",value = "租客或者家属"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "type",value = "1启用 0停用")
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userId(租客或者家属) type(1启用 0停用)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/update/dependentsOrTenants",method = RequestMethod.PUT)
     public ResponseBean updateDependentsOrTenants(@RequestBody String parameter,
@@ -125,10 +126,11 @@ public class UserController {
 
     @ApiOperation(value = "业主添加 租客或家属", notes = "业主添加 租客或家属")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "userName",value = "租客或者家属 姓名"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "phone",value = "租客或者家属 手机号"),
-            @ApiImplicitParam(paramType = "query",dataType = "String",name = "gender",value = "租客或者家属 性别 1男 2女"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "type",value = "1家属 0租客")
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
+                    "phone(租客或者家属 手机号) " +
+                    "gender(租客或者家属 性别 1男 2女) " +
+                    "type(1家属 0租客)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/update/addTenantsOrDependents",method = RequestMethod.POST)
     public ResponseBean addTenantsOrDependents(@RequestBody String parameter,
@@ -147,5 +149,36 @@ public class UserController {
     }
 
 
+    @ApiOperation(value = "修改用户头像", notes = "修改用户头像")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "headPortrait(用户头像)"),
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/update/modifyUserHeadPortrait",method = RequestMethod.PUT)
+    public ResponseBean modifyUserHeadPortrait(@RequestBody String parameter,
+                                               HttpSession session){
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        ResponseBean response = iTaUserService.modifyUserHeadPortrait(userElement.getId(),jsonObject.getString("headPortrait"));
+
+        return response;
+
+    }
+
+    @ApiOperation(value = "获取用户信息", notes = "获取用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/info",method = RequestMethod.GET)
+    public ResponseBean getUserInfo(HttpSession session){
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+        response = iTaUserService.getUserInfo(userElement.getId());
+
+        return response;
+
+    }
 
 }

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

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.SysNation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysNationMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(SysNation record);
+
+    int insertSelective(SysNation record);
+
+    SysNation selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(SysNation record);
+
+    int updateByPrimaryKey(SysNation record);
+}

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

@@ -0,0 +1,105 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class SysNation {
+    private Integer id;
+
+    private String code;
+
+    private String province;
+
+    private String city;
+
+    private Integer parentId;
+
+    private Date createTime;
+
+    private String district;
+
+    private Date lastUpdateTime;
+
+    private Integer operator;
+
+    private String operatorIp;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province == null ? null : province.trim();
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city == null ? null : city.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(String district) {
+        this.district = district == null ? null : district.trim();
+    }
+
+    public Date getLastUpdateTime() {
+        return lastUpdateTime;
+    }
+
+    public void setLastUpdateTime(Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    public Integer getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Integer operator) {
+        this.operator = operator;
+    }
+
+    public String getOperatorIp() {
+        return operatorIp;
+    }
+
+    public void setOperatorIp(String operatorIp) {
+        this.operatorIp = operatorIp == null ? null : operatorIp.trim();
+    }
+}

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

@@ -76,4 +76,19 @@ public interface ITaUserService {
      */
     ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);
 
+    /**
+     * 修改用户头像
+     * @param currentUserId
+     * @param headPortrait 图片url
+     * @return
+     */
+    ResponseBean modifyUserHeadPortrait(Integer currentUserId, String headPortrait);
+
+    /**
+     * 获取用户信息
+     * @param userId
+     * @return
+     */
+    ResponseBean getUserInfo(Integer userId);
+
 }

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

@@ -5,16 +5,12 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.MD5Utils;
 import com.community.huiju.common.code.cache.AppkeyCache;
-import com.community.huiju.dao.TaSysRoleMapper;
-import com.community.huiju.dao.TaSysUserRoleMapper;
-import com.community.huiju.dao.TaUserMapper;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
-import com.community.huiju.model.TaSysRole;
-import com.community.huiju.model.TaSysUserRole;
-import com.community.huiju.model.TaUser;
+import com.community.huiju.dao.*;
+import com.community.huiju.model.*;
 import com.community.huiju.service.ITaUserService;
 import com.community.huiju.vo.TaUserVO;
 import com.google.common.collect.Maps;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.checkerframework.checker.units.qual.A;
@@ -47,6 +43,12 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TaSysUserRoleMapper taSysUserRoleMapper;
 
+    @Autowired
+    private ToCommunitiesMapper toCommunitiesMapper;
+
+    @Autowired
+    private SysNationMapper sysNationMapper;
+
     @Transactional
     @Override
     public ResponseBean login(TaUser user) {
@@ -301,7 +303,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setRemark("这是业主添加的!");
         user.setUserName(user.getLoginName());
         user.setBuildingOwnerInfoId(taUser.getBuildingOwnerInfoId());
-        user.setCommunityId(user.getCommunityId());
+        user.setCommunityId(taUser.getCommunityId());
 
         int result = taUserMapper.insertSelective(user);
         if (result < 0) {
@@ -338,4 +340,60 @@ public class TaUserServiceImpl implements ITaUserService {
 
         return response;
     }
+
+    @Transactional
+    @Override
+    public ResponseBean modifyUserHeadPortrait(Integer currentUserId, String headPortrait) {
+
+        ResponseBean response = new ResponseBean();
+
+        TaUser user = taUserMapper.selectByPrimaryKey(currentUserId);
+        user.setHeadPortrait(headPortrait);
+
+        int result = taUserMapper.updateByPrimaryKeySelective(user);
+        if (result > 0) {
+            response.addSuccess("修改成功!");
+        } else {
+          response.addError("修改失败!");
+        }
+
+        return response;
+    }
+
+    @Override
+    public ResponseBean getUserInfo(Integer userId) {
+
+        ResponseBean response = new ResponseBean();
+        if (null == userId) {
+            response.addError("用户id不存在!");
+            return response;
+        }
+
+        // 获取用户
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        // 获取业主信息
+        TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
+        // 获取小区
+        ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(tpBuildingOwnerInfo.getCommunityId());
+
+        // 省
+        SysNation province = sysNationMapper.selectByPrimaryKey(toCommunities.getProvinceId());
+        // 市
+        SysNation city = sysNationMapper.selectByPrimaryKey(toCommunities.getCityId());
+        // 区
+        SysNation district = sysNationMapper.selectByPrimaryKey(toCommunities.getDistrictId());
+
+        TaUserVO userVO = new TaUserVO();
+        BeanUtils.copyProperties(user,userVO);
+        userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict());
+        userVO.setAddressBuilding(tpBuildingOwnerInfo.getBuilding()
+                +tpBuildingOwnerInfo.getUnit()
+                +tpBuildingOwnerInfo.getLevel()
+                +tpBuildingOwnerInfo.getRoomNo());
+        userVO.setCommunityName(toCommunities.getCommunityName());
+
+        response.addSuccess(userVO);
+
+        return response;
+    }
 }

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

@@ -43,4 +43,13 @@ public class TaUserVO {
     /** 用户token **/
     private String token;
 
+    /** 地址省市区 **/
+    private String addressProvince;
+
+    /** 小区名 **/
+    private String communityName;
+
+    /** 楼栋单元号 **/
+    private String addressBuilding;
+
 }

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

@@ -0,0 +1,153 @@
+<?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.SysNationMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.SysNation" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="code" property="code" jdbcType="VARCHAR" />
+    <result column="province" property="province" jdbcType="VARCHAR" />
+    <result column="city" property="city" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="district" property="district" jdbcType="VARCHAR" />
+    <result column="last_update_time" property="lastUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="operator" property="operator" jdbcType="INTEGER" />
+    <result column="operator_ip" property="operatorIp" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, code, province, city, parent_id, create_time, district, last_update_time, operator, 
+    operator_ip
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from sys_nation
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from sys_nation
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.SysNation" >
+    insert into sys_nation (id, code, province, 
+      city, parent_id, create_time, 
+      district, last_update_time, operator, 
+      operator_ip)
+    values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, 
+      #{city,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{district,jdbcType=VARCHAR}, #{lastUpdateTime,jdbcType=TIMESTAMP}, #{operator,jdbcType=INTEGER}, 
+      #{operatorIp,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.SysNation" >
+    insert into sys_nation
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="code != null" >
+        code,
+      </if>
+      <if test="province != null" >
+        province,
+      </if>
+      <if test="city != null" >
+        city,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="district != null" >
+        district,
+      </if>
+      <if test="lastUpdateTime != null" >
+        last_update_time,
+      </if>
+      <if test="operator != null" >
+        operator,
+      </if>
+      <if test="operatorIp != null" >
+        operator_ip,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="code != null" >
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="district != null" >
+        #{district,jdbcType=VARCHAR},
+      </if>
+      <if test="lastUpdateTime != null" >
+        #{lastUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null" >
+        #{operator,jdbcType=INTEGER},
+      </if>
+      <if test="operatorIp != null" >
+        #{operatorIp,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.SysNation" >
+    update sys_nation
+    <set >
+      <if test="code != null" >
+        code = #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        province = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        city = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="district != null" >
+        district = #{district,jdbcType=VARCHAR},
+      </if>
+      <if test="lastUpdateTime != null" >
+        last_update_time = #{lastUpdateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null" >
+        operator = #{operator,jdbcType=INTEGER},
+      </if>
+      <if test="operatorIp != null" >
+        operator_ip = #{operatorIp,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.SysNation" >
+    update sys_nation
+    set code = #{code,jdbcType=VARCHAR},
+      province = #{province,jdbcType=VARCHAR},
+      city = #{city,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      district = #{district,jdbcType=VARCHAR},
+      last_update_time = #{lastUpdateTime,jdbcType=TIMESTAMP},
+      operator = #{operator,jdbcType=INTEGER},
+      operator_ip = #{operatorIp,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>