1111

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -11,6 +11,7 @@ import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.service.ProjectService;
 import com.jeeplus.modules.sg.project.util.ExportUtil;
+import com.jeeplus.modules.sg.substation.service.SubstationService;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -38,6 +39,8 @@ public class ProjectController extends BaseController {
     private ProjectService projectService;
     @Autowired
     private OverheadLineService overheadLineService;
+    @Autowired
+    private SubstationService substationService;
 
 
 
@@ -105,6 +108,9 @@ public class ProjectController extends BaseController {
             if (type.equals("2")) {
                 overheadLineService.saveDl(file, projectName, id, projectId, type);
             }
+            if (type.equals("3")) {
+                substationService.save(file, projectName, id, projectId, type);
+            }
         } catch (RuntimeException e) {
             addMessage(redirectAttributes, "导入失败,"+e.getMessage());
             return "redirect:/a/project/list";

src/main/java/com/jeeplus/modules/sg/project/web/ProjectTemController.java

@@ -7,6 +7,7 @@ import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.service.ItemService;
 import com.jeeplus.modules.sg.project.service.ProjectService;
+import com.jeeplus.modules.sg.substation.service.SubstationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -33,6 +34,8 @@ public class ProjectTemController extends BaseController {
     private OverheadLineService overheadLineService;
     @Autowired
     private ItemService itemService;
+    @Autowired
+    private SubstationService substationService;
 
 
 
@@ -84,6 +87,10 @@ public class ProjectTemController extends BaseController {
                     String id = getId();
                     overheadLineService.saveDl(file[i], itemNames[i], id, projectId, itemTypes[i]);
                 }
+                if (itemTypes[i].equals("3")) {
+                    String id = getId();
+                    substationService.save(file[i], itemNames[i], id, projectId, itemTypes[i]);
+                }
             }
         } catch (RuntimeException e) {
             map.put("code",0);
@@ -118,6 +125,9 @@ public class ProjectTemController extends BaseController {
             if (type.equals("2")) {
                 overheadLineService.saveDl(file, projectName, id, projectId, type);
             }
+            if (type.equals("3")) {
+                substationService.save(file, projectName, id, projectId, type);
+            }
         } catch (RuntimeException e) {
             addMessage(redirectAttributes, "导入失败,"+e.getMessage());
             return "redirect:/a/project/tem/list?projectId="+projectId;

src/main/java/com/jeeplus/modules/sg/substation/util/SubstationInfo.java

@@ -274,9 +274,16 @@ public class SubstationInfo {
     public static String[] ZYSCJZSTR = {JZMX_ZYSCJZ,JZMX_ZKTXL,JZMX_1000JDS,JZMX_750JDS,JZMX_500JDS,JZMX_330JDS,JZMX_220JDS,JZMX_110JDS,JZMX_66JDS,JZMX_35JDS,JZMX_ZYPDZZS,JZMX_1000PDZZS,JZMX_750PDZZS,
             JZMX_500PDZZS,JZMX_330PDZZS,JZMX_220PDZZS,JZMX_110PDZZS,JZMX_66PDZZS,JZMX_35PDZZS,JZMX_10PDZZS,JZMX_GDCLBC,JZMX_KKGYDKQ,JZMX_KKCLBCZZ,JZMX_JZWGBCZZ};
 
+    //配电装置
     public static String[] PDZZJZWBS = {"21121000","2112B000","2112C000","2112D000","2112F000","2112G000","2112H000","2112J000","2112K000","2112L000","2112M000"};
     public static String[] PDZZJZSTR = {JZMX_ZBYQXT,JZMX_GYDKQXT,JZMX_CLBCXT,JZMX_DYDRQ,JZMX_DYDKQ,JZMX_JZWGBC,JZMX_ZYBYQXT,JZMX_BLZT,JZMX_DLGD,JZMX_LGJDP,JZMX_PDZZQY};
 
+    public static String[] KFJGSBWBS = {"21122100","21122200","21123100","21123200","21124100","21124200","21125100","21125200","21126100","21126200","21127100","21127200"
+            ,"21128100","21128200","21129100","21129200","2112A100","2112A200"};
+    public static String[] KFJGSBSTR = {JZMX_1000JGJC,JZMX_1000SBZJ,JZMX_750JGJC,JZMX_750SBZJ,JZMX_500JGJC,JZMX_500SBZJ,JZMX_330JGJC,JZMX_330SBZJ,JZMX_220JGJC,JZMX_220SBZJ,
+            JZMX_110JGJC,JZMX_110SBZJ,JZMX_66JGJC,JZMX_66SBZJ,JZMX_35JGJC,JZMX_35SBZJ,JZMX_10JGJC,JZMX_10SBZJ};
+
+
 
 
     //供水系统建筑
@@ -443,14 +450,19 @@ public class SubstationInfo {
     /**
      * 配电装置建筑基础数据
      */
-//    public static List<JkxlDetailFee> getPdzzjz(ImportExcel importExcel,ImportExcel importExcel1){
-//        JkxlDetailFee total = getBashInfo(importExcel,importExcel1,"21120000",JZMX_PDZZJZ);
-//        double[][] bashInfo = ExcelUtil.getBashArray(importExcel,PDZZJZSTR,2,new int[]{12,13, 14, 15, 17});
-//
-//
-//
-//
-//    }
+    public static List<JkxlDetailFee> getPdzzjz(ImportExcel importExcel,ImportExcel importExcel1){
+        JkxlDetailFee total = getBashInfo(importExcel,importExcel1,"21120000",JZMX_PDZZJZ);
+        double[][] bashInfo = ExcelUtil.getBashArray(importExcel,PDZZJZSTR,2,new int[]{12,13, 14, 15, 17});
+        List<JkxlDetailFee> kvjg = getBashInfo(importExcel,importExcel1,KFJGSBWBS,KFJGSBSTR);
+        for(int i=0;i<kvjg.size()/2;i++){
+
+        }
+
+
+
+     return null;
+
+    }
 
     /**
      * 控制直流