Browse Source

+ 桩机指令下发

chen.cheng 5 months ago
parent
commit
5a0c4b457e
16 changed files with 953 additions and 21 deletions
  1. 0 18
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/CustMybatisCfg.java
  2. 1 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/MybatisInterceptor.java
  3. 1 1
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/RegisterCustomerInterceptor.java
  4. 98 0
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsMachineCmdHisController.java
  5. 107 0
      bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/PileMachineInfoController.java
  6. 1 1
      bd-park/park-backend/park-application/src/main/resources/application-druid.yml
  7. 62 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/ConsMachineCmdHisMapper.java
  8. 62 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/PileMachineInfoMapper.java
  9. 62 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IConsMachineCmdHisService.java
  10. 62 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IPileMachineInfoService.java
  11. 94 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ConsMachineCmdHisServiceImpl.java
  12. 88 0
      bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/PileMachineInfoServiceImpl.java
  13. 93 0
      bd-park/park-backend/park-core/src/main/resources/mapper/cons/ConsMachineCmdHisMapper.xml
  14. 80 0
      bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileMachineInfoMapper.xml
  15. 73 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ConsMachineCmdHis.java
  16. 69 0
      bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/PileMachineInfo.java

+ 0 - 18
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/CustMybatisCfg.java

@@ -1,18 +0,0 @@
-package com.huashe.park.application.mybatis;
-
-import org.mybatis.spring.boot.autoconfigure.ConfigurationCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class CustMybatisCfg {
-    @Bean
-    public ConfigurationCustomizer mybatisConfigurationCustomizer(){
-        return new ConfigurationCustomizer() {
-            @Override
-            public void customize(org.apache.ibatis.session.Configuration configuration) {
-                configuration.setObjectWrapperFactory(new MapWrapperFactory());
-            }
-        };
-    }
-}

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/MybatisInterceptor.java

@@ -54,7 +54,7 @@ public class MybatisInterceptor implements Interceptor {
                             if (sysUser != null) {
                                 // 登录人账号
                                 field.setAccessible(true);
-                                field.set(parameter, sysUser.getUserId());
+                                field.set(parameter, sysUser.getUserId().toString());
                                 field.setAccessible(false);
                             }
                         }

+ 1 - 1
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/mybatis/RegisterCustomerInterceptor.java

@@ -22,9 +22,9 @@ public class RegisterCustomerInterceptor implements ApplicationListener<ContextR
     @Override
     public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
         for (SqlSessionFactory factory : sqlSessionFactories) {
+            factory.getConfiguration().setObjectWrapperFactory(new MapWrapperFactory());
             // 由于mybatis拦截器使用责任链模式,有可能会导致自定义拦截器失效,因此下面方法可以将自定义拦截器重新注入到sql中
             factory.getConfiguration().addInterceptor(mybatisInterceptor);
-            factory.getConfiguration().setObjectWrapperFactory(new MapWrapperFactory());
         }
     }
 }

+ 98 - 0
bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/cons/ConsMachineCmdHisController.java

