合并

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

@@ -167,4 +167,10 @@ public class Constant {
      * 活动
      */
     public static final String MESSAGE_TYPE_ACTIVITY = "8";
+    
+    /**
+     * excel后缀
+     */
+    public static final String SUFFIX_2003 = ".xls";
+    public static final String SUFFIX_2007 = ".xlsx";
 }

CODE/smart-community/property-api/pom.xml

@@ -39,6 +39,23 @@
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
 
+		<!--解析Excel-->
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.14</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.14</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml-schemas</artifactId>
+			<version>3.14</version>
+		</dependency>
+
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -11,7 +11,7 @@ import javax.servlet.http.HttpSession;
  * @date 2018-12-18
  */
 public class BaseController {
-
+    
     /**
      * 获取 UserElement
      * @param session

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

@@ -11,10 +11,13 @@ 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.PostMapping;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
 import java.util.List;
@@ -119,5 +122,13 @@ public class BuildingOwnerInfoController extends BaseController {
         responseBean = iBuildingOwnerInfoService.getBuildingOrUnitOrNumber(parameter, userElement.getCommunityId());
         return responseBean;
     }
+    
+    @ApiOperation(value = "上传楼栋信息接口", notes = "上传楼栋信息接口")
+    @PostMapping(value = "/building/uploadExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iBuildingOwnerInfoService.getExcelData(file);
+        return responseBean;
+    }
 
 }

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

@@ -3,8 +3,10 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -47,6 +49,16 @@ public interface IBuildingOwnerInfoService extends IService<BuildingOwnerInfo> {
      * @param parameter
      * @return
      */
+
+    ResponseBean deleteByIdDatch(List<Integer> ids);
+    
+    /**
+     * 根据excel获取相关信息
+     * @param file
+     * @return
+     */
+    ResponseBean getExcelData(MultipartFile file);
+
     ResponseBean getBuildingOrUnitOrNumber(String parameter, Integer communityId);
 
 }

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

@@ -2,32 +2,38 @@ package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.enums.SqlMethod;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 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.utils.AccountValidatorUtil;
 import com.community.commom.utils.BeanTools;
 import com.community.huiju.dao.BuildingOwnerInfoMapper;
 import com.community.huiju.exception.WisdomException;
 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.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.binding.MapperMethod;
-import org.apache.ibatis.session.SqlSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -43,7 +49,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
     @Autowired
     private BuildingOwnerInfoMapper buildingOwnerInfoMapper;
-
+    
+    public static final Logger logger = LoggerFactory.getLogger(BuildingOwnerInfoServiceImpl.class);
+    
     @Override
     public ResponseBean listQuery(String parameter) {
 
@@ -191,4 +199,91 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<BuildingOwnerInfoM
 
         return responseBean;
     }
+    
+    /**
+     * 根据excel获取相关信息
+     *
+     * @param file
+     * @return
+     */
+    @Override
+    public ResponseBean getExcelData(MultipartFile file) {
+        ResponseBean responseBean = new ResponseBean();
+        List<BuildingOwnerInfo> list = new ArrayList<>();
+        if (file == null) {
+            responseBean.addError("对象不能为空");
+            return responseBean;
+        }
+        //获取文件的名字
+        String originalFilename = file.getOriginalFilename();
+        Workbook workbook = null;
+        try {
+            if (originalFilename.endsWith(Constant.SUFFIX_2003)) {
+                workbook = new HSSFWorkbook(file.getInputStream());
+            } else if (originalFilename.endsWith(Constant.SUFFIX_2007)) {
+                workbook = new XSSFWorkbook(file.getInputStream());
+            }
+        } catch (Exception e) {
+            logger.info(originalFilename);
+            e.printStackTrace();
+            responseBean.addError("格式错误");
+            return responseBean;
+        }
+        if (workbook == null) {
+            logger.info(originalFilename);
+            responseBean.addError("格式错误");
+            return responseBean;
+        } else {
+            List<String> temBuildingList = new ArrayList<String>();
+            List<String> temTelList = new ArrayList<String>();
+            //获取一个sheet也就是一个工作簿
+            Sheet sheet = workbook.getSheetAt(0);
+            int lastRowNum = sheet.getLastRowNum();
+            //从第一行开始第一行一般是标题
+            for (int j = 3; j <= lastRowNum; j++) {
+                Row row = sheet.getRow(j);
+                BuildingOwnerInfo buildingOwnerInfo = new BuildingOwnerInfo();
+                String building = row.getCell(0).getStringCellValue();
+                String unit = row.getCell(1).getStringCellValue();
+                String level = row.getCell(2).getStringCellValue();
+                String roomNo = row.getCell(3).getStringCellValue();
+                String ownerName = row.getCell(4).getStringCellValue();
+                String ownerTel = row.getCell(5).getStringCellValue();
+                //校验手机号码
+                if (!AccountValidatorUtil.isPhone(ownerTel)){
+                    responseBean.addError("请输入正确手机号:" + ownerTel);
+                    return responseBean;
+                }
+                String buildingInfo = building + unit + level + roomNo;
+                if (temBuildingList.contains(buildingInfo)){
+                    logger.info("存在重复房源:{}",buildingInfo);
+                    responseBean.addError("存在重复房源:"+ buildingInfo);
+                    return responseBean;
+                }
+                if (temTelList.contains(ownerTel)){
+                    logger.info("存在重复手机号:{}",ownerTel);
+                    responseBean.addError("存在重复手机号:"+ ownerTel);
+                    return responseBean;
+                }
+                //把数据塞入temList校验是否有重复的数据
+                temBuildingList.add(buildingInfo);
+                temTelList.add(ownerTel);
+                //构建数据
+                buildingOwnerInfo.setBuilding(building);
+                buildingOwnerInfo.setUnit(unit);
+                buildingOwnerInfo.setLevel(level);
+                buildingOwnerInfo.setRoomNo(roomNo);
+                buildingOwnerInfo.setOwnerName(ownerName);
+                buildingOwnerInfo.setOwnerTel(ownerTel);
+                list.add(buildingOwnerInfo);
+            }
+        }
+        //构建分页
+        Map<String,Object> data = new HashMap<String, Object>();
+        data.put("list",list);
+        data.put("total",list.size());
+        
+        responseBean.addSuccess(data);
+        return responseBean;
+    }
 }

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

