building

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

@@ -6,6 +6,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
 

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

@@ -556,7 +556,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             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();
@@ -564,40 +563,32 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             for (int j = 3; j <= lastRowNum; j++) {
                 Row row = sheet.getRow(j);
                 TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-                String phase = row.getCell(0).getStringCellValue().trim();
-                String building = row.getCell(1).getStringCellValue().trim();
-                String unit = row.getCell(2).getStringCellValue().trim();
-                String level = row.getCell(3).getStringCellValue().trim();
-                String roomNo = row.getCell(4).getStringCellValue().trim();
-                String ownerName = row.getCell(5).getStringCellValue().trim();
-                String ownerTel = row.getCell(6).getStringCellValue().trim();
+                String buildingInfo = row.getCell(0).getStringCellValue().trim();
+                String roomNoId = row.getCell(1).getStringCellValue().trim();
+                String ownerName = row.getCell(2).getStringCellValue().trim();
+                String ownerTel = row.getCell(3).getStringCellValue().trim();
+                String ownerRole = row.getCell(4).getStringCellValue().trim();
                 int currentRow = j+1;
-                if (StringUtils.isEmpty(phase)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                if (StringUtils.isEmpty(buildingInfo)){
+                    responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(building)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                if (StringUtils.isEmpty(roomNoId)){
+                    responseBean.addError("第" + currentRow + "行" + "房产ID不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(unit)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
-                    return responseBean;
-                }
-                if (StringUtils.isEmpty(level)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
-                    return responseBean;
-                }
-                if (StringUtils.isEmpty(roomNo)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                //房产ID不为空的情况下检查房产是否存在
+                TpBuildingOwnerInfo checkOwnerInfo =tpBuildingOwnerInfoMapper.selectById(roomNoId);
+                if (null == checkOwnerInfo){
+                    responseBean.addError("第" + currentRow + "行" + "房产ID不存在!");
                     return responseBean;
                 }
                 if (StringUtils.isEmpty(ownerName)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    responseBean.addError("第" + currentRow + "行" + "姓名不能为空!");
                     return responseBean;
                 }
                 if (StringUtils.isEmpty(ownerTel)){
-                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    responseBean.addError("第" + currentRow + "行" + "手机号不能为空!");
                     return responseBean;
                 }
                 //校验手机号码
@@ -605,20 +596,19 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     responseBean.addError("第"+ currentRow +"行请输入正确手机号:" + ownerTel);
                     return responseBean;
                 }
-                String buildingInfo = phase + building + unit + level + roomNo;
-                if (temBuildingList.contains(buildingInfo)){
-                    logger.info("存在重复房源:{}",buildingInfo);
-                    responseBean.addError("第"+ currentRow +"行存在重复房源");
+                if (StringUtils.isEmpty(ownerRole)){
+                    responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
                     return responseBean;
                 }
-                if (temTelList.contains(ownerTel)){
-                    logger.info("存在重复手机号:{}",ownerTel);
-                    responseBean.addError("第"+ currentRow +"行存在重复手机号");
+    
+                if (temBuildingList.contains(roomNoId)){
+                    logger.info("存在重复房源:{}",roomNoId);
+                    responseBean.addError("第"+ currentRow +"行存在重复房源");
                     return responseBean;
                 }
+                
                 //把数据塞入temList校验是否有重复的数据
-                temBuildingList.add(buildingInfo);
-                temTelList.add(ownerTel);
+                temBuildingList.add(roomNoId);
                 //构建数据
                 tpBuildingOwnerInfo.setPhaseName(phase);
                 tpBuildingOwnerInfo.setBuildingName(building);

VUECODE/smart-property-manage/src/views/building/buildingdata/BuildingBatchImport.vue

@@ -4,7 +4,7 @@
     <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" class="upload-demo" action="" multiple>
-          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1548327771"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
+          <a href="http://jingcheng-h5temp.oss-cn-shanghai.aliyuncs.com/%E6%A5%BC%E6%A0%8B%E5%BA%93%E6%A8%A1%E6%9D%BF.xlsx?Expires=1556098137"><el-button style="margin-left: 10px;" size="large" type="primary">下载模板</el-button></a>
           <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>