+ 终端设计接口

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

@@ -148,6 +148,11 @@ public class PileMachineInfoController extends BaseController {
         return AjaxResult.success(pileMachineInfoService.qryMachineAssignedUnit(machineBiz.getMachineId()));
     }
 
+    @PostMapping("/terminal/constructionTargetObject")
+    public AjaxResult constructionTargetObject(@RequestBody MachineBiz machineBiz) {
+        return AjaxResult.success(pileMachineInfoService.machineUnitPileHole(machineBiz));
+    }
+
     /**
      * 删除施工桩机信息
      */

bd-park/park-backend/park-common/src/main/java/com/huashe/park/common/consts/enums/ConsStatus.java

@@ -0,0 +1,46 @@
+package com.huashe.park.common.consts.enums;
+
+/**
+ * The enum Cons status.
+ */
+public enum ConsStatus {
+    /**
+     * Cons status 00 cons status.
+     */
+    CONS_STATUS_00("00", "已施工"),
+    /**
+     * Cons status 02 cons status.
+     */
+    CONS_STATUS_02("02", "施工中"),
+    /**
+     * Cons status 01 cons status.
+     */
+    CONS_STATUS_01("01", "未施工");
+
+    private final String code;
+
+    private final String info;
+
+    ConsStatus(String code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    /**
+     * Gets code.
+     *
+     * @return the code
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * Gets info.
+     *
+     * @return the info
+     */
+    public String getInfo() {
+        return info;
+    }
+}

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/ConsPileHoleInfoMapper.java

@@ -29,6 +29,8 @@ public interface ConsPileHoleInfoMapper {
      */
     public List<ConsPileHoleInfo> selectConsPileHoleInfoList(ConsPileHoleInfo consPileHoleInfo);
 
+    public List<ConsPileHoleInfo> selectNonConsPileHoleInfo(ConsPileHoleInfo consPileHoleInfo);
+
     /**
      * 新增施工桩点信息
      *

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

@@ -27,6 +27,8 @@ public interface IConsPileHoleInfoService {
      */
     public List<ConsPileHoleInfo> selectConsPileHoleInfoList(ConsPileHoleInfo consPileHoleInfo);
 
+    List<ConsPileHoleInfo> selectNonConsPileHoleInfo(ConsPileHoleInfo consPileHoleInfo);
+
     /**
      * 新增施工桩点信息
      * 

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

@@ -3,6 +3,8 @@ package com.huashe.park.core.service;
 import java.util.List;
 
 import com.huashe.park.domain.dto.cons.ConsUnitMachine;
+import com.huashe.park.domain.dto.cons.MachineBiz;
+import com.huashe.park.domain.entity.ConsPileHoleInfo;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 
 /**
@@ -67,4 +69,5 @@ public interface IConsUnitInfoService {
     void importConsUnitHole(ConsUnitInfo consUnitHole);
 
     List<ConsUnitInfo> machineAssignedUnit(Long machineId);
+
 }

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

@@ -3,6 +3,8 @@ package com.huashe.park.core.service;
 import java.util.List;
 
 import com.huashe.park.domain.dto.cons.ConstUnitNode;
+import com.huashe.park.domain.dto.cons.MachineBiz;
+import com.huashe.park.domain.entity.ConsPileHoleInfo;
 import com.huashe.park.domain.entity.PileMachineInfo;
 
 /**
@@ -62,4 +64,6 @@ public interface IPileMachineInfoService {
 
 
     List<ConstUnitNode> qryMachineAssignedUnit(Long machineId);
+
+    List<ConsPileHoleInfo> machineUnitPileHole(MachineBiz machineBiz);
 }

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

@@ -42,6 +42,11 @@ public class ConsPileHoleInfoServiceImpl implements IConsPileHoleInfoService {
         return consPileHoleInfoMapper.selectConsPileHoleInfoList(consPileHoleInfo);
     }
 
+    @Override
+    public List<ConsPileHoleInfo> selectNonConsPileHoleInfo(ConsPileHoleInfo consPileHoleInfo) {
+        return consPileHoleInfoMapper.selectNonConsPileHoleInfo(consPileHoleInfo);
+    }
+
     /**
      * 新增施工桩点信息
      * 

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

@@ -1,5 +1,6 @@
 package com.huashe.park.core.service.impl;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -12,12 +13,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import com.huashe.common.exception.ServiceException;
+import com.huashe.park.common.consts.enums.ConsStatus;
 import com.huashe.park.common.i18n.MessageUtils;
 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.ConsUnitMachine;
+import com.huashe.park.domain.dto.cons.MachineBiz;
 import com.huashe.park.domain.entity.ConsPileHoleInfo;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 import com.huashe.park.domain.entity.ConsUnitMachineRel;
@@ -179,6 +182,8 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
         return consUnitInfoMapper.qryConsUnitInfoByIds(unitIds);
     }
 
+
+
     private void updateConsUnitChildren(Long id, String newAncestors, String oldAncestors) {
         List<ConsUnitInfo> children = consUnitInfoMapper.selectChildrenById(id);
         if (CollectionUtils.isEmpty(children)) {

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

@@ -8,14 +8,21 @@ import java.util.stream.Collectors;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.huashe.common.utils.StringUtils;
+import com.huashe.park.common.consts.enums.ConsStatus;
 import com.huashe.park.core.mapper.PileMachineInfoMapper;
+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.core.service.IPileMachineInfoService;
 import com.huashe.park.core.service.IProjectCoordinateInfoService;
 import com.huashe.park.domain.dto.cons.ConstUnitNode;
+import com.huashe.park.domain.dto.cons.MachineBiz;
+import com.huashe.park.domain.entity.ConsPileHoleInfo;
 import com.huashe.park.domain.entity.ConsUnitInfo;
+import com.huashe.park.domain.entity.ConsUnitMachineRel;
 import com.huashe.park.domain.entity.PileMachineInfo;
 import com.huashe.park.domain.entity.ProjectCoordinateInfo;
 
@@ -34,6 +41,12 @@ public class PileMachineInfoServiceImpl implements IPileMachineInfoService {
     private IConsUnitInfoService consUnitInfoService;
 
     @Autowired
+    private IConsUnitMachineRelService consUnitMachineRelService;
+
+    @Autowired
+    private IConsPileHoleInfoService pileHoleInfoService;
+
+    @Autowired
     private IProjectCoordinateInfoService projectCoordinateInfoService;
 
     /**
@@ -122,7 +135,27 @@ public class PileMachineInfoServiceImpl implements IPileMachineInfoService {
         return tree;
     }
 
-    public List<ConstUnitNode> buildConsUnitTree(List<ConstUnitNode> consUnitInfos) {
+    @Override
+    public List<ConsPileHoleInfo> machineUnitPileHole(MachineBiz machineBiz) {
+        List<ConsUnitMachineRel> consUnitMachineRels = consUnitMachineRelService
+            .selectConsUnitMachineRelList(new ConsUnitMachineRel() {
+                {
+                    setConsUnitId(machineBiz.getDesignId());
+                    setMachineId(machineBiz.getMachineId());
+                }
+            });
+        if (CollectionUtils.isEmpty(consUnitMachineRels)) {
+            return new ArrayList<>();
+        }
+        return pileHoleInfoService.selectNonConsPileHoleInfo(new ConsPileHoleInfo() {
+            {
+                setConsUnitId(machineBiz.getDesignId());
+                setConsStatus(ConsStatus.CONS_STATUS_00.getCode());
+            }
+        });
+    }
+
+    private List<ConstUnitNode> buildConsUnitTree(List<ConstUnitNode> consUnitInfos) {
         List<ConstUnitNode> returnList = new ArrayList<>();
         List<Long> tempList = consUnitInfos.stream().map(ConstUnitNode::getId).collect(Collectors.toList());
         for (ConstUnitNode dept : consUnitInfos) {

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

@@ -50,6 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="consStatus != null  and consStatus != ''"> and cons_status = #{consStatus}</if>
         </where>
     </select>
+
+    <select id="selectNonConsPileHoleInfo" parameterType="ConsPileHoleInfo" resultMap="ConsPileHoleInfoResult">
+        <include refid="selectConsPileHoleInfoVo"/>
+        <where>
+            <if test="consUnitId != null  and consUnitId != ''">and cons_unit_id = #{consUnitId}</if>
+            <if test="consStatus != null  and consStatus != ''">and cons_status != #{consStatus}</if>
+        </where>
+    </select>
     
     <select id="selectConsPileHoleInfoById" parameterType="Long" resultMap="ConsPileHoleInfoResult">
         <include refid="selectConsPileHoleInfoVo"/>