合并

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -173,4 +173,19 @@ public class Constant {
      */
     public static final String SUFFIX_2003 = ".xls";
     public static final String SUFFIX_2007 = ".xlsx";
+    
+    /**
+     * 成功
+     */
+    public static final String RESPONSE_SUCCESS = "0";
+    
+    /**
+     * 未认证
+     */
+	public static final String UN_VERIFY_STATUS = "0";
+    
+    /**
+     * 已认证
+     */
+    public static final String VERIFY_STATUS = "1";
 }

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

@@ -132,6 +132,15 @@ public class BuildingOwnerInfoController extends BaseController {
         responseBean = iBuildingOwnerInfoService.getExcelData(file);
         return responseBean;
     }
+ 
+    @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
+    @PostMapping(value = "/building/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+        return responseBean;
+    }
 
     @ApiOperation(value = "获取已认证通过的用户信息",nickname ="获取已认证通过的用户信息")
     @ApiImplicitParams({
@@ -142,5 +151,4 @@ public class BuildingOwnerInfoController extends BaseController {
         ResponseBean allApprove=iBuildingOwnerInfoService.selectUserApprove(paramets);
         return allApprove;
     }
-
 }

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

@@ -1,13 +1,48 @@
 package com.community.huiju.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 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 extends BaseMapper<TaUser> {
+    int deleteByPrimaryKey(Integer id);
+    
+    @Override
+    int insert(TaUser record);
+
+    int insertSelective(TaUser record);
+
+    TaUser selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUser record);
+
+    int updateByPrimaryKey(TaUser record);
+
+    /**
+     * 获取已认证通过的
+     * @param map
+     * @param page
+     * @return
+     */
+    List<Map<Object,Object>> selectUserApprove(Map<Object, Object> map, IPage page);
+    
+    /**
+     * 查看是否有未认证数据
+     * @param ownerTel
+     * @param communityId
+     * @return
+     */
+    TaUser selectByTel(@Param("loginName") String ownerTel,@Param("communityId") Integer communityId);
+    
+    int batchUpdate(List<TaUser> updataTaUserList);
+
 }

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

@@ -24,5 +24,8 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
      * @return
      */
     List<TpBuildingOwnerInfo> selectUserApprove(@Param("ownerName") String r , @Param("ownerTel") String ownerTel , Page page);
-
+    
+    int batchInsert(List<TpBuildingOwnerInfo> list);
+    
+    int batchUpdate(List<TpBuildingOwnerInfo> list);
 }

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

@@ -2,6 +2,7 @@ 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.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -60,5 +61,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
-
+    
+    /**
+     * 上传excel里面的内容
+     * @param file
+     * @param userElement
+     * @return
+     */
+    ResponseBean submitExcelData(MultipartFile file, UserElement userElement);
 }

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

@@ -7,11 +7,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
-import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
+
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TaUser;
+
+import com.community.huiju.dao.TpBuildingOwnerInfoMapper;
 import com.community.huiju.model.TpBuildingOwnerInfo;
+
 import com.community.huiju.service.IBuildingOwnerInfoService;
 import com.google.common.collect.Maps;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -50,6 +56,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
     
+    @Autowired
+    private TaUserMapper taUserMapper;
+    
     public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
     
     @Override
@@ -200,6 +209,57 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
     