@@ -0,0 +1,98 @@
+package com.huashe.park.application.web.controller.cons;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.park.core.service.IConsMachineCmdHisService;
+import com.huashe.park.domain.entity.ConsMachineCmdHis;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 桩机指令下发历史Controller
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+@RestController
+@RequestMapping("/cons/machineCmdHis")
+public class ConsMachineCmdHisController extends BaseController {
+    @Autowired
+    private IConsMachineCmdHisService consMachineCmdHisService;
+
+    /**
+     * 查询桩机指令下发历史列表
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ConsMachineCmdHis consMachineCmdHis) {
+        startPage();
+        List<ConsMachineCmdHis> list = consMachineCmdHisService.selectConsMachineCmdHisList(consMachineCmdHis);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出桩机指令下发历史列表
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:export')")
+    @Log(title = "桩机指令下发历史", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ConsMachineCmdHis consMachineCmdHis) {
+        List<ConsMachineCmdHis> list = consMachineCmdHisService.selectConsMachineCmdHisList(consMachineCmdHis);
+        ExcelUtil<ConsMachineCmdHis> util = new ExcelUtil<ConsMachineCmdHis>(ConsMachineCmdHis.class);
+        util.exportExcel(response, list, "桩机指令下发历史数据");
+    }
+
+    /**
+     * 获取桩机指令下发历史详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(consMachineCmdHisService.selectConsMachineCmdHisById(id));
+    }
+
+    /**
+     * 新增桩机指令下发历史
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:add')")
+    @Log(title = "桩机指令下发历史", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ConsMachineCmdHis consMachineCmdHis) {
+        return toAjax(consMachineCmdHisService.insertConsMachineCmdHis(consMachineCmdHis));
+    }
+
+    /**
+     * 修改桩机指令下发历史
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:edit')")
+    @Log(title = "桩机指令下发历史", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ConsMachineCmdHis consMachineCmdHis) {
+        return toAjax(consMachineCmdHisService.updateConsMachineCmdHis(consMachineCmdHis));
+    }
+
+    /**
+     * 删除桩机指令下发历史
+     */
+    @PreAuthorize("@ss.hasPermi('cons:machineCmdHis:remove')")
+    @Log(title = "桩机指令下发历史", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(consMachineCmdHisService.deleteConsMachineCmdHisByIds(ids));
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.huashe.park.application.web.controller.cons;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huashe.common.domain.AjaxResult;
+import com.huashe.park.domain.entity.PileMachineInfo;
+import com.huashe.park.service.IPileMachineInfoService;
+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;
+
+/**
+ * 施工桩机信息Controller
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+@RestController
+@RequestMapping("/cons/pileMachineInfo")
+public class PileMachineInfoController extends BaseController {
+    @Autowired
+    private IPileMachineInfoService pileMachineInfoService;
+
+    /**
+     * 查询施工桩机信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PileMachineInfo pileMachineInfo) {
+        startPage();
+        List<PileMachineInfo> list = pileMachineInfoService.selectPileMachineInfoList(pileMachineInfo);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:list')")
+    @GetMapping("/list/all")
+    public TableDataInfo listAll(PileMachineInfo pileMachineInfo) {
+        List<PileMachineInfo> list = pileMachineInfoService.selectPileMachineInfoList(pileMachineInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出施工桩机信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:export')")
+    @Log(title = "施工桩机信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PileMachineInfo pileMachineInfo) {
+        List<PileMachineInfo> list = pileMachineInfoService.selectPileMachineInfoList(pileMachineInfo);
+        ExcelUtil<PileMachineInfo> util = new ExcelUtil<PileMachineInfo>(PileMachineInfo.class);
+        util.exportExcel(response, list, "施工桩机信息数据");
+    }
+
+    /**
+     * 获取施工桩机信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(pileMachineInfoService.selectPileMachineInfoById(id));
+    }
+
+    /**
+     * 新增施工桩机信息
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:add')")
+    @Log(title = "施工桩机信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody PileMachineInfo pileMachineInfo) {
+        return toAjax(pileMachineInfoService.insertPileMachineInfo(pileMachineInfo));
+    }
+
+    /**
+     * 修改施工桩机信息
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:edit')")
+    @Log(title = "施工桩机信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody PileMachineInfo pileMachineInfo) {
+        return toAjax(pileMachineInfoService.updatePileMachineInfo(pileMachineInfo));
+    }
+
+    /**
+     * 删除施工桩机信息
+     */
+    @PreAuthorize("@ss.hasPermi('cons:pileMachineInfo:remove')")
+    @Log(title = "施工桩机信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(pileMachineInfoService.deletePileMachineInfoByIds(ids));
+    }
+}

+ 1 - 1
bd-park/park-backend/park-application/src/main/resources/application-druid.yml

@@ -28,7 +28,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://172.192.10.105:30002/ems_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://172.192.10.105:30002/hs_bds?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
         password: root
       # 从库数据源

+ 62 - 0
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/ConsMachineCmdHisMapper.java

@@ -0,0 +1,62 @@
+package com.huashe.park.core.mapper;
+
+import com.huashe.park.domain.entity.ConsMachineCmdHis;
+
+import java.util.List;
+
+/**
+ * 桩机指令下发历史Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+public interface ConsMachineCmdHisMapper 
+{
+    /**
+     * 查询桩机指令下发历史
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 桩机指令下发历史
+     */
+    public ConsMachineCmdHis selectConsMachineCmdHisById(Long id);
+
+    /**
+     * 查询桩机指令下发历史列表
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 桩机指令下发历史集合
+     */
+    public List<ConsMachineCmdHis> selectConsMachineCmdHisList(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 新增桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    public int insertConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 修改桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    public int updateConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 删除桩机指令下发历史
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 结果
+     */
+    public int deleteConsMachineCmdHisById(Long id);
+
+    /**
+     * 批量删除桩机指令下发历史
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteConsMachineCmdHisByIds(Long[] ids);
+}

+ 62 - 0
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/PileMachineInfoMapper.java

@@ -0,0 +1,62 @@
+package com.huashe.park.core.mapper;
+
+import com.huashe.park.domain.entity.PileMachineInfo;
+
+import java.util.List;
+
+/**
+ * 施工桩机信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+public interface PileMachineInfoMapper 
+{
+    /**
+     * 查询施工桩机信息
+     * 
+     * @param id 施工桩机信息主键
+     * @return 施工桩机信息
+     */
+    public PileMachineInfo selectPileMachineInfoById(Long id);
+
+    /**
+     * 查询施工桩机信息列表
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 施工桩机信息集合
+     */
+    public List<PileMachineInfo> selectPileMachineInfoList(PileMachineInfo pileMachineInfo);
+
+    /**
+     * 新增施工桩机信息
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 结果
+     */
+    public int insertPileMachineInfo(PileMachineInfo pileMachineInfo);
+
+    /**
+     * 修改施工桩机信息
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 结果
+     */
+    public int updatePileMachineInfo(PileMachineInfo pileMachineInfo);
+
+    /**
+     * 删除施工桩机信息
+     * 
+     * @param id 施工桩机信息主键
+     * @return 结果
+     */
+    public int deletePileMachineInfoById(Long id);
+
+    /**
+     * 批量删除施工桩机信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deletePileMachineInfoByIds(Long[] ids);
+}

+ 62 - 0
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IConsMachineCmdHisService.java

@@ -0,0 +1,62 @@
+package com.huashe.park.core.service;
+
+import com.huashe.park.domain.entity.ConsMachineCmdHis;
+
+import java.util.List;
+
+/**
+ * 桩机指令下发历史Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+public interface IConsMachineCmdHisService 
+{
+    /**
+     * 查询桩机指令下发历史
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 桩机指令下发历史
+     */
+    public ConsMachineCmdHis selectConsMachineCmdHisById(Long id);
+
+    /**
+     * 查询桩机指令下发历史列表
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 桩机指令下发历史集合
+     */
+    public List<ConsMachineCmdHis> selectConsMachineCmdHisList(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 新增桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    public int insertConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 修改桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    public int updateConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis);
+
+    /**
+     * 批量删除桩机指令下发历史
+     * 
+     * @param ids 需要删除的桩机指令下发历史主键集合
+     * @return 结果
+     */
+    public int deleteConsMachineCmdHisByIds(Long[] ids);
+
+    /**
+     * 删除桩机指令下发历史信息
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 结果
+     */
+    public int deleteConsMachineCmdHisById(Long id);
+}

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

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

+ 94 - 0
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ConsMachineCmdHisServiceImpl.java

@@ -0,0 +1,94 @@
+package com.huashe.park.core.service.impl;
+
+import java.util.List;
+
+import com.huashe.park.core.mapper.ConsMachineCmdHisMapper;
+import com.huashe.park.core.service.IConsMachineCmdHisService;
+import com.huashe.park.domain.entity.ConsMachineCmdHis;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 桩机指令下发历史Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+@Service
+public class ConsMachineCmdHisServiceImpl implements IConsMachineCmdHisService
+{
+    @Autowired
+    private ConsMachineCmdHisMapper consMachineCmdHisMapper;
+
+    /**
+     * 查询桩机指令下发历史
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 桩机指令下发历史
+     */
+    @Override
+    public ConsMachineCmdHis selectConsMachineCmdHisById(Long id)
+    {
+        return consMachineCmdHisMapper.selectConsMachineCmdHisById(id);
+    }
+
+    /**
+     * 查询桩机指令下发历史列表
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 桩机指令下发历史
+     */
+    @Override
+    public List<ConsMachineCmdHis> selectConsMachineCmdHisList(ConsMachineCmdHis consMachineCmdHis)
+    {
+        return consMachineCmdHisMapper.selectConsMachineCmdHisList(consMachineCmdHis);
+    }
+
+    /**
+     * 新增桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    @Override
+    public int insertConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis)
+    {
+        return consMachineCmdHisMapper.insertConsMachineCmdHis(consMachineCmdHis);
+    }
+
+    /**
+     * 修改桩机指令下发历史
+     * 
+     * @param consMachineCmdHis 桩机指令下发历史
+     * @return 结果
+     */
+    @Override
+    public int updateConsMachineCmdHis(ConsMachineCmdHis consMachineCmdHis)
+    {
+        return consMachineCmdHisMapper.updateConsMachineCmdHis(consMachineCmdHis);
+    }
+
+    /**
+     * 批量删除桩机指令下发历史
+     * 
+     * @param ids 需要删除的桩机指令下发历史主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsMachineCmdHisByIds(Long[] ids)
+    {
+        return consMachineCmdHisMapper.deleteConsMachineCmdHisByIds(ids);
+    }
+
+    /**
+     * 删除桩机指令下发历史信息
+     * 
+     * @param id 桩机指令下发历史主键
+     * @return 结果
+     */
+    @Override
+    public int deleteConsMachineCmdHisById(Long id)
+    {
+        return consMachineCmdHisMapper.deleteConsMachineCmdHisById(id);
+    }
+}

+ 88 - 0
bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/PileMachineInfoServiceImpl.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.PileMachineInfoMapper;
+import com.huashe.park.domain.entity.PileMachineInfo;
+import com.huashe.park.service.IPileMachineInfoService;
+
+/**
+ * 施工桩机信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+@Service
+public class PileMachineInfoServiceImpl implements IPileMachineInfoService {
+    @Autowired
+    private PileMachineInfoMapper pileMachineInfoMapper;
+
+    /**
+     * 查询施工桩机信息
+     * 
+     * @param id 施工桩机信息主键
+     * @return 施工桩机信息
+     */
+    @Override
+    public PileMachineInfo selectPileMachineInfoById(Long id) {
+        return pileMachineInfoMapper.selectPileMachineInfoById(id);
+    }
+
+    /**
+     * 查询施工桩机信息列表
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 施工桩机信息
+     */
+    @Override
+    public List<PileMachineInfo> selectPileMachineInfoList(PileMachineInfo pileMachineInfo) {
+        return pileMachineInfoMapper.selectPileMachineInfoList(pileMachineInfo);
+    }
+
+    /**
+     * 新增施工桩机信息
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 结果
+     */
+    @Override
+    public int insertPileMachineInfo(PileMachineInfo pileMachineInfo) {
+        return pileMachineInfoMapper.insertPileMachineInfo(pileMachineInfo);
+    }
+
+    /**
+     * 修改施工桩机信息
+     * 
+     * @param pileMachineInfo 施工桩机信息
+     * @return 结果
+     */
+    @Override
+    public int updatePileMachineInfo(PileMachineInfo pileMachineInfo) {
+        return pileMachineInfoMapper.updatePileMachineInfo(pileMachineInfo);
+    }
+
+    /**
+     * 批量删除施工桩机信息
+     * 
+     * @param ids 需要删除的施工桩机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deletePileMachineInfoByIds(Long[] ids) {
+        return pileMachineInfoMapper.deletePileMachineInfoByIds(ids);
+    }
+
+    /**
+     * 删除施工桩机信息信息
+     * 
+     * @param id 施工桩机信息主键
+     * @return 结果
+     */
+    @Override
+    public int deletePileMachineInfoById(Long id) {
+        return pileMachineInfoMapper.deletePileMachineInfoById(id);
+    }
+}

