+ 施工单元功能

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

@@ -20,7 +20,6 @@ import com.huashe.common.domain.AjaxResult;
 import com.huashe.common.exception.ServiceException;
 import com.huashe.park.common.i18n.MessageUtils;
 import com.huashe.park.core.service.IConsUnitInfoService;
-import com.huashe.park.domain.dto.cons.ConsUnitHole;
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 import com.ruoyi.common.annotation.Log;
@@ -42,7 +41,6 @@ public class ConsUnitInfoController extends BaseController {
     @Autowired
     private IConsUnitInfoService consUnitInfoService;
 
-
     /**
      * 查询施工单元列表
      */
@@ -65,7 +63,7 @@ public class ConsUnitInfoController extends BaseController {
 
     @Log(title = "施工单元", businessType = BusinessType.EXPORT)
     @PostMapping("/import/cad")
-    public void importCad(@RequestBody ConsUnitHole consUnitInfo) {
+    public void importCad(@RequestBody ConsUnitInfo 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/mapper/ConsUnitInfoMapper.java

@@ -63,7 +63,6 @@ public interface ConsUnitInfoMapper {
 
     int hasChildById(Long id);
 
-    int hasHoleById(Long id);
 
     List<ConsUnitInfo> selectChildrenById(Long id);
 

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

@@ -59,5 +59,7 @@ public interface IConsPileHoleInfoService {
      */
     public int deleteConsPileHoleInfoById(Long id);
 
+    void deleteConsPileHoleInfoByConsUnitId(Long id);
+
     public void importConsPileHole(List<ConsPileHoleInfo> consPileHoleInfo);
 }

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

@@ -2,7 +2,6 @@ package com.huashe.park.core.service;
 
 import java.util.List;
 
-import com.huashe.park.domain.dto.cons.ConsUnitHole;
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 
@@ -55,8 +54,6 @@ public interface IConsUnitInfoService {
 
     boolean hasChildById(Long id);
 
-    boolean hasHoleById(Long id);
-
     /**
      * 删除施工单元信息
      * 
@@ -65,5 +62,5 @@ public interface IConsUnitInfoService {
      */
     int deleteConsUnitInfoById(Long id);
 
-    void importConsUnitHole(ConsUnitHole consUnitHole);
+    void importConsUnitHole(ConsUnitInfo consUnitHole);
 }

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

@@ -87,6 +87,11 @@ public class ConsPileHoleInfoServiceImpl implements IConsPileHoleInfoService {
     }
 
     @Override
+    public void deleteConsPileHoleInfoByConsUnitId(Long id) {
+        consPileHoleInfoMapper.deleteConsPileHoleInfoByConsUnitId(id);
+    }
+
+    @Override
     public void importConsPileHole(List<ConsPileHoleInfo> consPileHoleInfo) {
         consPileHoleInfoMapper.batchInsertConsPileHoleInfo(consPileHoleInfo);
     }

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

@@ -15,7 +15,6 @@ import com.huashe.park.core.mapper.ConsUnitInfoMapper;
 import com.huashe.park.core.service.IConsPileHoleInfoService;
 import com.huashe.park.core.service.IConsUnitInfoService;
 import com.huashe.park.core.service.IConsUnitMachineRelService;
-import com.huashe.park.domain.dto.cons.ConsUnitHole;
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsPileHoleInfo;
 import com.huashe.park.domain.entity.ConsUnitInfo;
@@ -147,11 +146,6 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
         return consUnitInfoMapper.hasChildById(id) > 0;
     }
 
-    @Override
-    public boolean hasHoleById(Long id) {
-        return consUnitInfoMapper.hasHoleById(id) > 0;
-    }
-
     /**
      * 删除施工单元信息
      * 
@@ -163,17 +157,18 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
         if (hasChildById(id)) {
             throw new ServiceException(MessageUtils.message("cons.unit.delete.no.child"));
         }
-        if (hasHoleById(id)) {
-            throw new ServiceException(MessageUtils.message("cons.unit.has.no.hole"));
-        }
+        pileHoleInfoService.deleteConsPileHoleInfoByConsUnitId(id);
+        consUnitMachineRelService.deleteConsUnitMachineRelByUnitId(id);
         return consUnitInfoMapper.deleteConsUnitInfoById(id);
     }
 
     @Override
-    public void importConsUnitHole(ConsUnitHole consUnitHole) {
+    public void importConsUnitHole(ConsUnitInfo consUnitHole) {
         int lastIndex = RuoYiConfig.getUploadPath().lastIndexOf("/");
         String filePath = consUnitHole.getFileId().replaceFirst(PROFILE,
             RuoYiConfig.getUploadPath().substring(0, lastIndex));
+        consUnitInfoMapper.updateConsUnitInfo(consUnitHole);
+        pileHoleInfoService.deleteConsPileHoleInfoByConsUnitId(consUnitHole.getId());
         excelHandle.importExcel(filePath, ConsPileHoleInfo.class, (data) -> {
             data.forEach((d) -> {
                 d.setConsUnitId(consUnitHole.getId());

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

@@ -118,11 +118,6 @@
         where parent_id = #{id} limit 1
     </select>
 
-    <select id="hasHoleById" parameterType="Long" resultType="int">
-        select count(1)
-        from cons_cons_unit_hole_rel
-        where hole_id = #{id} limit 1
-    </select>
     <select id="selectChildrenById" parameterType="Long" resultMap="ConsUnitInfoResult">
         select *
         from cons_cons_unit_info

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/dto/cons/ConsUnitHole.java

@@ -1,17 +0,0 @@
-package com.huashe.park.domain.dto.cons;
-
-import com.huashe.park.domain.entity.ConsUnitInfo;
-
-public class ConsUnitHole extends ConsUnitInfo {
-    private static final long serialVersionUID = 1L;
-
-    private String fileId;
-
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-
-    public String getFileId() {
-        return fileId;
-    }
-}

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

@@ -46,6 +46,8 @@ public class ConsUnitInfo extends BaseEntity {
 
     private Long projectId;
 
+    private String fileId;
+
     public Long getId() {
         return id;
     }
@@ -118,6 +120,14 @@ public class ConsUnitInfo extends BaseEntity {
         this.projectId = projectId;
     }
 
+    public String getFileId() {
+        return fileId;
+    }
+
+    public void setFileId(String fileId) {
+        this.fileId = fileId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())