导入bug修改

pro-base/src/main/java/com/idea/buildManage/controller/MnpBuildingController.java

@@ -131,10 +131,10 @@ public class MnpBuildingController extends BaseController {
             }
             EasyExcel.read(excel, MnpBuildingExcel.class, listener).headRowNumber(2).sheet().doRead();
             excel.delete();
-            // 启动一个新的线程来触发另一个方法
-            new Thread(() -> {
-                invoiceTask.sendBuild();
-            }).start();
+//            // 启动一个新的线程来触发另一个方法
+//            new Thread(() -> {
+//                invoiceTask.sendBuild();
+//            }).start();
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error(e.getMessage());

pro-base/src/main/java/com/idea/buildManage/controller/ParkRoomController.java

@@ -160,10 +160,10 @@ public class ParkRoomController extends BaseController {
             }
             EasyExcel.read(excel, ParkRoomExcel.class, listener).headRowNumber(2).sheet().doRead();
             excel.delete();
-            // 启动一个新的线程来触发另一个方法
-            new Thread(() -> {
-                invoiceTask.sendHouse();
-            }).start();
+//            // 启动一个新的线程来触发另一个方法
+//            new Thread(() -> {
+//                invoiceTask.sendHouse();
+//            }).start();
         } catch (Exception e) {
             e.printStackTrace();
             return AjaxResult.error(e.getMessage());

pro-base/src/main/java/com/idea/buildManage/excel/MnpBuildingListener.java

@@ -5,7 +5,9 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSONObject;
+import com.idea.buildManage.dto.ParkFloorDiscDto;
 import com.idea.buildManage.model.MnpBuilding;
+import com.idea.buildManage.model.ParkFloorDisc;
 import com.idea.buildManage.service.MnpBuildingService;
 import com.idea.buildManage.service.ParkFloorDiscService;
 import com.idea.buildManage.service.ParkInfoService;
@@ -65,6 +67,7 @@ public class MnpBuildingListener extends AnalysisEventListener<MnpBuildingExcel>
             MnpBuilding data;
             MnpBuildingExcel excel = null;
             Map<String, String> discNameIdMap = floorDiscService.getNameIdMap();
+            List<ParkFloorDisc> parkFloorDiscs = floorDiscService.listAll(new ParkFloorDiscDto(), null);
             Map<String, String> parkNameIdMap = parkInfoService.getNameIdMap();
             for (int i = 0; i < excelList.size(); i++) {
 
@@ -118,7 +121,18 @@ public class MnpBuildingListener extends AnalysisEventListener<MnpBuildingExcel>
                         builder.append("分期不存在").append(",");
                         excel.setDiscName("{" + excel.getDiscName() + "}");
                     }
-                    data.setDiscId(discNameIdMap.get(excel.getDiscName()));
+                    for(ParkFloorDisc parkFloorDisc : parkFloorDiscs){
+                        if(parkFloorDisc.getGroupId().equals(data.getGroupId()) &&
+                                parkFloorDisc.getName().equals(excel.getDiscName())){
+                            data.setDiscId(parkFloorDisc.getId());
+                        }
+                    }
+                    if(StringUtils.isEmpty(data.getDiscId())){
+                        discNameFlag = false;
+                        builder.append("分期不存在").append(",");
+                        excel.setDiscName("{" + excel.getDiscName() + "}");
+                    }
+
 
                     // 楼栋号
                     if (StringUtils.isEmpty(excel.getBuildNum())) {

pro-base/src/main/java/com/idea/buildManage/excel/ParkRoomListener.java

@@ -4,7 +4,9 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.fastjson.JSONObject;
+import com.idea.buildManage.dto.ParkFloorDiscDto;
 import com.idea.buildManage.model.MnpBuilding;
+import com.idea.buildManage.model.ParkFloorDisc;
 import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.service.MnpBuildingService;
 import com.idea.buildManage.service.ParkFloorDiscService;
@@ -74,6 +76,8 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
             Map<String, String> buildNameIdMap = buildingService.getNameIdMap();
             Map<String, String> discNameIdMap = floorDiscService.getNameIdMap();
             Map<String, String> parkNameIdMap = parkInfoService.getNameIdMap();
+            List<ParkFloorDisc> parkFloorDiscs = floorDiscService.listAll(new ParkFloorDiscDto(), null);
+            List<MnpBuilding> mnpBuildings = buildingService.listAll(new MnpBuilding(), null);
             for (int i = 0; i < excelList.size(); i++) {
 
                 boolean groupNameFlag = true;
@@ -136,7 +140,18 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
                         builder.append("分期不存在").append(",");
                         excel.setDiscName("{" + excel.getDiscName() + "}");
                     }
-                    data.setDiscId(discNameIdMap.get(excel.getDiscName()));
+                    for(ParkFloorDisc parkFloorDisc : parkFloorDiscs){
+                        if(parkFloorDisc.getGroupId().equals(data.getGroupId()) &&
+                                parkFloorDisc.getName().equals(excel.getDiscName())){
+                            data.setDiscId(parkFloorDisc.getId());
+                        }
+                    }
+                    if(StringUtils.isEmpty(data.getDiscId())){
+                        discNameFlag = false;
+                        builder.append("分期不存在").append(",");
+                        excel.setDiscName("{" + excel.getDiscName() + "}");
+                    }
+
 
                     // 判断楼栋是否存在
                     if (StringUtils.isEmpty(buildNameIdMap.get(excel.getBuildNum()))) {
@@ -144,7 +159,19 @@ public class ParkRoomListener extends AnalysisEventListener<ParkRoomExcel> {
                         builder.append("楼栋不存在").append(",");
                         excel.setBuildNum("{" + excel.getBuildNum() + "}");
                     }
-                    data.setBuildId(buildNameIdMap.get(excel.getBuildNum()));
+                    for(MnpBuilding mnpBuilding : mnpBuildings){
+                        if(mnpBuilding.getGroupId().equals(data.getGroupId())
+                                && mnpBuilding.getDiscId().equals(data.getDiscId())
+                                && mnpBuilding.getBuildNum().equals(excel.getBuildNum())){
+                            data.setBuildId(mnpBuilding.getId());
+                        }
+                    }
+                    if(StringUtils.isEmpty(data.getBuildId())){
+                        buildNumFlag = false;
+                        builder.append("楼栋不存在").append(",");
+                        excel.setBuildNum("{" + excel.getBuildNum() + "}");
+                    }
+
 
                     // 户室号
                     if (StringUtils.isEmpty(excel.getRoomNo())) {

pro-base/src/main/java/com/idea/buildManage/service/ParkInfoService.java

@@ -244,7 +244,8 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
                     buildingExample.setOrderByClause("build_num + 0");
-                    buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
+                    buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId())
+                            .andDelFlagEqualTo("0");
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {
                         List<Map<String, Object>> parkBuildChildrens = new ArrayList<>();
@@ -256,7 +257,8 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                             //房间
                             ParkRoomExample parkRoomExample = new ParkRoomExample();
                             parkRoomExample.setOrderByClause("room_no + 0");
-                            parkRoomExample.createCriteria().andBuildIdEqualTo(parkBuild.getId());
+                            parkRoomExample.createCriteria().andBuildIdEqualTo(parkBuild.getId())
+                                    .andDelFlagEqualTo("0");
                             List<ParkRoom> parkRooms = parkRoomService.selectByExample(parkRoomExample);
                             if (null != parkRooms && parkRooms.size() > 0) {
                                 List<Map<String, Object>> parkRoomChildrens = new ArrayList<>();
@@ -303,7 +305,8 @@ public class ParkInfoService implements BaseService<ParkInfo, ParkInfoExample> {
                     //楼栋
                     MnpBuildingExample buildingExample = new MnpBuildingExample();
                     buildingExample.setOrderByClause("build_num + 0");
-                    buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId());
+                    buildingExample.createCriteria().andDiscIdEqualTo(parkFloorDisc.getId())
+                            .andDelFlagEqualTo("0");
                     List<MnpBuilding> parkBuilds = mnpBuildingService.selectByExample(buildingExample);
                     if (null != parkBuilds && parkBuilds.size() > 0) {
                         List<Map<String, Object>> parkBuildChildrens = new ArrayList<>();

pro-base/src/main/java/com/idea/invoice/task/InvoiceTask.java

@@ -101,7 +101,7 @@ public class InvoiceTask {
     /**
      * 每天凌晨执行 推送载体数据
      */
-//    @Scheduled(cron = "0 0 0 1/1 * ?")
+    @Scheduled(cron = "0 0 0 1/1 * ?")
     public void sendBuild() {
         List<MnpBuildingDto> mnpBuildings = buildingService.selectNeedSendList();
         for(MnpBuildingDto building: mnpBuildings){
@@ -134,7 +134,7 @@ public class InvoiceTask {
     /**
      * 每天凌晨执行 推送房间数据
      */
-//    @Scheduled(cron = "0 0 0 1/1 * ?")
+    @Scheduled(cron = "0 0 0 1/1 * ?")
     public void sendHouse(){
         List<ParkRoomResponse> parkRooms = roomService.selectNeedSendList();
         for(ParkRoomResponse record: parkRooms){