暂存

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

@@ -1,7 +1,9 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TpCarouselSetting;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface TpCarouselSettingMapper {
     int deleteByPrimaryKey(Integer id);
 

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

@@ -0,0 +1,59 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.IBuildingOwnerInfoService;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+@RestController
+@RequestMapping("/tp/building-owner-info")
+@Api(value = "楼栋业主资料信息", description = "楼栋业主资料信息 Api")
+public class BuildingOwnerInfoController extends BaseController {
+
+    @Autowired
+    private IBuildingOwnerInfoService iBuildingOwnerInfoService;
+
+    @ApiOperation(value = "获取楼栋业主信息", notes = "根据条件获取")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "building栋;" +
+                    "unit单元;level楼层;roomNo户号;" +
+                    "ownerName业主姓名;" +
+                    "pageNum第几页;pageSize 一页多少行;")
+    })
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public ResponseBean getList(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "修改楼栋业务信息", notes = "修改楼栋业主信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter",value = "building栋;" +
+                    "unit单元;level楼层;roomNo户号;" +
+                    "ownerName业主姓名;" +
+                    "ownerTel业主手机号")
+    })
+    public ResponseBean update(@RequestBody String parameter){
+        ResponseBean responseBean = new ResponseBean();
+        return responseBean;
+    }
+
+}

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

@@ -49,4 +49,16 @@ public class UserController extends BaseController {
 //		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/BuildingOwnerInfoMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.BuildingOwnerInfo;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+public interface BuildingOwnerInfoMapper extends BaseMapper<BuildingOwnerInfo> {
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.User;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -15,6 +16,6 @@ import java.util.List;
  */
 public interface UserMapper extends BaseMapper<User> {
 
-    List<User> userApprove();
+    List<Map<Object,Object>> selectUserApprove(Map<Object,Object> map);
 
 }

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

@@ -0,0 +1,108 @@
+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 2018-12-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_building_owner_info")
+public class BuildingOwnerInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 楼栋
+     */
+    private String building;
+
+    /**
+     * 单元
+     */
+    private String unit;
+
+    /**
+     * 楼层
+     */
+    private String level;
+
+    /**
+     * 户号
+     */
+    private String roomNo;
+
+    /**
+     * 业主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 业主手机号
+     */
+    private String ownerTel;
+
+    /**
+     * 性别 1：男   2：女
+     */
+    private String gender;
+
+    /**
+     * 关联状态   0 未关联  1 是已关联
+     */
+    private String pairStatus;
+
+    /**
+     * 认证状态  0 是未认证    1是认证通过   2是已作废
+     */
+    private String verifyStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime 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/IBuildingOwnerInfoService.java

@@ -0,0 +1,33 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.model.BuildingOwnerInfo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
+
+    /**
+     * 根据条件查询
+     * @param parameter
+     * @return
+     */
+    ResponseBean listQuery(String parameter);
+
+    /**
+     * 修改 楼栋业主信息
+     * @param parameter
+     * @return
+     */
+    ResponseBean update(String parameter);
+
+}

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/BuildingOwnerInfoServiceImpl.java

@@ -0,0 +1,102 @@
+package com.community.huiju.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.EmptyWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.huiju.dao.BuildingOwnerInfoMapper;
+import com.community.huiju.model.BuildingOwnerInfo;
+import com.community.huiju.service.IBuildingOwnerInfoService;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 楼栋业主资料信息表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2018-12-18
+ */
+@Service("iBuildingOwnerInfoService")
+public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoMapper, BuildingOwnerInfo> implements IBuildingOwnerInfoService {
+
+    @Autowired
+    private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+
+    @Override
+    public ResponseBean listQuery(String parameter) {
+
+        ResponseBean responseBean = new ResponseBean();
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        BuildingOwnerInfo buildingOwnerInfo = jsonObject.toJavaObject(BuildingOwnerInfo.class);
+
+        Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
+        Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
+
+        Page<BuildingOwnerInfo> page = new Page(pageNum,pageSize);
+
+        Map<String, Object> map = Maps.newHashMap();
+        // 栋
+        map.put("building",buildingOwnerInfo.getBuilding());
+        // 单元
+        map.put("unit",buildingOwnerInfo.getUnit());
+        // 楼层
+        map.put("level",buildingOwnerInfo.getLevel());
+        // 房号
+        map.put("room_no",buildingOwnerInfo.getRoomNo());
+
+        QueryWrapper<BuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.allEq(map,false);
+        queryWrapper.like(buildingOwnerInfo.getOwnerName() != null,"owner_name",buildingOwnerInfo.getOwnerName());
+        // 分页查询
+        IPage<BuildingOwnerInfo> infoIPage = buildingOwnerInfoMapper.selectPage(page, queryWrapper);
+
+
+        Map<String, Object> retMap = Maps.newHashMap();
+        // 获取数据
+        List<BuildingOwnerInfo> list = infoIPage.getRecords();
+
+        retMap.put("data", list);
+        retMap.put("total", infoIPage.getTotal());
+        retMap.put("pageNum", infoIPage.getCurrent());
+        retMap.put("pageSize", infoIPage.getSize());
+
+        responseBean.addSuccess(list);
+
+        return responseBean;
+    }
+
+
+    @Override
+    public ResponseBean update(String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        BuildingOwnerInfo buildingOwnerInfo = JSONObject.parseObject(parameter, BuildingOwnerInfo.class);
+        BuildingOwnerInfo oldBuildingOwnerInfo = buildingOwnerInfoMapper.selectById(buildingOwnerInfo.getId());
+        if (null == oldBuildingOwnerInfo) {
+            responseBean.addError("数据不存在!");
+            return responseBean;
+        }
+
+        BeanUtils.copyProperties(buildingOwnerInfo, oldBuildingOwnerInfo);
+        int row = buildingOwnerInfoMapper.updateById(buildingOwnerInfo);
+        if (row <= 0) {
+            responseBean.addError("更新失败!");
+        } else {
+            responseBean.addSuccess("更新成功!");
+        }
+        return responseBean;
+    }
+}

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/BuildingOwnerInfoMapper.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.BuildingOwnerInfoMapper">
+
+</mapper>

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

@@ -1,7 +1,7 @@
 <?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="userApprove" resultType="com.community.huiju.dao.UserMapper">
+    <select id="selectUserApprove" resultType="map" parameterType="map">
     SELECT
 	t.user_name,
 	t.login_name ,
@@ -16,6 +16,6 @@
         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
+    WHERE sur.role_id=1  and t.status=1 and t.verify_status=1
     </select>
 </mapper>

CODE/smart-community/property-api/src/test/java/com/community/huiju/DemoApplicationTests.java

@@ -1,16 +1,27 @@
 package com.community.huiju;
 
+import com.community.huiju.dao.BuildingOwnerInfoMapper;
+import com.community.huiju.model.BuildingOwnerInfo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class DemoApplicationTests {
 
+	@Autowired
+	private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
+
 	@Test
 	public void contextLoads() {
+
+		List<BuildingOwnerInfo> list = buildingOwnerInfoMapper.selectList(null);
+		System.out.println(list.size());
 	}
 
 }