+ 设计文件解析

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsUnitInfoController.java

@@ -42,6 +42,7 @@ public class ConsUnitInfoController extends BaseController {
     @Autowired
     private IConsUnitInfoService consUnitInfoService;
 
+
     /**
      * 查询施工单元列表
      */
@@ -64,7 +65,7 @@ public class ConsUnitInfoController extends BaseController {
 
     @Log(title = "施工单元", businessType = BusinessType.EXPORT)
     @PostMapping("/import/cad")
-    public void importCad(ConsUnitHole consUnitInfo) {
+    public void importCad(@RequestBody ConsUnitHole consUnitInfo) {
         if (StringUtils.isEmpty(consUnitInfo.getFileId())) {
             throw new ServiceException(MessageUtils.message("common.not.null", "file id"));
         }

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ConsUnitInfoServiceImpl.java

@@ -44,6 +44,8 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
     @Autowired
     private ExcelHandle excelHandle;
 
+    private final static String PROFILE = "/profile";
+
     /**
      * 查询施工单元
      * 
@@ -169,7 +171,9 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
 
     @Override
     public void importConsUnitHole(ConsUnitHole consUnitHole) {
-        String filePath = consUnitHole.getFileId().replaceFirst(RuoYiConfig.getProfile(), RuoYiConfig.getUploadPath());
+        int lastIndex = RuoYiConfig.getUploadPath().lastIndexOf("/");
+        String filePath = consUnitHole.getFileId().replaceFirst(PROFILE,
+            RuoYiConfig.getUploadPath().substring(0, lastIndex));
         excelHandle.importExcel(filePath, ConsPileHoleInfo.class, (data) -> {
             data.forEach((d) -> {
                 d.setConsUnitId(consUnitHole.getId());

bd-park/park-backend/park-core/src/main/resources/mapper/cons/ConsPileHoleInfoMapper.xml

@@ -106,23 +106,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         diameter,
         cons_unit_id,
         update_time,
-        create_time,
-        create_by,
-        update_by
+        create_time
         )
         values
         <foreach collection="list" item="item" open="(" close=")" separator=",">
-            #{hole_num},
-            #{delta_x},
-            #{delta_y},
-            #{lng},
-            #{lat},
-            #{cons_status},
-            #{start_time},
-            #{end_time},
-            #{des_dept},
-            #{diameter},
-            #{cons_unit_id},
+            #{item.holeNum},
+            #{item.deltaX},
+            #{item.deltaY},
+            #{item.lng},
+            #{item.lat},
+            #{item.consStatus},
+            #{item.startTime},
+            #{item.endTime},
+            #{item.desDept},
+            #{item.diameter},
+            #{item.consUnitId},
             now(),
             now()
         </foreach>

bd-park/park-backend/park-domain/pom.xml

@@ -38,6 +38,12 @@
             <groupId>com.huashe.application</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.idev.excel</groupId>
+            <artifactId>fastexcel-core</artifactId>
+            <version>1.1.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ConsPileHoleInfo.java

@@ -2,6 +2,7 @@ package com.huashe.park.domain.entity;
 
 import java.util.Date;
 
+import cn.idev.excel.annotation.ExcelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -35,14 +36,17 @@ public class ConsPileHoleInfo extends BaseEntity {
     /** dx */
     @Excel(name = "dx")
     @JSONField(name = "x")
+    @ExcelProperty(index = 0)
     private Double deltaX;
 
     /** dy */
     @Excel(name = "dy")
     @JSONField(name = "y")
+    @ExcelProperty(index = 1)
     private Double deltaY;
 
     @JSONField(name = "z")
+    @ExcelProperty(index = 2)
     private Double deltaZ = 0D;
 
     /** 经度 */
@@ -55,6 +59,7 @@ public class ConsPileHoleInfo extends BaseEntity {
 
     /** 施工状态 */
     @Excel(name = "施工状态")
+    @ExcelProperty(index = 3)
     private String consStatus;
 
     /** 开始时间 */

bd-park/park-backend/park-infrastructure/src/main/java/com/huashe/park/infrastructure/excel/ExcelHandle.java

@@ -10,6 +10,6 @@ public class ExcelHandle {
     public <T> void importExcel(String filePath, Class<T> clz, IPageDataConsumer<T> pageDataHandle) {
         // 这里默认每次会读取100条数据 然后返回过来 直接调用使用数据就行
         // 具体需要返回多少行可以在`PageReadListener`的构造函数设置
-        FastExcel.read(filePath, clz, new PageReadListener<T>(pageDataHandle::accept)).sheet().doRead();
+        FastExcel.read(filePath, clz, new PageReadListener<T>(pageDataHandle::accept, 100)).sheet().doRead();
     }
 }