+    /**
+     * 上传excel里面的内容
+     *
+     * @param file
+     * @param userElement
+     * @return
+     */
+    @Override
+    public ResponseBean submitExcelData(MultipartFile file, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = getExcelData(file);
+        if (!responseBean.getCode().equals(Constant.RESPONSE_SUCCESS)){
+            return responseBean;
+        }
+        //获取要上传的数据
+        Map<String,Object> map = (Map<String, Object>) responseBean.getData();
+        List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
+        list.stream().forEach(BuildingOwnerInfo -> {
+            BuildingOwnerInfo.setCommunityId(userElement.getCommunityId());
+            BuildingOwnerInfo.setVerifyStatus(Constant.UN_VERIFY_STATUS);
+            BuildingOwnerInfo.setCreateUser(userElement.getId());
+            BuildingOwnerInfo.setCreateDate(LocalDateTime.now());
+            BuildingOwnerInfo.setUpdateUser(userElement.getId());
+            BuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+        });
+        //批量插入
+	    tpBuildingOwnerInfoMapper.batchInsert(list);
+        //判断是否认证过
+        List<TpBuildingOwnerInfo> updateList = new ArrayList<TpBuildingOwnerInfo>();
+        List<TaUser> updataTaUserList = new ArrayList<TaUser>();
+        list.stream().forEach(BuildingOwnerInfo -> {
+            TaUser taUser = taUserMapper.selectByTel(BuildingOwnerInfo.getOwnerTel(),BuildingOwnerInfo.getCommunityId());
+            if (null != taUser){
+                BuildingOwnerInfo.setVerifyStatus(Constant.VERIFY_STATUS);
+                updateList.add(BuildingOwnerInfo);
+                taUser.setVerifyStatus(Constant.VERIFY_STATUS);
+                taUser.setBuildingOwnerInfoId(BuildingOwnerInfo.getId());
+                updataTaUserList.add(taUser);
+            }
+        });
+        //批量更新
+        if (updateList.size() > 0){
+	        tpBuildingOwnerInfoMapper.batchUpdate(updateList);
+        }
+        if (updataTaUserList.size() > 0){
+            taUserMapper.batchUpdate(updataTaUserList);
+        }
+        responseBean.addSuccess("success");
+        return responseBean;
+    }
+    
     /**
      * 根据excel获取相关信息
      *

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

@@ -5,6 +5,9 @@ management:
         include: refresh,health,info
 ##mybatis-plus
 mybatis-plus:
+  global-config:
+    db-config:
+      id-type: auto
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
   mapper-locations: classpath:mapper/*.xml

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

@@ -1,4 +1,322 @@
 <?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="selectUserApprove" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TaUser">
+    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
+    andsur.role_id=1 and t.status=1 and t.verify_status=1
+  </select>
+
+  <select id="selectByTel" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where login_name = #{loginName,jdbcType=VARCHAR}
+    and community_id = #{communityId,jdbcType=INTEGER}
+    and verify_status = 0
+  </select>
+
+  <update id="batchUpdate" parameterType="java.util.ArrayList">
+    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+      update ta_user
+      <set>
+        verify_status=${item.verifyStatus},
+        building_owner_info_id = #{item.buildingOwnerInfoId}
+      </set>
+      where id = ${item.id}
+    </foreach>
+  </update>
+
 </mapper>

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

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.community.huiju.dao.ToCommunitiesMapper">
 
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,
+        room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.idCard},#{item.building},#{item.unit}, #{item.level},#{item.roomNo},#{item.ownerName},
+            #{item.ownerTel},#{item.gender},#{item.pairStatus},#{item.verifyStatus},#{item.createUser},#{item.createDate},#{item.updateUser},#{item.updateDate})
+        </foreach>
+    </insert>
+
+    <update id="batchUpdate" parameterType="java.util.ArrayList">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update tp_building_owner_info
+            <set>
+                verify_status=${item.verifyStatus}
+            </set>
+            where id = ${item.id}
+        </foreach>
+    </update>
 </mapper>

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

@@ -23,8 +23,26 @@
             </if>
             and tp_building_owner_info.pair_status=1
         </where>
+    </select>
 
+    <insert id="batchInsert" useGeneratedKeys="true" keyProperty="id" parameterType="java.util.ArrayList">
+        insert into tp_building_owner_info(community_id,id_card, building,unit, `level`,
+        room_no,owner_name,owner_tel,gender,pair_status,verify_status,create_user,create_date,update_user,update_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.communityId},#{item.idCard},#{item.building},#{item.unit}, #{item.level},#{item.roomNo},#{item.ownerName},
+            #{item.ownerTel},#{item.gender},#{item.pairStatus},#{item.verifyStatus},#{item.createUser},#{item.createDate},#{item.updateUser},#{item.updateDate})
+        </foreach>
+    </insert>
 
-    </select>
+    <update id="batchUpdate" parameterType="java.util.ArrayList">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update tp_building_owner_info
+            <set>
+                verify_status=${item.verifyStatus}
+            </set>
+            where id = ${item.id}
+        </foreach>
+    </update>
 
 </mapper>

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

@@ -14,3 +14,18 @@ export function uploadBuildingExcel(query) {
     })
   })
 }
+
+export function submitBuildingExcel(query) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/building/submitExcel',
+      method: 'post',
+      data: query
+    }).then((res) => {
+      console.log('out')
+      resolve(res)
+    }).catch((err) => {
+      console.log(err)
+    })
+  })
+}

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

@@ -1,4 +1,4 @@
-import { uploadBuildingExcel } from '@/api/batchImport'
+import { uploadBuildingExcel, submitBuildingExcel } from '@/api/batchImport'
 
 const batchImport = {
   namespaced: true,
@@ -18,7 +18,6 @@ const batchImport = {
 
   actions: {
     UploadBuildingExcel({ commit }, file) {
-      console.log(file)
       return new Promise((resolve, reject) => {
         uploadBuildingExcel({ file: file.raw }).then(response => {
           if (response.code === '0') {
@@ -31,6 +30,15 @@ const batchImport = {
           reject(error)
         })
       })
+    },
+    SubmitBuildingExcel({ commit }, file) {
+      return new Promise((resolve, reject) => {
+        submitBuildingExcel({ file: file.raw }).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/building/batch/batchImport.vue

@@ -3,14 +3,15 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
-        <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" :file-list="fileList" class="upload-demo" action="" multiple>
+        <el-upload :on-preview="handlePreview" :on-change="handleChange" :before-upload="beforeUpload" :limit="1" :on-exceed="handleExceed" class="upload-demo" action="" multiple>
           <el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button>
           <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           <el-button style="margin-left: 10px;" size="large" type="success" @click="submitUpload">提交</el-button>
+          <el-button style="margin-left: 10px;" size="large" type="success" @click="dialogBuildingIndex">取消</el-button>
         </el-upload>
       </el-form-item>
     </el-form>
-    <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;" @selection-change="handleSelectionChange">
+    <el-table ref="multipleTable" :data="list" border tooltip-effect="dark" style="width: 100%; margin-top: 20px;">
       <el-table-column label="栋">
         <template slot-scope="scope">{{ scope.row.building }}</template>
       </el-table-column>
@@ -31,13 +32,13 @@
       </el-table-column>
     </el-table>
     <div class="block">
-      <el-pagination :current-page="listQuery.pageNum" :page-sizes="[5, 10, 20, 30]" :page-size="listQuery.pageSize" :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange"/>
+      <el-pagination :current-page="listQuery.pageNum" :page-sizes="[5, 10, 20, 30]" :page-size="listQuery.pageSize" :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
   </div>
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapActions } from "vuex";
 export default {
   data() {
     return {
@@ -46,73 +47,101 @@ export default {
         pageSize: 20
       },
       list: [],
+      files: null,
       currentPage4: 4
-    }
+    };
   },
   computed: {
-    ...mapState('batchImport', {
+    ...mapState("batchImport", {
       temlist: s => s.temlist,
       total: s => s.total
     })
   },
   created() {
-    console.log(mapActions)
+    console.log(mapActions);
   },
   methods: {
-    ...mapActions('batchImport', ['UploadBuildingExcel']),
+    ...mapActions("batchImport", [
+      "UploadBuildingExcel",
+      "SubmitBuildingExcel"
+    ]),
     handleSizeChange(val) {
-      this.listQuery.pageSize = val
-      this.getList()
-      console.log(`每页 ${val} 条`)
+      this.listQuery.pageSize = val;
+      this.getList();
+      console.log(`每页 ${val} 条`);
     },
     handleCurrentChange(val) {
-      this.listQuery.pageNum = val
-      this.getList()
-      console.log(`当前页: ${val}`)
+      this.listQuery.pageNum = val;
+      this.getList();
+      console.log(`当前页: ${val}`);
     },
     dialogBatchImport() {
-      this.$router.push({ name: 'batch-import' })
+      this.$router.push({ name: "batch-import" });
     },
     beforeUpload(file) {
-      this.files = file
-      const extension = file.name.split('.')[1] === 'xls'
-      const extension2 = file.name.split('.')[1] === 'xlsx'
+      const extension = file.name.split(".")[1] === "xls";
+      const extension2 = file.name.split(".")[1] === "xlsx";
       if (!extension && !extension2) {
-        this.$message.warning('上传文件只能是 xls、xlsx格式!')
-        return
+        this.$message.warning("上传文件只能是 xls、xlsx格式!");
+        return;
       }
-      return false // 返回false不会自动上传
+      this.files = file;
+      return false; // 返回false不会自动上传
     },
     handleChange(file) {
-      const fileName = file.name
-      if (fileName === '') {
-        this.$message.warning('请选择要上传的文件！')
-        return false
+      const fileName = file.name;
+      if (fileName === "") {
+        this.$message.warning("请选择要上传的文件！");
+        return false;
       }
       this.UploadBuildingExcel(file)
         .then(response => {
-          console.log('success')
-          if (response.code === '1') {
-            this.$message.warning(response.message)
+          if (response.code === "1") {
+            this.$message.warning(response.message);
           }
-          if (response.code === '0') {
-            this.$message.success('上传成功')
-            this.getList()
+          if (response.code === "0") {
+            this.$message.success("上传成功");
+            this.getList();
           }
         })
         .catch(() => {
-          console.log('upload error')
+          console.log("upload error");
+        });
+    },
+    submitUpload() {
+      if (this.files === null) {
+        this.$message.warning("没有需要提交的文件");
+        return false;
+      }
+      let file = {
+        raw: this.files
+      };
+      this.SubmitBuildingExcel(file)
+        .then(response => {
+          if (response.code === "1") {
+            this.$message.warning(response.message);
+          }
+          if (response.code === "0") {
+            this.$message.success("提交成功");
+            this.dialogBuildingIndex();
+          }
         })
+        .catch(() => {
+          console.log("upload error");
+        });
     },
     getList() {
       this.list = this.temlist.slice(
         (this.listQuery.pageNum - 1) * this.listQuery.pageSize,
         this.listQuery.pageNum * this.listQuery.pageSize
-      )
-      console.log(this.list)
+      );
+      console.log(this.list);
+    },
+    dialogBuildingIndex() {
+      this.$router.push({ name: "building-index" });
     }
   }
-}
+};
 </script>
 
 <style scoped>