本地合并

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

@@ -1,8 +1,10 @@
 package com.community.huiju.controller;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.Communities;
 import com.community.huiju.model.SysNation;
 import com.community.huiju.service.CommonServiceI;
+import com.community.huiju.service.CommunitiesServiceI;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,6 +27,8 @@ import java.util.List;
 @RequestMapping("/")
 @Api(value = "运营端公共API", description = "运营端公共API")
 public class CommonController {
+	@Autowired
+	private CommunitiesServiceI communitiesServiceI;
 	
 	@Autowired
 	private CommonServiceI commonService;
@@ -63,4 +67,14 @@ public class CommonController {
 		responseBean.addSuccess(nationList);
 		return responseBean;
 	}
+
+	@ApiOperation(value = "获取所有小区经纬度", notes = "获取所有小区经纬度")
+	@RequestMapping(value = "/communities",method = RequestMethod.GET)
+	public ResponseBean getAgreement(){
+		ResponseBean responseBean = new ResponseBean();
+		List <Communities> communities= communitiesServiceI.getCommunities();
+		responseBean.addSuccess(communities);
+		return responseBean;
+	}
+
 }

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

@@ -22,4 +22,6 @@ public interface ToCommunitiesMapper {
     int updateByPrimaryKey(ToCommunities record);
     
     List<ToCommunities> selectByCommunityName(ToCommunities record);
+
+    List<ToCommunities> selectLongitude();
 }

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

@@ -0,0 +1,74 @@
+package com.community.huiju.model;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 所有小区表
+ * </p>
+ *
+ * @author jobob
+ * @since 2018-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Communities implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区名称
+     */
+    private String communityName;
+
+    /**
+     * 小区别名
+     */
+    private String communityAlias;
+
+    /**
+     * 省份id
+     */
+    private Integer provinceId;
+
+    private Integer cityId;
+
+    /**
+     * 县/区id
+     */
+    private Integer districtId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 登录账号
+     */
+    private String loginName;
+
+    private Integer createUser;
+
+    private LocalDateTime createDate;
+
+    private Integer updateUser;
+
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.Communities;
+
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2018/12/18
+ **/
+public interface CommunitiesServiceI {
+    /**
+     * 获取所有小区的经纬度
+     * @return
+     */
+     List<Communities> getCommunities();
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.ToCommunitiesMapper;
+import com.community.huiju.model.Communities;
+import com.community.huiju.service.CommunitiesServiceI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * version V1.0
+ * class_name: $METHOD_NAME$
+ * param: $METHOD_PARAM$
+ * describe: TODO
+ * creat_user:fannaixi
+ * creat_time: 2018/12/18
+ **/
+@Service("communitiesServicei")
+@Transactional
+public class CommunitiesServiceImpl implements CommunitiesServiceI {
+    @Autowired
+    private ToCommunitiesMapper toCommunitiesMapper;
+
+
+    @Override
+    public List<Communities> getCommunities() {
+        List longitudeList=toCommunitiesMapper.selectLongitude();
+        return longitudeList;
+    }
+}

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

@@ -220,4 +220,25 @@
     </if>
     order by c.create_date desc
   </select>
+
+  <select id="selectLongitude" resultMap="BaseResultMap" >
+    SELECT
+    c.id,
+    c.community_name,
+    c.community_alias,
+    c.province_id,
+    c.city_id,
+    c.district_id,
+    c.longitude,
+    c.latitude,
+    c.user_name,
+    c.login_name,
+    c.create_user,
+    c.create_date,
+    c.update_user,
+    c.update_date
+    FROM
+    to_communities c
+  </select>
+
 </mapper>

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

@@ -44,9 +44,21 @@ public class UserController extends BaseController {
 	@RequestMapping(value = "/users",method = RequestMethod.GET)
 	public ResponseBean getInfo(HttpSession session) {
 		ResponseBean response = new ResponseBean();
-		//response.addSuccess(userService.list());
+		response.addSuccess(userService.list());
 		Page a = new Page(1,10);
-		response.addSuccess(userService.page(a));
+//		response.addSuccess(userService.page(a));
 		return response;
 	}
+
+	@ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType="body",dataType = "String",name ="phone",value = "电话"),
+			@ApiImplicitParam(paramType="body",dataType = "String",name ="name",value = "姓名"),
+			@ApiImplicitParam(paramType="body",dataType = "String",name ="status",value = "认证状态")
+	})
+	@RequestMapping(value = "/userPassCertification",method = RequestMethod.GET)
+	public ResponseBean userPassCertification(){
+
+		return null;
+	}
 }

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

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.User;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 物业web端用户表 Mapper 接口
@@ -13,4 +16,6 @@ import com.community.huiju.model.User;
  */
 public interface UserMapper extends BaseMapper<User> {
 
+    List<Map<Object,Object>> selectUserApprove(Map<Object,Object> map);
+
 }

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