@@ -2,7 +2,7 @@ server:
   port: 8084
 spring:
   application:
-    name: eureka-client2
+    name: property-api
   cloud:
     config:
       name: application

VUECODE/smart-property-manage/package.json

@@ -17,16 +17,17 @@
     "axios": "0.18.0",
     "element-ui": "2.4.6",
     "file-saver": "^2.0.0-rc.4",
+    "jquery": "^2.2.3",
     "js-cookie": "2.2.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
+    "qs": "^6.6.0",
     "vue": "2.5.17",
     "vue-amap": "^0.5.8",
     "vue-router": "3.0.1",
     "vuex": "3.0.1",
     "wangeditor": "^3.1.1",
-    "xlsx": "^0.14.0",
-    "jquery": "^2.2.3"
+    "xlsx": "^0.14.0"
   },
   "devDependencies": {
     "@antv/data-set": "^0.10.1",

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

@@ -0,0 +1,16 @@
+import request from '@/utils/ajax'
+
+export function uploadBuildingExcel(query) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/building/uploadExcel',
+      method: 'post',
+      data: query
+    }).then((res) => {
+      console.log('out')
+      resolve(res)
+    }).catch((err) => {
+      console.log(err)
+    })
+  })
+}

VUECODE/smart-property-manage/src/store/index.js

@@ -5,6 +5,7 @@ import user from './modules/user'
 import banner from './modules/banner'
 import community from './modules/community'
 import trunkIndex from './modules/trunkIndex'
+import batchImport from './modules/batchImport'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -15,7 +16,8 @@ const store = new Vuex.Store({
     user,
     community,
     banner,
-    trunkIndex
+    trunkIndex,
+    batchImport
   },
   getters
 })

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

