+ 施工单元，桩机关系

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

@@ -4,8 +4,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.utils.StringMatchUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -19,11 +17,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.huashe.common.domain.AjaxResult;
 import com.huashe.park.core.service.IConsUnitInfoService;
+import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringMatchUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 
 /**
@@ -67,11 +67,10 @@ public class ConsUnitInfoController extends BaseController {
     }
 
     @GetMapping("/list/exclude/{id}")
-    public AjaxResult excludeChild(@PathVariable(value = "id") Long consUnitId)
-    {
+    public AjaxResult excludeChild(@PathVariable(value = "id") Long consUnitId) {
         List<ConsUnitInfo> consUnitInfos = consUnitInfoService.selectConsUnitInfoList(new ConsUnitInfo());
-        consUnitInfos.removeIf(d -> d.getId().intValue() == consUnitId || ArrayUtils.contains(
-                StringMatchUtils.split(d.getAncestors(), ","), consUnitId + ""));
+        consUnitInfos.removeIf(d -> d.getId().intValue() == consUnitId
+            || ArrayUtils.contains(StringMatchUtils.split(d.getAncestors(), ","), consUnitId + ""));
         return success(consUnitInfos);
     }
 
@@ -80,7 +79,7 @@ public class ConsUnitInfoController extends BaseController {
      */
     @Log(title = "施工单元", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ConsUnitInfo consUnitInfo) {
+    public AjaxResult add(@RequestBody ConsUnitMachine consUnitInfo) {
         return toAjax(consUnitInfoService.insertConsUnitInfo(consUnitInfo));
     }
 
@@ -89,7 +88,7 @@ public class ConsUnitInfoController extends BaseController {
      */
     @Log(title = "施工单元", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ConsUnitInfo consUnitInfo) {
+    public AjaxResult edit(@RequestBody ConsUnitMachine consUnitInfo) {
         return toAjax(consUnitInfoService.updateConsUnitInfo(consUnitInfo));
     }
 

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

@@ -4,8 +4,12 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,13 +20,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.huashe.common.domain.AjaxResult;
+import com.huashe.park.common.i18n.MessageUtils;
+import com.huashe.park.core.service.IPileMachineInfoService;
+import com.huashe.park.domain.dto.cons.MachineLogin;
 import com.huashe.park.domain.entity.PileMachineInfo;
-import com.huashe.park.service.IPileMachineInfoService;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.TokenService;
 
 /**
  * 施工桩机信息Controller
@@ -36,6 +44,9 @@ public class PileMachineInfoController extends BaseController {
     @Autowired
     private IPileMachineInfoService pileMachineInfoService;
 
+    @Autowired
+    private TokenService tokenService;
+
     /**
      * 查询施工桩机信息列表
      */
@@ -95,6 +106,38 @@ public class PileMachineInfoController extends BaseController {
         return toAjax(pileMachineInfoService.updatePileMachineInfo(pileMachineInfo));
     }
 
+    @PostMapping("/terminal/login")
+    @Anonymous
+    public AjaxResult login(@RequestBody MachineLogin machineAuth) {
+        if (StringUtils.isEmpty(machineAuth.getSn()) || StringUtils.isEmpty(machineAuth.getNo())
+            || StringUtils.isEmpty(machineAuth.getPwd())) {
+            return AjaxResult.error(MessageUtils.message("machine.auth.param.error"));
+        }
+
+        List<PileMachineInfo> pileMachineInfos = pileMachineInfoService
+            .selectPileMachineInfoList(new PileMachineInfo() {
+                {
+                    setSn(machineAuth.getSn());
+                    setNo(machineAuth.getNo());
+                }
+            });
+        if (CollectionUtils.isEmpty(pileMachineInfos)) {
+            return AjaxResult.error(MessageUtils.message("machine.auth.param.none"));
+        }
+        PileMachineInfo pileMachineInfo = pileMachineInfos.get(0);
+        if (!pileMachineInfo.getPwd().equals(machineAuth.getPwd())) {
+            return AjaxResult.error(MessageUtils.message("machine.auth.param.none"));
+        }
+        UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(
+            pileMachineInfo.getSn(), pileMachineInfo.getPwd());
+        authenticationToken.setDetails(pileMachineInfo);
+        SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+        String token = tokenService.createToken(machineAuth);
+        pileMachineInfo.setToken(token);
+        // 生成token
+        return AjaxResult.success(pileMachineInfo);
+    }
+
     /**
      * 删除施工桩机信息
      */

bd-park/park-backend/park-application/src/main/resources/i18n/messages_en.properties

@@ -35,3 +35,5 @@ no.view.permission=您没有查看数据的权限，请联系管理员添加权
 cons.unit.modify.not.self=Failed to modify the construction unit {0}. The upper construction unit cannot be yourself.
 cons.unit.delete.no.child=There are lower-level construction units and deletion is not allowed.
 cons.unit.has.no.hole=The construction unit has a designed pile hole, which cannot be deleted.
+machine.auth.param.error=SN, NO, and PWD cannot be empty.
+machine.auth.param.none=Authentication failed, please check the parameters.

bd-park/park-backend/park-application/src/main/resources/i18n/messages_zh.properties

@@ -34,4 +34,6 @@ no.view.permission=您没有查看数据的权限，请联系管理员添加权
 ##cons
 cons.unit.modify.not.self=修改施工{0}单元失败，上级施工单元不能是自己。
 cons.unit.delete.no.child=存在下级施工单元，不允许删除。
-cons.unit.has.no.hole=施工单元存在设计桩孔，不允许删除。
+cons.unit.has.no.hole=施工单元存在设计桩孔，不允许删除。
+machine.auth.param.error=SN、NO、PWD不允许为空。
+machine.auth.param.none=认证失败，请检查参数。

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

@@ -0,0 +1,47 @@
+package com.huashe.park.common.consts.enums;
+
+/**
+ * The enum Cons unit type. //类型:0:目录;1:电子围栏;2:设计文件;
+ */
+public enum ConsUnitType {
+
+    /**
+     * Directory cons unit type.
+     */
+    DIRECTORY("0", "目录"),
+    /**
+     * Electronic fence cons unit type.
+     */
+    ELECTRONIC_FENCE("1", "电子围栏"),
+    /**
+     * Design file cons unit type.
+     */
+    DESIGN_FILE("2", "设计文件");
+
+    private final String code;
+
+    private final String info;
+
+    ConsUnitType(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/ConsUnitHoleRelMapper.java

@@ -0,0 +1,61 @@
+package com.huashe.park.core.mapper;
+
+import java.util.List;
+
+import com.huashe.park.domain.entity.ConsUnitHoleRel;
+
+/**
+ * 施工单元桩孔关系表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public interface ConsUnitHoleRelMapper {
+    /**
+     * 查询施工单元桩孔关系表
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 施工单元桩孔关系表
+     */
+    ConsUnitHoleRel selectConsUnitHoleRelById(Long id);
+
+    /**
+     * 查询施工单元桩孔关系表列表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 施工单元桩孔关系表集合
+     */
+    List<ConsUnitHoleRel> selectConsUnitHoleRelList(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 新增施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    int insertConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 修改施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    int updateConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 删除施工单元桩孔关系表
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 结果
+     */
+    int deleteConsUnitHoleRelById(Long id);
+
+    /**
+     * 批量删除施工单元桩孔关系表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteConsUnitHoleRelByIds(Long[] ids);
+}

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

@@ -1,24 +1,25 @@
 package com.huashe.park.core.mapper;
 
-import com.huashe.park.domain.entity.ConsUnitInfo;
-
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
+import com.huashe.park.domain.entity.ConsUnitInfo;
+
 /**
  * 施工单元Mapper接口
  * 
  * @author ruoyi
  * @date 2025-02-14
  */
-public interface ConsUnitInfoMapper 
-{
+public interface ConsUnitInfoMapper {
     /**
      * 查询施工单元
      * 
      * @param id 施工单元主键
      * @return 施工单元
      */
-    public ConsUnitInfo selectConsUnitInfoById(Long id);
+    ConsUnitInfo selectConsUnitInfoById(Long id);
 
     /**
      * 查询施工单元列表
@@ -26,7 +27,7 @@ public interface ConsUnitInfoMapper
      * @param consUnitInfo 施工单元
      * @return 施工单元集合
      */
-    public List<ConsUnitInfo> selectConsUnitInfoList(ConsUnitInfo consUnitInfo);
+    List<ConsUnitInfo> selectConsUnitInfoList(ConsUnitInfo consUnitInfo);
 
     /**
      * 新增施工单元
@@ -34,7 +35,7 @@ public interface ConsUnitInfoMapper
      * @param consUnitInfo 施工单元
      * @return 结果
      */
-    public int insertConsUnitInfo(ConsUnitInfo consUnitInfo);
+    int insertConsUnitInfo(ConsUnitInfo consUnitInfo);
 
     /**
      * 修改施工单元
@@ -42,7 +43,7 @@ public interface ConsUnitInfoMapper
      * @param consUnitInfo 施工单元
      * @return 结果
      */
-    public int updateConsUnitInfo(ConsUnitInfo consUnitInfo);
+    int updateConsUnitInfo(ConsUnitInfo consUnitInfo);
 
     /**
      * 删除施工单元
@@ -50,7 +51,7 @@ public interface ConsUnitInfoMapper
      * @param id 施工单元主键
      * @return 结果
      */
-    public int deleteConsUnitInfoById(Long id);
+    int deleteConsUnitInfoById(Long id);
 
     /**
      * 批量删除施工单元
@@ -58,11 +59,14 @@ public interface ConsUnitInfoMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteConsUnitInfoByIds(Long[] ids);
+    int deleteConsUnitInfoByIds(Long[] ids);
+
+    int hasChildById(Long id);
 
+    int hasHoleById(Long id);
 
-    public int hasChildById(Long id);
+    List<ConsUnitInfo> selectChildrenById(Long id);
 
-    public int hasHoleById(Long id);
+    int updateConstUnitChildren(@Param("consUnits") List<ConsUnitInfo> consUnits);
 
 }

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

@@ -0,0 +1,69 @@
+package com.huashe.park.core.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.huashe.park.domain.entity.ConsUnitMachineRel;
+
+/**
+ * 施工单元桩机关系Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public interface ConsUnitMachineRelMapper {
+    /**
+     * 查询施工单元桩机关系
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 施工单元桩机关系
+     */
+    ConsUnitMachineRel selectConsUnitMachineRelById(Long id);
+
+    /**
+     * 查询施工单元桩机关系列表
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 施工单元桩机关系集合
+     */
+    List<ConsUnitMachineRel> selectConsUnitMachineRelList(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 新增施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    int insertConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 修改施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    int updateConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 删除施工单元桩机关系
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 结果
+     */
+    int deleteConsUnitMachineRelById(Long id);
+
+    /**
+     * 批量删除施工单元桩机关系
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteConsUnitMachineRelByIds(Long[] ids);
+
+    int insertConsUnitMachineRelList(@Param("consUnitMachines") List<ConsUnitMachineRel> consUnitMachineRel);
+
+    int deleteConsUnitMachineRelByUnitId(Long id);
+
+    List<Long> qryConsUnitMachineRelByUnitId(Long id);
+}

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

@@ -0,0 +1,61 @@
+package com.huashe.park.core.service;
+
+import java.util.List;
+
+import com.huashe.park.domain.entity.ConsUnitHoleRel;
+
+/**
+ * 施工单元桩孔关系表Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public interface IConsUnitHoleRelService {
+    /**
+     * 查询施工单元桩孔关系表
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 施工单元桩孔关系表
+     */
+    ConsUnitHoleRel selectConsUnitHoleRelById(Long id);
+
+    /**
+     * 查询施工单元桩孔关系表列表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 施工单元桩孔关系表集合
+     */
+    List<ConsUnitHoleRel> selectConsUnitHoleRelList(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 新增施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    int insertConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 修改施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    int updateConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel);
+
+    /**
+     * 批量删除施工单元桩孔关系表
+     * 
+     * @param ids 需要删除的施工单元桩孔关系表主键集合
+     * @return 结果
+     */
+    int deleteConsUnitHoleRelByIds(Long[] ids);
+
+    /**
+     * 删除施工单元桩孔关系表信息
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 结果
+     */
+    int deleteConsUnitHoleRelById(Long id);
+}

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

@@ -2,6 +2,7 @@ package com.huashe.park.core.service;
 
 import java.util.List;
 
+import com.huashe.park.domain.dto.cons.ConsUnitMachine;
 import com.huashe.park.domain.entity.ConsUnitInfo;
 
 /**
@@ -17,7 +18,7 @@ public interface IConsUnitInfoService {
      * @param id 施工单元主键
      * @return 施工单元
      */
-    public ConsUnitInfo selectConsUnitInfoById(Long id);
+    ConsUnitMachine selectConsUnitInfoById(Long id);
 
     /**
      * 查询施工单元列表
@@ -25,7 +26,7 @@ public interface IConsUnitInfoService {
      * @param consUnitInfo 施工单元
      * @return 施工单元集合
      */
-    public List<ConsUnitInfo> selectConsUnitInfoList(ConsUnitInfo consUnitInfo);
+    List<ConsUnitInfo> selectConsUnitInfoList(ConsUnitInfo consUnitInfo);
 
     /**
      * 新增施工单元
@@ -33,7 +34,7 @@ public interface IConsUnitInfoService {
      * @param consUnitInfo 施工单元
      * @return 结果
      */
-    public int insertConsUnitInfo(ConsUnitInfo consUnitInfo);
+    int insertConsUnitInfo(ConsUnitMachine consUnitInfo);
 
     /**
      * 修改施工单元
@@ -41,7 +42,7 @@ public interface IConsUnitInfoService {
      * @param consUnitInfo 施工单元
      * @return 结果
      */
-    public int updateConsUnitInfo(ConsUnitInfo consUnitInfo);
+    int updateConsUnitInfo(ConsUnitMachine consUnitInfo);
 
     /**
      * 批量删除施工单元
@@ -49,9 +50,9 @@ public interface IConsUnitInfoService {
      * @param ids 需要删除的施工单元主键集合
      * @return 结果
      */
-    public int deleteConsUnitInfoByIds(Long[] ids);
+    int deleteConsUnitInfoByIds(Long[] ids);
 
-    public boolean hasChildById(Long id);
+    boolean hasChildById(Long id);
 
     boolean hasHoleById(Long id);
 
@@ -61,5 +62,5 @@ public interface IConsUnitInfoService {
      * @param id 施工单元主键
      * @return 结果
      */
-    public int deleteConsUnitInfoById(Long id);
+    int deleteConsUnitInfoById(Long id);
 }

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

@@ -0,0 +1,68 @@
+package com.huashe.park.core.service;
+
+import java.util.List;
+
+import com.huashe.park.domain.entity.ConsUnitMachineRel;
+
+/**
+ * 施工单元桩机关系Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public interface IConsUnitMachineRelService {
+    /**
+     * 查询施工单元桩机关系
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 施工单元桩机关系
+     */
+    ConsUnitMachineRel selectConsUnitMachineRelById(Long id);
+
+    /**
+     * 查询施工单元桩机关系列表
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 施工单元桩机关系集合
+     */
+    List<ConsUnitMachineRel> selectConsUnitMachineRelList(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 新增施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    int insertConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 修改施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    int updateConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel);
+
+    /**
+     * 批量删除施工单元桩机关系
+     * 
+     * @param ids 需要删除的施工单元桩机关系主键集合
+     * @return 结果
+     */
+    int deleteConsUnitMachineRelByIds(Long[] ids);
+
+    /**
+     * 删除施工单元桩机关系信息
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 结果
+     */
+    int deleteConsUnitMachineRelById(Long id);
+
+    int insertConsUnitMachineRelList(List<ConsUnitMachineRel> consUnitMachineRel);
+
+    int deleteConsUnitMachineRelByUnitId(Long id);
+
+    List<Long> qryConsUnitMachineRelByUnitId(Long id);
+
+}

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

@@ -1,24 +1,23 @@
-package com.huashe.park.service;
-
-import com.huashe.park.domain.entity.PileMachineInfo;
+package com.huashe.park.core.service;
 
 import java.util.List;
 
+import com.huashe.park.domain.entity.PileMachineInfo;
+
 /**
  * 施工桩机信息Service接口
  * 
  * @author ruoyi
  * @date 2025-02-12
  */
-public interface IPileMachineInfoService 
-{
+public interface IPileMachineInfoService {
     /**
      * 查询施工桩机信息
      * 
      * @param id 施工桩机信息主键
      * @return 施工桩机信息
      */
-    public PileMachineInfo selectPileMachineInfoById(Long id);
+    PileMachineInfo selectPileMachineInfoById(Long id);
 
     /**
      * 查询施工桩机信息列表
@@ -26,7 +25,7 @@ public interface IPileMachineInfoService
      * @param pileMachineInfo 施工桩机信息
      * @return 施工桩机信息集合
      */
-    public List<PileMachineInfo> selectPileMachineInfoList(PileMachineInfo pileMachineInfo);
+    List<PileMachineInfo> selectPileMachineInfoList(PileMachineInfo pileMachineInfo);
 
     /**
      * 新增施工桩机信息
@@ -34,7 +33,7 @@ public interface IPileMachineInfoService
      * @param pileMachineInfo 施工桩机信息
      * @return 结果
      */
-    public int insertPileMachineInfo(PileMachineInfo pileMachineInfo);
+    int insertPileMachineInfo(PileMachineInfo pileMachineInfo);
 
     /**
      * 修改施工桩机信息
@@ -42,7 +41,7 @@ public interface IPileMachineInfoService
      * @param pileMachineInfo 施工桩机信息
      * @return 结果
      */
-    public int updatePileMachineInfo(PileMachineInfo pileMachineInfo);
+    int updatePileMachineInfo(PileMachineInfo pileMachineInfo);
 
     /**
      * 批量删除施工桩机信息
@@ -50,7 +49,7 @@ public interface IPileMachineInfoService
      * @param ids 需要删除的施工桩机信息主键集合
      * @return 结果
      */
-    public int deletePileMachineInfoByIds(Long[] ids);
+    int deletePileMachineInfoByIds(Long[] ids);
 
     /**
      * 删除施工桩机信息信息
@@ -58,5 +57,5 @@ public interface IPileMachineInfoService
      * @param id 施工桩机信息主键
      * @return 结果
      */
-    public int deletePileMachineInfoById(Long id);
+    int deletePileMachineInfoById(Long id);
 }

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

@@ -0,0 +1,88 @@
+package com.huashe.park.core.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.huashe.park.core.mapper.ConsUnitHoleRelMapper;
+import com.huashe.park.core.service.IConsUnitHoleRelService;
+import com.huashe.park.domain.entity.ConsUnitHoleRel;
+
+/**
+ * 施工单元桩孔关系表Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+@Service
+public class ConsUnitHoleRelServiceImpl implements IConsUnitHoleRelService {
+    @Autowired
+    private ConsUnitHoleRelMapper consUnitHoleRelMapper;
+
+    /**
+     * 查询施工单元桩孔关系表
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 施工单元桩孔关系表
+     */
+    @Override
+    public ConsUnitHoleRel selectConsUnitHoleRelById(Long id) {
+        return consUnitHoleRelMapper.selectConsUnitHoleRelById(id);
+    }
+
+    /**
+     * 查询施工单元桩孔关系表列表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 施工单元桩孔关系表
+     */
+    @Override
+    public List<ConsUnitHoleRel> selectConsUnitHoleRelList(ConsUnitHoleRel consUnitHoleRel) {
+        return consUnitHoleRelMapper.selectConsUnitHoleRelList(consUnitHoleRel);
+    }
+
+    /**
+     * 新增施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    @Override
+    public int insertConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel) {
+        return consUnitHoleRelMapper.insertConsUnitHoleRel(consUnitHoleRel);
+    }
+
+    /**
+     * 修改施工单元桩孔关系表
+     * 
+     * @param consUnitHoleRel 施工单元桩孔关系表
+     * @return 结果
+     */
+    @Override
+    public int updateConsUnitHoleRel(ConsUnitHoleRel consUnitHoleRel) {
+        return consUnitHoleRelMapper.updateConsUnitHoleRel(consUnitHoleRel);
+    }
+
+    /**
+     * 批量删除施工单元桩孔关系表
+     * 
+     * @param ids 需要删除的施工单元桩孔关系表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsUnitHoleRelByIds(Long[] ids) {
+        return consUnitHoleRelMapper.deleteConsUnitHoleRelByIds(ids);
+    }
+
+    /**
+     * 删除施工单元桩孔关系表信息
+     * 
+     * @param id 施工单元桩孔关系表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsUnitHoleRelById(Long id) {
+        return consUnitHoleRelMapper.deleteConsUnitHoleRelById(id);
+    }
+}

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

@@ -2,14 +2,21 @@ package com.huashe.park.core.service.impl;
 
 import java.util.List;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import com.huashe.common.exception.ServiceException;
 import com.huashe.park.common.i18n.MessageUtils;
 import com.huashe.park.core.mapper.ConsUnitInfoMapper;
 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.entity.ConsUnitInfo;
+import com.huashe.park.domain.entity.ConsUnitMachineRel;
 
 /**
  * 施工单元Service业务层处理
@@ -23,6 +30,9 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
     @Autowired
     private ConsUnitInfoMapper consUnitInfoMapper;
 
+    @Autowired
+    private IConsUnitMachineRelService consUnitMachineRelService;
+
     /**
      * 查询施工单元
      * 
@@ -30,8 +40,14 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
      * @return 施工单元
      */
     @Override
-    public ConsUnitInfo selectConsUnitInfoById(Long id) {
-        return consUnitInfoMapper.selectConsUnitInfoById(id);
+    public ConsUnitMachine selectConsUnitInfoById(Long id) {
+        ConsUnitInfo consUnitInfo = consUnitInfoMapper.selectConsUnitInfoById(id);
+        List<Long> machineIds = consUnitMachineRelService.qryConsUnitMachineRelByUnitId(id);
+        // constUnitInfo 赋值 ConsUnitMachine
+        ConsUnitMachine result = new ConsUnitMachine();
+        BeanUtils.copyProperties(consUnitInfo, result);
+        result.setMachineId(machineIds);
+        return result;
     }
 
     /**
@@ -52,10 +68,15 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
      * @return 结果
      */
     @Override
-    public int insertConsUnitInfo(ConsUnitInfo consUnitInfo) {
+    @Transactional(rollbackFor = Exception.class)
+    public int insertConsUnitInfo(ConsUnitMachine consUnitInfo) {
+        // 处理施工单元信息
         ConsUnitInfo parentConsUnit = consUnitInfoMapper.selectConsUnitInfoById(consUnitInfo.getParentId());
         consUnitInfo.setAncestors(parentConsUnit.getAncestors() + "," + parentConsUnit.getId());
-        return consUnitInfoMapper.insertConsUnitInfo(consUnitInfo);
+        int cnt = consUnitInfoMapper.insertConsUnitInfo(consUnitInfo);
+        // 处理施工单元关联信息
+        handleMachine(consUnitInfo);
+        return cnt;
     }
 
     /**
@@ -65,11 +86,36 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
      * @return 结果
      */
     @Override
-    public int updateConsUnitInfo(ConsUnitInfo consUnitInfo) {
+    @Transactional(rollbackFor = Exception.class)
+    public int updateConsUnitInfo(ConsUnitMachine consUnitInfo) {
         if (consUnitInfo.getParentId().equals(consUnitInfo.getId())) {
             throw new ServiceException(MessageUtils.message("cons.unit.modify.not.self", consUnitInfo.getName()));
         }
-        return consUnitInfoMapper.updateConsUnitInfo(consUnitInfo);
+        ConsUnitMachine oldConsUnit = selectConsUnitInfoById(consUnitInfo.getId());
+        if (!consUnitInfo.getParentId().equals(oldConsUnit.getParentId())) {
+            ConsUnitInfo newParentConsUnit = consUnitInfoMapper.selectConsUnitInfoById(consUnitInfo.getParentId());
+            if (ObjectUtils.isNotEmpty(newParentConsUnit) && ObjectUtils.isNotEmpty(oldConsUnit)) {
+                String newAncestors = newParentConsUnit.getAncestors() + "," + newParentConsUnit.getId();
+                String oldAncestors = oldConsUnit.getAncestors();
+                consUnitInfo.setAncestors(newAncestors);
+                updateConsUnitChildren(consUnitInfo.getId(), newAncestors, oldAncestors);
+            }
+        }
+        int cnt = consUnitInfoMapper.updateConsUnitInfo(consUnitInfo);
+        // 判断oldConstUnit.machineId 和 consUnitInfo.machineId不相同，才调用handleMachine(consUnitInfo);
+        if (CollectionUtils.isEmpty(oldConsUnit.getMachineId())
+            && CollectionUtils.isEmpty(consUnitInfo.getMachineId())) {
+            return cnt;
+        }
+        if (!CollectionUtils.isEmpty(oldConsUnit.getMachineId())
+            && !CollectionUtils.isEmpty(consUnitInfo.getMachineId())) {
+            if (oldConsUnit.getMachineId().equals(consUnitInfo.getMachineId())) {
+                return cnt;
+            }
+        }
+
+        handleMachine(consUnitInfo);
+        return cnt;
     }
 
     /**
@@ -109,4 +155,33 @@ public class ConsUnitInfoServiceImpl implements IConsUnitInfoService {
         }
         return consUnitInfoMapper.deleteConsUnitInfoById(id);
     }
+
+    private void updateConsUnitChildren(Long id, String newAncestors, String oldAncestors) {
+        List<ConsUnitInfo> children = consUnitInfoMapper.selectChildrenById(id);
+        if (CollectionUtils.isEmpty(children)) {
+            return;
+        }
+        for (ConsUnitInfo child : children) {
+            child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
+        }
+        consUnitInfoMapper.updateConstUnitChildren(children);
+    }
+
+    private void handleMachine(ConsUnitMachine consUnitMachine) {
+        consUnitMachineRelService.deleteConsUnitMachineRelByUnitId(consUnitMachine.getId());
+        if (!CollectionUtils.isEmpty(consUnitMachine.getMachineId())) {
+            List<ConsUnitMachineRel> consUnitMachineRel = new java.util.ArrayList<>();
+            for (Long machineId : consUnitMachine.getMachineId()) {
+                consUnitMachineRel.add(new ConsUnitMachineRel() {
+                    {
+                        setConsUnitId(consUnitMachine.getId());
+                        setMachineId(machineId);
+                        // 存在更新问题，在施工单元换节点的时候存在不一致的场景
+                        // setUnitAncestors(consUnitMachine.getAncestors());
+                    }
+                });
+            }
+            consUnitMachineRelService.insertConsUnitMachineRelList(consUnitMachineRel);
+        }
+    }
 }

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

@@ -0,0 +1,101 @@
+package com.huashe.park.core.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.huashe.park.core.mapper.ConsUnitMachineRelMapper;
+import com.huashe.park.core.service.IConsUnitMachineRelService;
+import com.huashe.park.domain.entity.ConsUnitMachineRel;
+
+/**
+ * 施工单元桩机关系Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+@Service
+public class ConsUnitMachineRelServiceImpl implements IConsUnitMachineRelService {
+    @Autowired
+    private ConsUnitMachineRelMapper consUnitMachineRelMapper;
+
+    /**
+     * 查询施工单元桩机关系
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 施工单元桩机关系
+     */
+    @Override
+    public ConsUnitMachineRel selectConsUnitMachineRelById(Long id) {
+        return consUnitMachineRelMapper.selectConsUnitMachineRelById(id);
+    }
+
+    /**
+     * 查询施工单元桩机关系列表
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 施工单元桩机关系
+     */
+    @Override
+    public List<ConsUnitMachineRel> selectConsUnitMachineRelList(ConsUnitMachineRel consUnitMachineRel) {
+        return consUnitMachineRelMapper.selectConsUnitMachineRelList(consUnitMachineRel);
+    }
+
+    /**
+     * 新增施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    @Override
+    public int insertConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel) {
+        return consUnitMachineRelMapper.insertConsUnitMachineRel(consUnitMachineRel);
+    }
+
+    /**
+     * 修改施工单元桩机关系
+     * 
+     * @param consUnitMachineRel 施工单元桩机关系
+     * @return 结果
+     */
+    @Override
+    public int updateConsUnitMachineRel(ConsUnitMachineRel consUnitMachineRel) {
+        return consUnitMachineRelMapper.updateConsUnitMachineRel(consUnitMachineRel);
+    }
+
+    /**
+     * 批量删除施工单元桩机关系
+     * 
+     * @param ids 需要删除的施工单元桩机关系主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsUnitMachineRelByIds(Long[] ids) {
+        return consUnitMachineRelMapper.deleteConsUnitMachineRelByIds(ids);
+    }
+
+    /**
+     * 删除施工单元桩机关系信息
+     * 
+     * @param id 施工单元桩机关系主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsUnitMachineRelById(Long id) {
+        return consUnitMachineRelMapper.deleteConsUnitMachineRelById(id);
+    }
+
+    public int insertConsUnitMachineRelList(List<ConsUnitMachineRel> consUnitMachineRel) {
+        return consUnitMachineRelMapper.insertConsUnitMachineRelList(consUnitMachineRel);
+    }
+
+    public int deleteConsUnitMachineRelByUnitId(Long id) {
+        return consUnitMachineRelMapper.deleteConsUnitMachineRelByUnitId(id);
+    }
+
+    @Override
+    public List<Long> qryConsUnitMachineRelByUnitId(Long id) {
+        return consUnitMachineRelMapper.qryConsUnitMachineRelByUnitId(id);
+    }
+}

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

@@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.huashe.park.core.mapper.PileMachineInfoMapper;
+import com.huashe.park.core.service.IPileMachineInfoService;
 import com.huashe.park.domain.entity.PileMachineInfo;
-import com.huashe.park.service.IPileMachineInfoService;
 
 /**
  * 施工桩机信息Service业务层处理
@@ -50,6 +50,7 @@ public class PileMachineInfoServiceImpl implements IPileMachineInfoService {
      */
     @Override
     public int insertPileMachineInfo(PileMachineInfo pileMachineInfo) {
+        pileMachineInfo.setPwd(pileMachineInfo.getSn() + "381.2371");
         return pileMachineInfoMapper.insertPileMachineInfo(pileMachineInfo);
     }
 
@@ -61,6 +62,7 @@ public class PileMachineInfoServiceImpl implements IPileMachineInfoService {
      */
     @Override
     public int updatePileMachineInfo(PileMachineInfo pileMachineInfo) {
+        pileMachineInfo.setPwd(pileMachineInfo.getSn() + "381.2371");
         return pileMachineInfoMapper.updatePileMachineInfo(pileMachineInfo);
     }
 

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

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huashe.park.core.mapper.ConsUnitHoleRelMapper">
+
+    <resultMap type="ConsUnitHoleRel" id="ConsUnitHoleRelResult">
+        <result property="id" column="id"/>
+        <result property="holeId" column="hole_id"/>
+        <result property="consUnitId" column="cons_unit_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <sql id="selectConsUnitHoleRelVo">
+        select id, hole_id, cons_unit_id, update_time, create_time, create_by, update_by
+        from cons_cons_unit_hole_rel
+    </sql>
+
+    <select id="selectConsUnitHoleRelList" parameterType="ConsUnitHoleRel" resultMap="ConsUnitHoleRelResult">
+        <include refid="selectConsUnitHoleRelVo"/>
+        <where>
+            <if test="holeId != null ">and hole_id = #{holeId}</if>
+            <if test="consUnitId != null ">and cons_unit_id = #{consUnitId}</if>
+        </where>
+    </select>
+
+    <select id="selectConsUnitHoleRelById" parameterType="Long" resultMap="ConsUnitHoleRelResult">
+        <include refid="selectConsUnitHoleRelVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertConsUnitHoleRel" parameterType="ConsUnitHoleRel" useGeneratedKeys="true" keyProperty="id">
+        insert into cons_cons_unit_hole_rel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="holeId != null">hole_id,</if>
+            <if test="consUnitId != null">cons_unit_id,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="holeId != null">#{holeId},</if>
+            <if test="consUnitId != null">#{consUnitId},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+        </trim>
+    </insert>
+
+    <update id="updateConsUnitHoleRel" parameterType="ConsUnitHoleRel">
+        update cons_cons_unit_hole_rel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="holeId != null">hole_id = #{holeId},</if>
+            <if test="consUnitId != null">cons_unit_id = #{consUnitId},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteConsUnitHoleRelById" parameterType="Long">
+        delete
+        from cons_cons_unit_hole_rel
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteConsUnitHoleRelByIds" parameterType="String">
+        delete from cons_cons_unit_hole_rel where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -1,34 +1,49 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huashe.park.core.mapper.ConsUnitInfoMapper">
-    
+
     <resultMap type="ConsUnitInfo" id="ConsUnitInfoResult">
-        <result property="id"    column="id"    />
-        <result property="penningType"    column="penning_type"    />
-        <result property="type"    column="type"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="createType"    column="create_type"    />
-        <result property="classifyType"    column="classify_type"    />
-        <result property="name"    column="name"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="id" column="id"/>
+        <result property="penningType" column="penning_type"/>
+        <result property="type" column="type"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="createType" column="create_type"/>
+        <result property="classifyType" column="classify_type"/>
+        <result property="name" column="name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="projectId" column="project_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
     </resultMap>
 
     <sql id="selectConsUnitInfoVo">
-        select id, penning_type, type, parent_id, create_type, classify_type, name, update_time, create_time, create_by, update_by from cons_cons_unit_info
+        select id,
+               penning_type,
+               type,
+               parent_id,
+               create_type,
+               classify_type,
+               name,
+               ancestors,
+               project_id,
+               update_time,
+               create_time,
+               create_by,
+               update_by
+        from cons_cons_unit_info
     </sql>
 
     <select id="selectConsUnitInfoList" parameterType="ConsUnitInfo" resultMap="ConsUnitInfoResult">
         <include refid="selectConsUnitInfoVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectConsUnitInfoById" resultMap="ConsUnitInfoResult">
         <include refid="selectConsUnitInfoVo"/>
         where id = #{id}
@@ -43,11 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createType != null">create_type,</if>
             <if test="classifyType != null">classify_type,</if>
             <if test="name != null and name != ''">name,</if>
+            <if test="ancestors != null and ancestors!=''">ancestors,</if>
+            <if test="projectId != null">update_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="penningType != null">#{penningType},</if>
             <if test="type != null">#{type},</if>
@@ -55,11 +72,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createType != null">#{createType},</if>
             <if test="classifyType != null">#{classifyType},</if>
             <if test="name != null and name != ''">#{name},</if>
+            <if test="ancestors != null and ancestors!=''">#{ancestors},</if>
+            <if test="projectId != null">#{projectId},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateConsUnitInfo" parameterType="ConsUnitInfo">
@@ -71,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createType != null">create_type = #{createType},</if>
             <if test="classifyType != null">classify_type = #{classifyType},</if>
             <if test="name != null and name != ''">name = #{name},</if>
+            <if test="ancestors != null and ancestors!=''">ancestors = #{ancestors},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -79,24 +100,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteConsUnitInfoById" >
-        delete from cons_cons_unit_info where id = #{id}
+    <delete id="deleteConsUnitInfoById">
+        delete
+        from cons_cons_unit_info
+        where id = #{id}
     </delete>
 
     <delete id="deleteConsUnitInfoByIds" parameterType="Long">
-        delete from cons_cons_unit_info where id in 
+        delete from cons_cons_unit_info where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
     <select id="hasChildById" parameterType="Long" resultType="int">
-        select count(1) from cons_cons_unit_info
+        select count(1)
+        from cons_cons_unit_info
         where parent_id = #{id} limit 1
     </select>
 
     <select id="hasHoleById" parameterType="Long" resultType="int">
-        select count(1) from cons_cons_unit_hole_rel
+        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
+        where find_in_set(#{id}, ancestors)
+    </select>
+
+    <update id="updateConstUnitChildren" parameterType="java.util.List">
+        update cons_cons_unit_info set ancestors =
+        <foreach collection="consUnits" item="item" index="index"
+                 separator=" " open="case id" close="end">
+            when #{item.id} then #{item.ancestors}
+        </foreach>
+        where id in
+        <foreach collection="consUnits" item="item" index="index"
+                 separator="," open="(" close=")">
+            #{item.id}
+        </foreach>
+    </update>
 </mapper>

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huashe.park.core.mapper.ConsUnitMachineRelMapper">
+
+    <resultMap type="ConsUnitMachineRel" id="ConsUnitMachineRelResult">
+        <result property="id" column="id"/>
+        <result property="consUnitId" column="cons_unit_id"/>
+        <result property="machineId" column="machine_id"/>
+        <result property="unitAncestors" column="unit_ancestors"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+    </resultMap>
+
+    <sql id="selectConsUnitMachineRelVo">
+        select id,
+               cons_unit_id,
+               machine_id,
+               unit_ancestors,
+               update_time,
+               create_time,
+               create_by,
+               update_by
+        from cons_cons_unit_machine_rel
+    </sql>
+
+    <select id="selectConsUnitMachineRelList" parameterType="ConsUnitMachineRel" resultMap="ConsUnitMachineRelResult">
+        <include refid="selectConsUnitMachineRelVo"/>
+        <where>
+        </where>
+    </select>
+
+    <select id="selectConsUnitMachineRelById" parameterType="Long" resultMap="ConsUnitMachineRelResult">
+        <include refid="selectConsUnitMachineRelVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertConsUnitMachineRel" parameterType="ConsUnitMachineRel" useGeneratedKeys="true" keyProperty="id">
+        insert into cons_cons_unit_machine_rel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="consUnitId != null">cons_unit_id,</if>
+            <if test="machineId != null">machine_id,</if>
+            <if test="unitAncestors != null">unit_ancestors,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="consUnitId != null">#{consUnitId},</if>
+            <if test="machineId != null">#{machineId},</if>
+            <if test="unitAncestors != null">#{unitAncestors},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+        </trim>
+    </insert>
+
+    <update id="updateConsUnitMachineRel" parameterType="ConsUnitMachineRel">
+        update cons_cons_unit_machine_rel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="consUnitId != null">cons_unit_id = #{consUnitId},</if>
+            <if test="machineId != null">machine_id = #{machineId},</if>
+            <if test="unitAncestors != null">unit_ancestors = #{unitAncestors},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteConsUnitMachineRelById" parameterType="Long">
+        delete
+        from cons_cons_unit_machine_rel
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteConsUnitMachineRelByIds" parameterType="String">
+        delete from cons_cons_unit_machine_rel where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <insert id="insertConsUnitMachineRelList" parameterType="List">
+        INSERT INTO cons_cons_unit_machine_rel (cons_unit_id,
+        machine_id,
+        unit_ancestors,
+        update_time,
+        create_time)
+        VALUES
+        <foreach collection="consUnitMachines" item="item" separator=",">
+            (
+            #{item.consUnitId},
+            #{item.machineId},
+            #{item.unitAncestors},
+            now(),
+            now()
+            )
+        </foreach>
+    </insert>
+    <delete id="deleteConsUnitMachineRelByUnitId" parameterType="Long">
+        delete
+        from cons_cons_unit_machine_rel
+        where cons_unit_id = #{id}
+    </delete>
+
+    <select id="qryConsUnitMachineRelByUnitId" parameterType="Long" resultType="Long">
+        select machine_id
+        from cons_cons_unit_machine_rel
+        where cons_unit_id = #{id}
+    </select>
+</mapper>

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

@@ -8,6 +8,9 @@
         <result property="id" column="id"/>
         <result property="machineNum" column="machine_num"/>
         <result property="equipment" column="equipment"/>
+        <result property="no" column="no"/>
+        <result property="pwd" column="pwd"/>
+        <result property="sn" column="sn"/>
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
@@ -15,7 +18,9 @@
     </resultMap>
 
     <sql id="selectPileMachineInfoVo">
-        select id, machine_num, equipment, update_time, create_time, create_by, update_by
+        select id,
+               machine_num,
+               equipment, no, pwd, sn, update_time, create_time, create_by, update_by
         from cons_pile_machine_info
     </sql>
 
@@ -24,6 +29,9 @@
         <where>
             <if test="machineNum != null  and machineNum != ''">and machine_num = #{machineNum}</if>
             <if test="equipment != null  and equipment != ''">and equipment = #{equipment}</if>
+            <if test="no != null  and no != ''">and no = #{no}</if>
+            <if test="pwd != null  and pwd != ''">and pwd = #{pwd}</if>
+            <if test="sn != null  and sn != ''">and sn = #{sn}</if>
         </where>
     </select>
 
@@ -37,6 +45,9 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="machineNum != null and machineNum != ''">machine_num,</if>
             <if test="equipment != null and equipment != ''">equipment,</if>
+            <if test="no !=null and no !='' ">no,</if>
+            <if test="pwd != null and pwd != ''">pwd,</if>
+            <if test="sn != null and sn != ''">sn,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
@@ -45,6 +56,9 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="machineNum != null and machineNum != ''">#{machineNum},</if>
             <if test="equipment != null and equipment != ''">#{equipment},</if>
+            <if test="no !=null and no !='' ">#{no},</if>
+            <if test="pwd != null and pwd != ''">#{pwd},</if>
+            <if test="sn != null and sn != ''">#{sn},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -57,6 +71,9 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="machineNum != null and machineNum != ''">machine_num = #{machineNum},</if>
             <if test="equipment != null and equipment != ''">equipment = #{equipment},</if>
+            <if test="no !=null and no !='' ">no = #{no},</if>
+            <if test="pwd != null and pwd != ''">pwd = #{pwd},</if>
+            <if test="sn != null and sn != ''">sn = #{sn},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

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

@@ -34,6 +34,10 @@
             <groupId>org.locationtech.jts</groupId>
             <artifactId>jts-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.huashe.application</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,19 @@
+package com.huashe.park.domain.dto.cons;
+
+import java.util.List;
+
+import com.huashe.park.domain.entity.ConsUnitInfo;
+
+public class ConsUnitMachine extends ConsUnitInfo {
+    private static final long serialVersionUID = 1L;
+
+    private List<Long> machineId;
+
+    public List<Long> getMachineId() {
+        return machineId;
+    }
+
+    public void setMachineId(List<Long> machineId) {
+        this.machineId = machineId;
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.huashe.park.domain.dto.cons;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.common.core.domain.model.LoginUser;
+
+public class MachineLogin extends LoginUser {
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("sn")
+    private String sn;
+
+    @JsonProperty("pwd")
+    private String pwd;
+
+    @JsonProperty("no")
+    private String no;
+
+    @JsonProperty("x")
+    private Double x;
+
+    @JsonProperty("y")
+    private Double y;
+
+    @JsonProperty("constructionType")
+    private Integer constructionType;
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public Double getX() {
+        return x;
+    }
+
+    public void setX(Double x) {
+        this.x = x;
+    }
+
+    public Double getY() {
+        return y;
+    }
+
+    public void setY(Double y) {
+        this.y = y;
+    }
+
+    public Integer getConstructionType() {
+        return constructionType;
+    }
+
+    public void setConstructionType(Integer constructionType) {
+        this.constructionType = constructionType;
+    }
+
+    @Override
+    public String getUsername() {
+        return this.sn;
+    }
+
+    @Override
+    public String getPassword() {
+        return this.pwd;
+    }
+}

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

@@ -1,11 +1,14 @@
 package com.huashe.park.domain.entity;
 
 import java.util.Date;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.huashe.common.annotation.Excel;
 import com.huashe.common.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 施工桩点信息对象 cons_pile_hole_info
@@ -21,16 +24,27 @@ public class ConsPileHoleInfo extends BaseEntity {
 
     /** 桩点编号 */
     @Excel(name = "桩点编号")
+    @JSONField(name = "name")
     private String holeNum;
 
+    /**
+     * //类型： CFG桩-200， 旋挖钻-203， 振动沉管碎石桩-210 ， 潜孔钻-211， 静压桩-202， 光伏桩-201， 插板桩-206， 灰土挤密桩-20
+     */
+    private Integer type = 200;
+
     /** dx */
     @Excel(name = "dx")
+    @JSONField(name = "x")
     private Double deltaX;
 
     /** dy */
     @Excel(name = "dy")
+    @JSONField(name = "y")
     private Double deltaY;
 
+    @JSONField(name = "z")
+    private Double deltaZ = 0D;
+
     /** 经度 */
     @Excel(name = "经度")
     private Double lng;
@@ -55,6 +69,7 @@ public class ConsPileHoleInfo extends BaseEntity {
 
     /** 设计深度 */
     @Excel(name = "设计深度")
+    @JSONField(name = "len")
     private Long desDept;
 
     /** 桩径 */
@@ -149,6 +164,22 @@ public class ConsPileHoleInfo extends BaseEntity {
         return diameter;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Double getDeltaZ() {
+        return deltaZ;
+    }
+
+    public void setDeltaZ(Double deltaZ) {
+        this.deltaZ = deltaZ;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())

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

@@ -0,0 +1,60 @@
+package com.huashe.park.domain.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
+
+/**
+ * 施工单元桩孔关系表对象 cons_cons_unit_hole_rel
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public class ConsUnitHoleRel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 桩孔id */
+    @Excel(name = "桩孔id")
+    private Long holeId;
+
+    /** 施工单元id */
+    @Excel(name = "施工单元id")
+    private Long consUnitId;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setHoleId(Long holeId) {
+        this.holeId = holeId;
+    }
+
+    public Long getHoleId() {
+        return holeId;
+    }
+
+    public void setConsUnitId(Long consUnitId) {
+        this.consUnitId = consUnitId;
+    }
+
+    public Long getConsUnitId() {
+        return consUnitId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("holeId", getHoleId()).append("consUnitId", getConsUnitId()).append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

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

@@ -24,7 +24,7 @@ public class ConsUnitInfo extends BaseEntity {
 
     /** 类型 */
     @Excel(name = "类型")
-    private Integer type;
+    private String type;
 
     /** 父节点 */
     @Excel(name = "父节点")
@@ -62,12 +62,12 @@ public class ConsUnitInfo extends BaseEntity {
         return penningType;
     }
 
-    public void setType(Integer type) {
-        this.type = type;
+    public String getType() {
+        return type;
     }
 
-    public Integer getType() {
-        return type;
+    public void setType(String type) {
+        this.type = type;
     }
 
     public void setParentId(Long parentId) {

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

@@ -0,0 +1,73 @@
+package com.huashe.park.domain.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
+
+/**
+ * 施工单元桩机关系对象 cons_cons_unit_machine_rel
+ * 
+ * @author ruoyi
+ * @date 2025-02-17
+ */
+public class ConsUnitMachineRel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 桩孔id */
+    @Excel(name = "桩孔id")
+    private Long consUnitId;
+
+    /** 施工单元id */
+    @Excel(name = "施工单元id")
+    private Long machineId;
+
+    /** 祖级id */
+    @Excel(name = "祖级id")
+    private String unitAncestors;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setConsUnitId(Long consUnitId) {
+        this.consUnitId = consUnitId;
+    }
+
+    public Long getConsUnitId() {
+        return consUnitId;
+    }
+
+    public void setMachineId(Long machineId) {
+        this.machineId = machineId;
+    }
+
+    public Long getMachineId() {
+        return machineId;
+    }
+
+    public void setUnitAncestors(String unitAncestors) {
+        this.unitAncestors = unitAncestors;
+    }
+
+    public String getUnitAncestors() {
+        return unitAncestors;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("consUnitId", getConsUnitId()).append("machineId", getMachineId())
+            .append("unitAncestors", getUnitAncestors()).append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

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

@@ -1,18 +1,20 @@
 package com.huashe.park.domain.entity;
 
-import com.huashe.common.annotation.Excel;
-import com.huashe.common.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
+
 /**
  * 施工桩机信息对象 cons_pile_machine_info
  * 
  * @author ruoyi
  * @date 2025-02-12
  */
-public class PileMachineInfo extends BaseEntity
-{
+public class PileMachineInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
@@ -26,44 +28,165 @@ public class PileMachineInfo extends BaseEntity
     @Excel(name = "设备信息")
     private String equipment;
 
-    public void setId(Long id) 
-    {
+    private String no;
+
+    @JsonIgnore
+    private String pwd;
+
+    private String sn;
+
+    @JsonProperty("token")
+    private String token;
+
+    @JsonProperty("serverHost")
+    private String serverHost;
+
+    @JsonProperty("serverPort")
+    private String serverPort;
+
+    @JsonProperty("serverUserName")
+    private String serverUserName;
+
+    @JsonProperty("serverPassword")
+    private String serverPassword;
+
+    @JsonProperty("topic")
+    private String topic;
+
+    @JsonProperty("constructionP4")
+    private String constructionP4;
+
+    @JsonProperty("productKey")
+    private String productKey;
+
+    @JsonProperty("deviceSecret")
+    private String deviceSecret;
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
-    public void setMachineNum(String machineNum) 
-    {
+
+    public void setMachineNum(String machineNum) {
         this.machineNum = machineNum;
     }
 
-    public String getMachineNum() 
-    {
+    public String getMachineNum() {
         return machineNum;
     }
-    public void setEquipment(String equipment) 
-    {
+
+    public void setEquipment(String equipment) {
         this.equipment = equipment;
     }
 
-    public String getEquipment() 
-    {
+    public String getEquipment() {
         return equipment;
     }
 
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    public String getSn() {
+        return sn;
+    }
+
+    public void setSn(String sn) {
+        this.sn = sn;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getServerHost() {
+        return serverHost;
+    }
+
+    public void setServerHost(String serverHost) {
+        this.serverHost = serverHost;
+    }
+
+    public String getServerPort() {
+        return serverPort;
+    }
+
+    public void setServerPort(String serverPort) {
+        this.serverPort = serverPort;
+    }
+
+    public String getServerUserName() {
+        return serverUserName;
+    }
+
+    public void setServerUserName(String serverUserName) {
+        this.serverUserName = serverUserName;
+    }
+
+    public String getServerPassword() {
+        return serverPassword;
+    }
+
+    public void setServerPassword(String serverPassword) {
+        this.serverPassword = serverPassword;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public String getConstructionP4() {
+        return constructionP4;
+    }
+
+    public void setConstructionP4(String constructionP4) {
+        this.constructionP4 = constructionP4;
+    }
+
+    public String getProductKey() {
+        return productKey;
+    }
+
+    public void setProductKey(String productKey) {
+        this.productKey = productKey;
+    }
+
+    public String getDeviceSecret() {
+        return deviceSecret;
+    }
+
+    public void setDeviceSecret(String deviceSecret) {
+        this.deviceSecret = deviceSecret;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("machineNum", getMachineNum())
-            .append("equipment", getEquipment())
-            .append("updateTime", getUpdateTime())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("machineNum", getMachineNum()).append("equipment", getEquipment())
+            .append("updateTime", getUpdateTime()).append("createTime", getCreateTime())
+            .append("createBy", getCreateBy()).append("updateBy", getUpdateBy()).toString();
     }
 }