+ 93 - 0
bd-park/park-backend/park-core/src/main/resources/mapper/cons/ConsMachineCmdHisMapper.xml

@@ -0,0 +1,93 @@
+<?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.ConsMachineCmdHisMapper">
+
+    <resultMap type="ConsMachineCmdHis" id="ConsMachineCmdHisResult">
+        <result property="id" column="id"/>
+        <result property="toMachineId" column="to_machine_id"/>
+        <result property="cmdContent" column="cmd_content"
+                typeHandler="com.huashe.park.core.typehandle.MySqlJsonHandler"/>
+        <result property="cmdResult" column="cmd_result"/>
+        <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="selectConsMachineCmdHisVo">
+        select id,
+               to_machine_id,
+               cmd_content,
+               cmd_result,
+               update_time,
+               create_time,
+               create_by,
+               update_by
+        from cons_machine_cmd_his
+    </sql>
+
+    <select id="selectConsMachineCmdHisList" parameterType="ConsMachineCmdHis" resultMap="ConsMachineCmdHisResult">
+        <include refid="selectConsMachineCmdHisVo"/>
+        <where>
+            <if test="cmdResult != null  and cmdResult != ''">and cmd_result = #{cmdResult}</if>
+        </where>
+    </select>
+
+    <select id="selectConsMachineCmdHisById" parameterType="Long" resultMap="ConsMachineCmdHisResult">
+        <include refid="selectConsMachineCmdHisVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertConsMachineCmdHis" parameterType="ConsMachineCmdHis" useGeneratedKeys="true" keyProperty="id">
+        insert into cons_machine_cmd_his
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="toMachineId != null">to_machine_id,</if>
+            <if test="cmdContent != null">cmd_content,</if>
+            <if test="cmdResult != null">cmd_result,</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="toMachineId != null">#{toMachineId},</if>
+            <if test="cmdContent != null">#{cmdContent,typeHandler=com.huashe.park.core.typehandle.MySqlJsonHandler},</if>
+            <if test="cmdResult != null">#{cmdResult},</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="updateConsMachineCmdHis" parameterType="ConsMachineCmdHis">
+        update cons_machine_cmd_his
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="toMachineId != null">to_machine_id = #{toMachineId},</if>
+            <if test="cmdContent != null">cmd_content =
+                #{cmdContent,typeHandler=com.huashe.park.core.typehandle.MySqlJsonHandler},
+            </if>
+            <if test="cmdResult != null">cmd_result = #{cmdResult},</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="deleteConsMachineCmdHisById" parameterType="Long">
+        delete
+        from cons_machine_cmd_his
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteConsMachineCmdHisByIds" parameterType="String">
+        delete from cons_machine_cmd_his where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 80 - 0
bd-park/park-backend/park-core/src/main/resources/mapper/cons/PileMachineInfoMapper.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.PileMachineInfoMapper">
+
+    <resultMap type="PileMachineInfo" id="PileMachineInfoResult">
+        <result property="id" column="id"/>
+        <result property="machineNum" column="machine_num"/>
+        <result property="equipment" column="equipment"/>
+        <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="selectPileMachineInfoVo">
+        select id, machine_num, equipment, update_time, create_time, create_by, update_by
+        from cons_pile_machine_info
+    </sql>
+
+    <select id="selectPileMachineInfoList" parameterType="PileMachineInfo" resultMap="PileMachineInfoResult">
+        <include refid="selectPileMachineInfoVo"/>
+        <where>
+            <if test="machineNum != null  and machineNum != ''">and machine_num = #{machineNum}</if>
+            <if test="equipment != null  and equipment != ''">and equipment = #{equipment}</if>
+        </where>
+    </select>
+
+    <select id="selectPileMachineInfoById" parameterType="Long" resultMap="PileMachineInfoResult">
+        <include refid="selectPileMachineInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertPileMachineInfo" parameterType="PileMachineInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into cons_pile_machine_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="machineNum != null and machineNum != ''">machine_num,</if>
+            <if test="equipment != null and equipment != ''">equipment,</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="machineNum != null and machineNum != ''">#{machineNum},</if>
+            <if test="equipment != null and equipment != ''">#{equipment},</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="updatePileMachineInfo" parameterType="PileMachineInfo">
+        update cons_pile_machine_info
+        <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="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="deletePileMachineInfoById" parameterType="Long">
+        delete
+        from cons_pile_machine_info
+        where id = #{id}
+    </delete>
+
+    <delete id="deletePileMachineInfoByIds" parameterType="String">
+        delete from cons_pile_machine_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+ 73 - 0
bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ConsMachineCmdHis.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.alibaba.fastjson2.JSONObject;
+import com.huashe.common.annotation.Excel;
+import com.huashe.common.domain.BaseEntity;
+
+/**
+ * 桩机指令下发历史对象 cons_machine_cmd_his
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+public class ConsMachineCmdHis extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** $column.columnComment */
+    private Long toMachineId;
+
+    /** 指令内容 */
+    @Excel(name = "指令内容")
+    private JSONObject cmdContent;
+
+    /** 指令状态 */
+    @Excel(name = "指令状态")
+    private String cmdResult;
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setToMachineId(Long toMachineId) {
+        this.toMachineId = toMachineId;
+    }
+
+    public Long getToMachineId() {
+        return toMachineId;
+    }
+
+    public JSONObject getCmdContent() {
+        return cmdContent;
+    }
+
+    public void setCmdContent(JSONObject cmdContent) {
+        this.cmdContent = cmdContent;
+    }
+
+    public void setCmdResult(String cmdResult) {
+        this.cmdResult = cmdResult;
+    }
+
+    public String getCmdResult() {
+        return cmdResult;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId())
+            .append("toMachineId", getToMachineId()).append("cmdContent", getCmdContent())
+            .append("cmdResult", getCmdResult()).append("updateTime", getUpdateTime())
+            .append("createTime", getCreateTime()).append("createBy", getCreateBy()).append("updateBy", getUpdateBy())
+            .toString();
+    }
+}

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

@@ -0,0 +1,69 @@
+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;
+
+/**
+ * 施工桩机信息对象 cons_pile_machine_info
+ * 
+ * @author ruoyi
+ * @date 2025-02-12
+ */
+public class PileMachineInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 桩机编号 */
+    @Excel(name = "桩机编号")
+    private String machineNum;
+
+    /** 设备信息 */
+    @Excel(name = "设备信息")
+    private String equipment;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setMachineNum(String machineNum) 
+    {
+        this.machineNum = machineNum;
+    }
+
+    public String getMachineNum() 
+    {
+        return machineNum;
+    }
+    public void setEquipment(String equipment) 
+    {
+        this.equipment = equipment;
+    }
+
+    public String getEquipment() 
+    {
+        return equipment;
+    }
+
+    @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();
+    }
+}