新需求

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -272,9 +272,34 @@ public class TaHousingResourcesController extends BaseController {
     }
 
     @PostMapping(value = "/admin/house/uploadExcel")
-    public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file) {
+    public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file,
+                                    @RequestParam("salesBatchId") Integer salesBatchId,
+                                    @RequestParam("buildingId") String buildingId,
+                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iTaHousingResourcesService.getExcelData(file);
+        try {
+            responseBean = iTaHousingResourcesService.getExcelData(file,salesBatchId,buildingId,getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError("请检查文件");
+        }
+        return responseBean;
+    }
+
+    @PostMapping(value = "/admin/house/saveExcelValue", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean saveExcelValue(@RequestParam("file") MultipartFile file,
+                                    @RequestParam("salesBatchId") Integer salesBatchId,
+                                    @RequestParam("buildingId") String buildingId,
+                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.saveExcelValue(file,salesBatchId,buildingId,getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError("请检查文件");
+        }
         return responseBean;
     }
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -92,7 +92,20 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
     /**
      * 获取表格中的数据
      * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getExcelData(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
+
+    /**
+     * 保存文件
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
      * @return
      */
-    ResponseBean getExcelData(MultipartFile file);
+    ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -25,8 +25,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 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.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,6 +43,7 @@ import java.util.Map;
  * @author jobob
  * @since 2020-02-10
  */
+@Transactional(rollbackFor = Exception.class)
 @Service
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
 
@@ -337,10 +340,13 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * 获取表格中的数据
      *
      * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
      * @return
      */
     @Override
-    public ResponseBean getExcelData(MultipartFile file) {
+    public ResponseBean getExcelData(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         List<TaHousingResources> list = new ArrayList<>();
         if (file == null) {
@@ -380,28 +386,28 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 String unitName = row.getCell(2).getStringCellValue().trim();
                 String floorName = row.getCell(3).getStringCellValue().trim();
                 String roomName = row.getCell(4).getStringCellValue().trim();
-                String price = row.getCell(5).getStringCellValue().trim();
-                String heat = row.getCell(6).getStringCellValue().trim();
+                BigDecimal price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
+                Integer heat = Integer.valueOf(String.valueOf(row.getCell(6).getNumericCellValue()).substring(0,1));
                 Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
 
                 int currentRow = j+1;
-                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(termName)){
+                if (StringUtils.isEmpty(termName)){
                     responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
                     return responseBean;
                 }
-                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(blockName)){
+                if (StringUtils.isEmpty(blockName)){
                     responseBean.addError("第" + currentRow + "行" + "楼栋不能为空!");
                     return responseBean;
                 }
-                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(unitName)){
+                if (StringUtils.isEmpty(unitName)){
                     responseBean.addError("第" + currentRow + "行" + "单元不能为空!");
                     return responseBean;
                 }
-                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(floorName)){
+                if (StringUtils.isEmpty(floorName)){
                     responseBean.addError("第" + currentRow + "行" + "层不能为空!");
                     return responseBean;
                 }
-                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(roomName)){
+                if (StringUtils.isEmpty(roomName)){
                     responseBean.addError("第" + currentRow + "行" + "房号不能为空!");
                     return responseBean;
                 }
@@ -413,6 +419,23 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                     return responseBean;
                 }
 
+                QueryWrapper<TaHousingResources> taHousingResourcesQueryWrapper = new QueryWrapper<>();
+                taHousingResourcesQueryWrapper.eq("sales_batch_id",salesBatchId);
+                taHousingResourcesQueryWrapper.eq("building_id",buildingId);
+                taHousingResourcesQueryWrapper.eq("org_id",orgId);
+                taHousingResourcesQueryWrapper.gt("status",CommConstant.STATUS_DELETE);
+                taHousingResourcesQueryWrapper.eq("term_name",termName);
+                taHousingResourcesQueryWrapper.eq("block_name",blockName);
+                taHousingResourcesQueryWrapper.eq("unit_name",unitName);
+                taHousingResourcesQueryWrapper.eq("floor_name",floorName);
+                taHousingResourcesQueryWrapper.eq("room_name",roomName);
+                TaHousingResources oldTaHouseingResources = taHousingResourcesMapper.selectOne(taHousingResourcesQueryWrapper);
+                if (null != oldTaHouseingResources){
+                    logger.info("数据库存在重复房源:{}",houseInfo);
+                    responseBean.addError("第"+ currentRow +"行与系统已录入房源"+ oldTaHouseingResources.getHouseId() +"重复");
+                    return responseBean;
+                }
+
                 //把数据塞入temList校验是否有重复的数据
                 temHousingList.add(houseInfo);
                 //构建数据
@@ -421,6 +444,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 taHousingResources.setUnitName(unitName);
                 taHousingResources.setFloorName(floorName);
                 taHousingResources.setRoomName(roomName);
+                taHousingResources.setPrice(price);
+                taHousingResources.setHeat(heat);
+                taHousingResources.setStatus(status);
                 list.add(taHousingResources);
             }
         }
@@ -433,6 +459,35 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         return responseBean;
     }
 
+    /**
+     * 保存文件
+     *
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = getExcelData(file, salesBatchId, buildingId, orgId);
+        if (responseBean.getCode() != ResponseBean.CODE_SUCCESS){
+            return responseBean;
+        }
+
+        //获取校验成功的数据
+        Map<String,Object> data = (Map<String,Object>)responseBean.getData();
+        List<TaHousingResources> list =  (List<TaHousingResources>)data.get("list");
+        list.forEach(e -> {
+            e.setOrgId(orgId);
+            e.setSalesBatchId(salesBatchId);
+            e.setBuildingId(buildingId);
+            addHouseResources(e);
+        });
+        return ResponseBean.success(list);
+    }
+
     //更新房号
     private void updateRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();