@@ -0,0 +1,75 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaSysRole {
+    private Integer id;
+
+    private String roleName;
+
+    private String description;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName == null ? null : roleName.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    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;
+    }
+}

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

@@ -84,5 +84,4 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
-
 }

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

@@ -4,6 +4,9 @@ package com.community.huiju.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.community.huiju.model.User;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 物业web端用户表 服务类
@@ -13,5 +16,6 @@ import com.community.huiju.model.User;
  * @since 2018-12-18
  */
 public interface IUserService extends IService<User> {
+    List<Object> selectUserApprove(Map map);
 
 }

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

@@ -5,8 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.huiju.dao.UserMapper;
 import com.community.huiju.model.User;
 import com.community.huiju.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 物业web端用户表 服务实现类
@@ -17,5 +21,11 @@ import org.springframework.stereotype.Service;
  */
 @Service("userService")
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
-
+@Autowired
+private UserMapper userMapper;
+    @Override
+    public List<Object> selectUserApprove(Map map) {
+        List UserApprove=userMapper.selectUserApprove(map);
+        return UserApprove;
+    }
 }

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

@@ -0,0 +1,124 @@
+<?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.TaSysRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaSysRole" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="description" property="description" jdbcType="VARCHAR" />
+    <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" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, role_name, description, create_user, create_date, update_user, update_date
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_sys_role
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_sys_role
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaSysRole" >
+    insert into ta_sys_role (id, role_name, description, 
+      create_user, create_date, update_user, 
+      update_date)
+    values (#{id,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
+      #{updateDate,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaSysRole" >
+    insert into ta_sys_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="roleName != null" >
+        role_name,
+      </if>
+      <if test="description != null" >
+        description,
+      </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>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="roleName != null" >
+        #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        #{description,jdbcType=VARCHAR},
+      </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>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaSysRole" >
+    update ta_sys_role
+    <set >
+      <if test="roleName != null" >
+        role_name = #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null" >
+        description = #{description,jdbcType=VARCHAR},
+      </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>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaSysRole" >
+    update ta_sys_role
+    set role_name = #{roleName,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="findRoleByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_sys_role
+    	where id = (select role_id from ta_sys_user_role where user_id = #{userId})
+  </select>
+
+</mapper>

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

@@ -1,5 +1,21 @@
 <?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.UserMapper">
-
+    <select id="selectUserApprove" resultType="map" parameterType="map">
+    SELECT
+	t.user_name,
+	t.login_name ,
+	t.gender ,
+	boi.id_card ,
+	boi.unit ,
+	boi. LEVEL,
+	room_no,
+	boi.create_date,
+	t.verify_status
+    FROM
+        ta_user t
+    LEFT JOIN tp_building_owner_info boi ON t.building_owner_info_id = boi.id
+    LEFT JOIN ta_sys_user_role sur ON t.id=sur.user_id
+    WHERE sur.role_id=1  and t.status=1 and t.verify_status=1
+    </select>
 </mapper>