@@ -0,0 +1,38 @@
+import { uploadBuildingExcel } from '@/api/batchImport'
+
+const batchImport = {
+  namespaced: true,
+  state: {
+    total: '',
+    temlist: []
+  },
+
+  mutations: {
+    SET_LIST: (state, list) => {
+      state.temlist = list
+    },
+    SET_TOTAL: (state, total) => {
+      state.total = total
+    }
+  },
+
+  actions: {
+    UploadBuildingExcel({ commit }, file) {
+      console.log(file)
+      return new Promise((resolve, reject) => {
+        uploadBuildingExcel({ file: file.raw }).then(response => {
+          if (response.code === '0') {
+            const data = response.data
+            commit('SET_LIST', data.list)
+            commit('SET_TOTAL', data.total)
+          }
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default batchImport

VUECODE/smart-property-manage/src/utils/ajax.js

@@ -0,0 +1,75 @@
+import axios from 'axios'
+import qs from 'qs'
+import { getToken } from '@/utils/auth'
+
+const Axios = axios.create({
+  baseURL: process.env.BASE_API, // api 的 base_url
+  timeout: 60000,
+  responseType: 'json',
+  withCredentials: true,
+  queryData: {},
+  urlData: {},
+  headerData: '',
+  headers: {
+    'Content-Type': 'multipart/form-data'
+  }
+})
+
+Axios.interceptors.request.use((config) => {
+  config.headers['Content-Type'] = config.headerData ? config.headerData : 'multipart/form-data'
+  config.headers['X-Auth-Token'] = getToken()
+  // config.urlData = { ...config.urlData,  }
+  // 处理请求data,若为get请求，拼到url后面，若为post请求，直接添加到body中
+  const urlData = qs.stringify(config.urlData)
+  const queryData = qs.stringify(config.queryData)
+  // 判断是通过斜杠传参
+  if (config.url.indexOf(':') > -1) {
+    if (typeof config.urlData === 'object') {
+      config.url = replaceURLParams(config.url, config.urlData)
+    } else {
+      config.url = config.url.slice(0, config.url.indexOf(':')) + urlData
+    }
+  }
+  if (queryData) {
+    config.url += '?' + queryData
+  }
+  if (config.headerData) {
+    return config
+  } else {
+    const fm = new FormData()
+    for (const k in config.data) {
+      if (Array.isArray(config.data[k])) {
+        config.data[k].forEach((v) => {
+          fm.append(k, v)
+        })
+      } else {
+        fm.append(k, config.data[k])
+      }
+    }
+    config.data = fm
+    return config
+  }
+}, (error) => {
+  console.log(error)
+})
+
+const ajax = (...args) => {
+  return new Promise((resolve, reject) => {
+    Axios(...args).then(({ data }) => {
+      resolve(data)
+    }).catch(() => {
+      console.log('error')
+    })
+  })
+}
+
+export default ajax
+
+export function replaceURLParams(url, params) {
+  const args = { ...(params || {}), org: 'MQ' }
+
+  return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理
+    const re = new RegExp(`:${k}(?!w)`, 'i')
+    return acc.replace(re, args[k])
+  }, url)
+}

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

@@ -3,52 +3,41 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item>
-        <el-upload
-          :on-preview="handlePreview"
-          :on-remove="handleRemove"
-          :before-remove="beforeRemove"
-          :limit="3"
-          :on-exceed="handleExceed"
-          :file-list="fileList"
-          class="upload-demo"
-          action="https://jsonplaceholder.typicode.com/posts/"
-          multiple>
+        <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-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-upload>
       </el-form-item>
     </el-form>
-    <el-table
-      ref="multipleTable"
-      :data="tableData3"
-      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;" @selection-change="handleSelectionChange">
       <el-table-column label="栋">
-        <template slot-scope="scope">{{ scope.row.date }}</template>
+        <template slot-scope="scope">{{ scope.row.building }}</template>
+      </el-table-column>
+      <el-table-column label="单元">
+        <template slot-scope="scope">{{ scope.row.unit }}</template>
+      </el-table-column>
+      <el-table-column label="楼层">
+        <template slot-scope="scope">{{ scope.row.level }}</template>
+      </el-table-column>
+      <el-table-column label="户号">
+        <template slot-scope="scope">{{ scope.row.roomNo }}</template>
+      </el-table-column>
+      <el-table-column label="业主姓名">
+        <template slot-scope="scope">{{ scope.row.ownerName }}</template>
+      </el-table-column>
+      <el-table-column label="手机号码">
+        <template slot-scope="scope">{{ scope.row.ownerTel }}</template>
       </el-table-column>
-      <el-table-column prop="name" label="单元"/>
-      <el-table-column prop="address" label="楼层"/>
-      <el-table-column prop="address" label="户号"/>
-      <el-table-column prop="address" label="业主姓名"/>
-      <el-table-column prop="address" label="手机号码"/>
     </el-table>
     <div class="block">
-      <el-pagination
-        :current-page="listQuery.pageNum"
-        :page-sizes="[5, 10, 20, 30]"
-        :page-size="listQuery.pageSize"
-        :total="40"
-        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'
 export default {
   data() {
     return {
@@ -56,39 +45,92 @@ export default {
         pageNum: 1,
         pageSize: 20
       },
+      list: [],
       currentPage4: 4
     }
   },
+  computed: {
+    ...mapState('batchImport', {
+      temlist: s => s.temlist,
+      total: s => s.total
+    })
+  },
+  created() {
+    console.log(mapActions)
+  },
   methods: {
+    ...mapActions('batchImport', ['UploadBuildingExcel']),
     handleSizeChange(val) {
+      this.listQuery.pageSize = val
+      this.getList()
       console.log(`每页 ${val} 条`)
     },
     handleCurrentChange(val) {
+      this.listQuery.pageNum = val
+      this.getList()
       console.log(`当前页: ${val}`)
     },
     dialogBatchImport() {
       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'
+      if (!extension && !extension2) {
+        this.$message.warning('上传文件只能是 xls、xlsx格式!')
+        return
+      }
+      return false // 返回false不会自动上传
+    },
+    handleChange(file) {
+      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 === '0') {
+            this.$message.success('上传成功')
+            this.getList()
+          }
+        })
+        .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)
     }
   }
 }
 </script>
 
 <style scoped>
-.root{
+.root {
   display: flex;
   flex-flow: column;
 }
-.form-listQuery{
+.form-listQuery {
   margin-top: 20px;
   margin-left: 30px;
 }
-.operation{
+.operation {
   display: flex;
   justify-content: space-between;
   margin-left: 20px;
   margin-right: 20px;
 }
-.block{
+.block {
   display: flex;
   justify-content: flex-end;
   margin-top: 10px;