From 7a5712bcd9a840e3e8567562d9cb67c491345f07 Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 21 Oct 2025 15:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceInspectProjectController.java | 123 ++++++++++++++ .../DeviceInspectionManualController.java | 127 +++++++++++++++ .../device/domain/DeviceInspectProject.java | 125 ++++++++++++++ .../device/domain/DeviceInspectionManual.java | 69 ++++++++ .../mapper/DeviceInspectProjectMapper.java | 62 +++++++ .../mapper/DeviceInspectionManualMapper.java | 62 +++++++ .../service/IDeviceInspectProjectService.java | 61 +++++++ .../IDeviceInspectionManualService.java | 61 +++++++ .../impl/DeviceInspectProjectServiceImpl.java | 105 ++++++++++++ .../DeviceInspectionManualServiceImpl.java | 101 ++++++++++++ .../device/DeviceInspectProjectMapper.xml | 96 +++++++++++ .../device/DeviceInspectionManualMapper.xml | 78 +++++++++ .../resources/sql/inspect_projectMenu.sql | 22 +++ .../resources/sql/inspection_manualMenu.sql | 22 +++ .../templates/device/inspect_project/add.html | 137 ++++++++++++++++ .../device/inspect_project/edit.html | 58 +++++++ .../inspect_project/inspect_project.html | 153 ++++++++++++++++++ .../device/inspection_manual/add.html | 37 +++++ .../device/inspection_manual/edit.html | 38 +++++ .../inspection_manual/inspection_manual.html | 114 +++++++++++++ .../resources/vm/java/serviceImpl.java.vm | 15 +- .../record_inspection_task.html | 1 - 22 files changed, 1653 insertions(+), 14 deletions(-) create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectProjectController.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectionManualController.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectProject.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectionManual.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectProjectMapper.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectionManualMapper.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectProjectService.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectionManualService.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectProjectServiceImpl.java create mode 100644 ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectionManualServiceImpl.java create mode 100644 ruoyi-device/src/main/resources/mapper/device/DeviceInspectProjectMapper.xml create mode 100644 ruoyi-device/src/main/resources/mapper/device/DeviceInspectionManualMapper.xml create mode 100644 ruoyi-device/src/main/resources/sql/inspect_projectMenu.sql create mode 100644 ruoyi-device/src/main/resources/sql/inspection_manualMenu.sql create mode 100644 ruoyi-device/src/main/resources/templates/device/inspect_project/add.html create mode 100644 ruoyi-device/src/main/resources/templates/device/inspect_project/edit.html create mode 100644 ruoyi-device/src/main/resources/templates/device/inspect_project/inspect_project.html create mode 100644 ruoyi-device/src/main/resources/templates/device/inspection_manual/add.html create mode 100644 ruoyi-device/src/main/resources/templates/device/inspection_manual/edit.html create mode 100644 ruoyi-device/src/main/resources/templates/device/inspection_manual/inspection_manual.html diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectProjectController.java b/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectProjectController.java new file mode 100644 index 0000000..3dc55a8 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectProjectController.java @@ -0,0 +1,123 @@ +package com.ruoyi.device.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.device.domain.DeviceInspectProject; +import com.ruoyi.device.service.IDeviceInspectProjectService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 巡检项目管理Controller + * + * @author wangh + * @date 2025-09-30 + */ +@Controller +@RequestMapping("/device/inspect_project") +public class DeviceInspectProjectController extends BaseController { + private String prefix = "device/inspect_project"; + + @Autowired + private IDeviceInspectProjectService deviceInspectProjectService; + + @RequiresPermissions("device:inspect_project:view") + @GetMapping() + public String inspect_project() { + return prefix + "/inspect_project"; + } + + @GetMapping("/open/{objId}") + public String open(@PathVariable("objId") Long objId, ModelMap mmap) { + mmap.put("objId", objId); + return prefix + "/inspect_project"; + } + + + /** + * 查询巡检项目管理列表 + */ + @RequiresPermissions("device:inspect_project:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(DeviceInspectProject deviceInspectProject) { + startPage(); + List list = deviceInspectProjectService.selectDeviceInspectProjectList(deviceInspectProject); + return getDataTable(list); + } + + /** + * 导出巡检项目管理列表 + */ + @RequiresPermissions("device:inspect_project:export") + @Log(title = "巡检项目管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(DeviceInspectProject deviceInspectProject) { + List list = deviceInspectProjectService.selectDeviceInspectProjectList(deviceInspectProject); + ExcelUtil util = new ExcelUtil(DeviceInspectProject.class); + return util.exportExcel(list, "巡检项目管理数据"); + } + + /** + * 新增巡检项目管理 + */ + @GetMapping("/add/{manualId}") + public String add(@PathVariable("manualId") Long manualId, ModelMap mmap) { + mmap.put("manualId", manualId); + return prefix + "/add"; + } + + /** + * 新增保存巡检项目管理 + */ + @RequiresPermissions("device:inspect_project:add") + @Log(title = "巡检项目管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(DeviceInspectProject deviceInspectProject) { + return toAjax(deviceInspectProjectService.insertDeviceInspectProject(deviceInspectProject)); + } + + /** + * 修改巡检项目管理 + */ + @RequiresPermissions("device:inspect_project:edit") + @GetMapping("/edit/{objId}") + public String edit(@PathVariable("objId") Long objId, ModelMap mmap) { + DeviceInspectProject deviceInspectProject = deviceInspectProjectService.selectDeviceInspectProjectByObjId(objId); + mmap.put("deviceInspectProject", deviceInspectProject); + return prefix + "/edit"; + } + + /** + * 修改保存巡检项目管理 + */ + @RequiresPermissions("device:inspect_project:edit") + @Log(title = "巡检项目管理", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(DeviceInspectProject deviceInspectProject) { + return toAjax(deviceInspectProjectService.updateDeviceInspectProject(deviceInspectProject)); + } + + /** + * 删除巡检项目管理 + */ + @RequiresPermissions("device:inspect_project:remove") + @Log(title = "巡检项目管理", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(deviceInspectProjectService.deleteDeviceInspectProjectByObjIds(ids)); + } +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectionManualController.java b/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectionManualController.java new file mode 100644 index 0000000..6013d97 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/controller/DeviceInspectionManualController.java @@ -0,0 +1,127 @@ +package com.ruoyi.device.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +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.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.device.domain.DeviceInspectionManual; +import com.ruoyi.device.service.IDeviceInspectionManualService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 巡检手册管理Controller + * + * @author wangh + * @date 2025-09-30 + */ +@Controller +@RequestMapping("/device/inspection_manual") +public class DeviceInspectionManualController extends BaseController +{ + private String prefix = "device/inspection_manual"; + + @Autowired + private IDeviceInspectionManualService deviceInspectionManualService; + + @RequiresPermissions("device:inspection_manual:view") + @GetMapping() + public String inspection_manual() + { + return prefix + "/inspection_manual"; + } + + /** + * 查询巡检手册管理列表 + */ + @RequiresPermissions("device:inspection_manual:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(DeviceInspectionManual deviceInspectionManual) + { + startPage(); + List list = deviceInspectionManualService.selectDeviceInspectionManualList(deviceInspectionManual); + return getDataTable(list); + } + + /** + * 导出巡检手册管理列表 + */ + @RequiresPermissions("device:inspection_manual:export") + @Log(title = "巡检手册管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(DeviceInspectionManual deviceInspectionManual) + { + List list = deviceInspectionManualService.selectDeviceInspectionManualList(deviceInspectionManual); + ExcelUtil util = new ExcelUtil(DeviceInspectionManual.class); + return util.exportExcel(list, "巡检手册管理数据"); + } + + /** + * 新增巡检手册管理 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存巡检手册管理 + */ + @RequiresPermissions("device:inspection_manual:add") + @Log(title = "巡检手册管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(DeviceInspectionManual deviceInspectionManual) + { + return toAjax(deviceInspectionManualService.insertDeviceInspectionManual(deviceInspectionManual)); + } + + /** + * 修改巡检手册管理 + */ + @RequiresPermissions("device:inspection_manual:edit") + @GetMapping("/edit/{objId}") + public String edit(@PathVariable("objId") Long objId, ModelMap mmap) + { + DeviceInspectionManual deviceInspectionManual = deviceInspectionManualService.selectDeviceInspectionManualByObjId(objId); + mmap.put("deviceInspectionManual", deviceInspectionManual); + return prefix + "/edit"; + } + + /** + * 修改保存巡检手册管理 + */ + @RequiresPermissions("device:inspection_manual:edit") + @Log(title = "巡检手册管理", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(DeviceInspectionManual deviceInspectionManual) + { + return toAjax(deviceInspectionManualService.updateDeviceInspectionManual(deviceInspectionManual)); + } + + /** + * 删除巡检手册管理 + */ + @RequiresPermissions("device:inspection_manual:remove") + @Log(title = "巡检手册管理", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(deviceInspectionManualService.deleteDeviceInspectionManualByObjIds(ids)); + } +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectProject.java b/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectProject.java new file mode 100644 index 0000000..36cc5bb --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectProject.java @@ -0,0 +1,125 @@ +package com.ruoyi.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 巡检项目管理对象 device_inspect_project + * + * @author wangh + * @date 2025-09-30 + */ +public class DeviceInspectProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long objId; + + /** 关联手册 */ + @Excel(name = "关联手册") + private Long manualId; + + /** 项目编号 */ + @Excel(name = "项目编号") + private String inspectProjectCode; + + /** 巡检项目 */ + @Excel(name = "巡检项目") + private String inspectProject; + + /** 巡检项目属性 */ + @Excel(name = "巡检项目属性") + private String inspectProjectProperty; + + /** 上限 */ + @Excel(name = "上限") + private String upLimit; + + /** 下限 */ + @Excel(name = "下限") + private String lowLimit; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setManualId(Long manualId) + { + this.manualId = manualId; + } + + public Long getManualId() + { + return manualId; + } + public void setInspectProjectCode(String inspectProjectCode) + { + this.inspectProjectCode = inspectProjectCode; + } + + public String getInspectProjectCode() + { + return inspectProjectCode; + } + public void setInspectProject(String inspectProject) + { + this.inspectProject = inspectProject; + } + + public String getInspectProject() + { + return inspectProject; + } + public void setInspectProjectProperty(String inspectProjectProperty) + { + this.inspectProjectProperty = inspectProjectProperty; + } + + public String getInspectProjectProperty() + { + return inspectProjectProperty; + } + public void setUpLimit(String upLimit) + { + this.upLimit = upLimit; + } + + public String getUpLimit() + { + return upLimit; + } + public void setLowLimit(String lowLimit) + { + this.lowLimit = lowLimit; + } + + public String getLowLimit() + { + return lowLimit; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("manualId", getManualId()) + .append("inspectProjectCode", getInspectProjectCode()) + .append("inspectProject", getInspectProject()) + .append("inspectProjectProperty", getInspectProjectProperty()) + .append("upLimit", getUpLimit()) + .append("lowLimit", getLowLimit()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectionManual.java b/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectionManual.java new file mode 100644 index 0000000..42ac67b --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/domain/DeviceInspectionManual.java @@ -0,0 +1,69 @@ +package com.ruoyi.device.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 巡检手册管理对象 device_inspection_manual + * + * @author wangh + * @date 2025-09-30 + */ +public class DeviceInspectionManual extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long objId; + + /** 手册编码 */ + @Excel(name = "手册编码") + private String manualCode; + + /** 手册名称 */ + @Excel(name = "手册名称") + private String manualName; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setManualCode(String manualCode) + { + this.manualCode = manualCode; + } + + public String getManualCode() + { + return manualCode; + } + public void setManualName(String manualName) + { + this.manualName = manualName; + } + + public String getManualName() + { + return manualName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("manualCode", getManualCode()) + .append("manualName", getManualName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectProjectMapper.java b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectProjectMapper.java new file mode 100644 index 0000000..808791a --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectProjectMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.device.mapper; + +import java.util.List; +import com.ruoyi.device.domain.DeviceInspectProject; +import org.springframework.stereotype.Repository; +/** + * 巡检项目管理Mapper接口 + * + * @author wangh + * @date 2025-09-30 + */ +@Repository +public interface DeviceInspectProjectMapper +{ + /** + * 查询巡检项目管理 + * + * @param objId 巡检项目管理主键 + * @return 巡检项目管理 + */ + public DeviceInspectProject selectDeviceInspectProjectByObjId(Long objId); + + /** + * 查询巡检项目管理列表 + * + * @param deviceInspectProject 巡检项目管理 + * @return 巡检项目管理集合 + */ + public List selectDeviceInspectProjectList(DeviceInspectProject deviceInspectProject); + + /** + * 新增巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + public int insertDeviceInspectProject(DeviceInspectProject deviceInspectProject); + + /** + * 修改巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + public int updateDeviceInspectProject(DeviceInspectProject deviceInspectProject); + + /** + * 删除巡检项目管理 + * + * @param objId 巡检项目管理主键 + * @return 结果 + */ + public int deleteDeviceInspectProjectByObjId(Long objId); + + /** + * 批量删除巡检项目管理 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceInspectProjectByObjIds(String[] objIds); +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectionManualMapper.java b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectionManualMapper.java new file mode 100644 index 0000000..afd5be2 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/mapper/DeviceInspectionManualMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.device.mapper; + +import java.util.List; +import com.ruoyi.device.domain.DeviceInspectionManual; +import org.springframework.stereotype.Repository; +/** + * 巡检手册管理Mapper接口 + * + * @author wangh + * @date 2025-09-30 + */ +@Repository +public interface DeviceInspectionManualMapper +{ + /** + * 查询巡检手册管理 + * + * @param objId 巡检手册管理主键 + * @return 巡检手册管理 + */ + public DeviceInspectionManual selectDeviceInspectionManualByObjId(Long objId); + + /** + * 查询巡检手册管理列表 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 巡检手册管理集合 + */ + public List selectDeviceInspectionManualList(DeviceInspectionManual deviceInspectionManual); + + /** + * 新增巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + public int insertDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual); + + /** + * 修改巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + public int updateDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual); + + /** + * 删除巡检手册管理 + * + * @param objId 巡检手册管理主键 + * @return 结果 + */ + public int deleteDeviceInspectionManualByObjId(Long objId); + + /** + * 批量删除巡检手册管理 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceInspectionManualByObjIds(String[] objIds); +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectProjectService.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectProjectService.java new file mode 100644 index 0000000..39ff647 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectProjectService.java @@ -0,0 +1,61 @@ +package com.ruoyi.device.service; + +import java.util.List; +import com.ruoyi.device.domain.DeviceInspectProject; + +/** + * 巡检项目管理Service接口 + * + * @author wangh + * @date 2025-09-30 + */ +public interface IDeviceInspectProjectService +{ + /** + * 查询巡检项目管理 + * + * @param objId 巡检项目管理主键 + * @return 巡检项目管理 + */ + public DeviceInspectProject selectDeviceInspectProjectByObjId(Long objId); + + /** + * 查询巡检项目管理列表 + * + * @param deviceInspectProject 巡检项目管理 + * @return 巡检项目管理集合 + */ + public List selectDeviceInspectProjectList(DeviceInspectProject deviceInspectProject); + + /** + * 新增巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + public int insertDeviceInspectProject(DeviceInspectProject deviceInspectProject); + + /** + * 修改巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + public int updateDeviceInspectProject(DeviceInspectProject deviceInspectProject); + + /** + * 批量删除巡检项目管理 + * + * @param objIds 需要删除的巡检项目管理主键集合 + * @return 结果 + */ + public int deleteDeviceInspectProjectByObjIds(String objIds); + + /** + * 删除巡检项目管理信息 + * + * @param objId 巡检项目管理主键 + * @return 结果 + */ + public int deleteDeviceInspectProjectByObjId(Long objId); +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectionManualService.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectionManualService.java new file mode 100644 index 0000000..1d573b3 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/IDeviceInspectionManualService.java @@ -0,0 +1,61 @@ +package com.ruoyi.device.service; + +import java.util.List; +import com.ruoyi.device.domain.DeviceInspectionManual; + +/** + * 巡检手册管理Service接口 + * + * @author wangh + * @date 2025-09-30 + */ +public interface IDeviceInspectionManualService +{ + /** + * 查询巡检手册管理 + * + * @param objId 巡检手册管理主键 + * @return 巡检手册管理 + */ + public DeviceInspectionManual selectDeviceInspectionManualByObjId(Long objId); + + /** + * 查询巡检手册管理列表 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 巡检手册管理集合 + */ + public List selectDeviceInspectionManualList(DeviceInspectionManual deviceInspectionManual); + + /** + * 新增巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + public int insertDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual); + + /** + * 修改巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + public int updateDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual); + + /** + * 批量删除巡检手册管理 + * + * @param objIds 需要删除的巡检手册管理主键集合 + * @return 结果 + */ + public int deleteDeviceInspectionManualByObjIds(String objIds); + + /** + * 删除巡检手册管理信息 + * + * @param objId 巡检手册管理主键 + * @return 结果 + */ + public int deleteDeviceInspectionManualByObjId(Long objId); +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectProjectServiceImpl.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectProjectServiceImpl.java new file mode 100644 index 0000000..cb72c27 --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectProjectServiceImpl.java @@ -0,0 +1,105 @@ +package com.ruoyi.device.service.impl; + +import java.util.List; + + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.device.mapper.DeviceInspectProjectMapper; +import com.ruoyi.device.domain.DeviceInspectProject; +import com.ruoyi.device.service.IDeviceInspectProjectService; +import com.ruoyi.common.core.text.Convert; + +/** + * 巡检项目管理Service业务层处理 + * + * @author wangh + * @date 2025-09-30 + */ +@Service +public class DeviceInspectProjectServiceImpl implements IDeviceInspectProjectService { + @Autowired + private DeviceInspectProjectMapper deviceInspectProjectMapper; + + /** + * 查询巡检项目管理 + * + * @param objId 巡检项目管理主键 + * @return 巡检项目管理 + */ + @Override + public DeviceInspectProject selectDeviceInspectProjectByObjId(Long objId) { + return deviceInspectProjectMapper.selectDeviceInspectProjectByObjId(objId); + } + + /** + * 查询巡检项目管理列表 + * + * @param deviceInspectProject 巡检项目管理 + * @return 巡检项目管理 + */ + @Override + public List selectDeviceInspectProjectList(DeviceInspectProject deviceInspectProject) { + return deviceInspectProjectMapper.selectDeviceInspectProjectList(deviceInspectProject); + } + + /** + * 新增巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + @Override + public int insertDeviceInspectProject(DeviceInspectProject deviceInspectProject) { + + + + + + + + + deviceInspectProject.setCreateBy(ShiroUtils.getLoginName()); + deviceInspectProject.setCreateTime(DateUtils.getNowDate()); + + + return deviceInspectProjectMapper.insertDeviceInspectProject(deviceInspectProject); + } + + /** + * 修改巡检项目管理 + * + * @param deviceInspectProject 巡检项目管理 + * @return 结果 + */ + @Override + public int updateDeviceInspectProject(DeviceInspectProject deviceInspectProject) { + deviceInspectProject.setUpdateBy(ShiroUtils.getLoginName()); + deviceInspectProject.setUpdateTime(DateUtils.getNowDate()); + return deviceInspectProjectMapper.updateDeviceInspectProject(deviceInspectProject); + } + + /** + * 批量删除巡检项目管理 + * + * @param objIds 需要删除的巡检项目管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceInspectProjectByObjIds(String objIds) { + return deviceInspectProjectMapper.deleteDeviceInspectProjectByObjIds(Convert.toStrArray(objIds)); + } + + /** + * 删除巡检项目管理信息 + * + * @param objId 巡检项目管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceInspectProjectByObjId(Long objId) { + return deviceInspectProjectMapper.deleteDeviceInspectProjectByObjId(objId); + } +} diff --git a/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectionManualServiceImpl.java b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectionManualServiceImpl.java new file mode 100644 index 0000000..9d24e3f --- /dev/null +++ b/ruoyi-device/src/main/java/com/ruoyi/device/service/impl/DeviceInspectionManualServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.device.service.impl; + +import java.util.List; + + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.device.mapper.DeviceInspectionManualMapper; +import com.ruoyi.device.domain.DeviceInspectionManual; +import com.ruoyi.device.service.IDeviceInspectionManualService; +import com.ruoyi.common.core.text.Convert; + +/** + * 巡检手册管理Service业务层处理 + * + * @author wangh + * @date 2025-09-30 + */ +@Service +public class DeviceInspectionManualServiceImpl implements IDeviceInspectionManualService { + @Autowired + private DeviceInspectionManualMapper deviceInspectionManualMapper; + + /** + * 查询巡检手册管理 + * + * @param objId 巡检手册管理主键 + * @return 巡检手册管理 + */ + @Override + public DeviceInspectionManual selectDeviceInspectionManualByObjId(Long objId) { + return deviceInspectionManualMapper.selectDeviceInspectionManualByObjId(objId); + } + + /** + * 查询巡检手册管理列表 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 巡检手册管理 + */ + @Override + public List selectDeviceInspectionManualList(DeviceInspectionManual deviceInspectionManual) { + return deviceInspectionManualMapper.selectDeviceInspectionManualList(deviceInspectionManual); + } + + /** + * 新增巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + @Override + public int insertDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual) { + + + + + deviceInspectionManual.setCreateBy(ShiroUtils.getLoginName()); + deviceInspectionManual.setCreateTime(DateUtils.getNowDate()); + + + return deviceInspectionManualMapper.insertDeviceInspectionManual(deviceInspectionManual); + } + + /** + * 修改巡检手册管理 + * + * @param deviceInspectionManual 巡检手册管理 + * @return 结果 + */ + @Override + public int updateDeviceInspectionManual(DeviceInspectionManual deviceInspectionManual) { + deviceInspectionManual.setUpdateBy(ShiroUtils.getLoginName()); + deviceInspectionManual.setUpdateTime(DateUtils.getNowDate()); + return deviceInspectionManualMapper.updateDeviceInspectionManual(deviceInspectionManual); + } + + /** + * 批量删除巡检手册管理 + * + * @param objIds 需要删除的巡检手册管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceInspectionManualByObjIds(String objIds) { + return deviceInspectionManualMapper.deleteDeviceInspectionManualByObjIds(Convert.toStrArray(objIds)); + } + + /** + * 删除巡检手册管理信息 + * + * @param objId 巡检手册管理主键 + * @return 结果 + */ + @Override + public int deleteDeviceInspectionManualByObjId(Long objId) { + return deviceInspectionManualMapper.deleteDeviceInspectionManualByObjId(objId); + } +} diff --git a/ruoyi-device/src/main/resources/mapper/device/DeviceInspectProjectMapper.xml b/ruoyi-device/src/main/resources/mapper/device/DeviceInspectProjectMapper.xml new file mode 100644 index 0000000..e215d1e --- /dev/null +++ b/ruoyi-device/src/main/resources/mapper/device/DeviceInspectProjectMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + select obj_id, manual_id, inspect_project_code, inspect_project, inspect_project_property, up_limit, low_limit, create_by, create_time, update_by, update_time from device_inspect_project + + + + + + + + insert into device_inspect_project + + manual_id, + inspect_project_code, + inspect_project, + inspect_project_property, + up_limit, + low_limit, + create_by, + create_time, + update_by, + update_time, + + + #{manualId}, + #{inspectProjectCode}, + #{inspectProject}, + #{inspectProjectProperty}, + #{upLimit}, + #{lowLimit}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update device_inspect_project + + manual_id = #{manualId}, + inspect_project_code = #{inspectProjectCode}, + inspect_project = #{inspectProject}, + inspect_project_property = #{inspectProjectProperty}, + up_limit = #{upLimit}, + low_limit = #{lowLimit}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where obj_id = #{objId} + + + + delete from device_inspect_project where obj_id = #{objId} + + + + delete from device_inspect_project where obj_id in + + #{objId} + + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/mapper/device/DeviceInspectionManualMapper.xml b/ruoyi-device/src/main/resources/mapper/device/DeviceInspectionManualMapper.xml new file mode 100644 index 0000000..bffde00 --- /dev/null +++ b/ruoyi-device/src/main/resources/mapper/device/DeviceInspectionManualMapper.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + select obj_id, manual_code, manual_name, create_by, create_time, update_by, update_time from device_inspection_manual + + + + + + + + insert into device_inspection_manual + + manual_code, + manual_name, + create_by, + create_time, + update_by, + update_time, + + + #{manualCode}, + #{manualName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update device_inspection_manual + + manual_code = #{manualCode}, + manual_name = #{manualName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where obj_id = #{objId} + + + + delete from device_inspection_manual where obj_id = #{objId} + + + + delete from device_inspection_manual where obj_id in + + #{objId} + + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/sql/inspect_projectMenu.sql b/ruoyi-device/src/main/resources/sql/inspect_projectMenu.sql new file mode 100644 index 0000000..c1fac3e --- /dev/null +++ b/ruoyi-device/src/main/resources/sql/inspect_projectMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理', '2168', '1', '/device/inspect_project', 'C', '0', 'device:inspect_project:view', '#', 'admin', sysdate(), '', null, '巡检项目管理菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理查询', @parentId, '1', '#', 'F', '0', 'device:inspect_project:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理新增', @parentId, '2', '#', 'F', '0', 'device:inspect_project:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理修改', @parentId, '3', '#', 'F', '0', 'device:inspect_project:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理删除', @parentId, '4', '#', 'F', '0', 'device:inspect_project:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检项目管理导出', @parentId, '5', '#', 'F', '0', 'device:inspect_project:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-device/src/main/resources/sql/inspection_manualMenu.sql b/ruoyi-device/src/main/resources/sql/inspection_manualMenu.sql new file mode 100644 index 0000000..8bcc5fc --- /dev/null +++ b/ruoyi-device/src/main/resources/sql/inspection_manualMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理', '2168', '1', '/device/inspection_manual', 'C', '0', 'device:inspection_manual:view', '#', 'admin', sysdate(), '', null, '巡检手册管理菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理查询', @parentId, '1', '#', 'F', '0', 'device:inspection_manual:list', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理新增', @parentId, '2', '#', 'F', '0', 'device:inspection_manual:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理修改', @parentId, '3', '#', 'F', '0', 'device:inspection_manual:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理删除', @parentId, '4', '#', 'F', '0', 'device:inspection_manual:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('巡检手册管理导出', @parentId, '5', '#', 'F', '0', 'device:inspection_manual:export', '#', 'admin', sysdate(), '', null, ''); diff --git a/ruoyi-device/src/main/resources/templates/device/inspect_project/add.html b/ruoyi-device/src/main/resources/templates/device/inspect_project/add.html new file mode 100644 index 0000000..7d8b58c --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspect_project/add.html @@ -0,0 +1,137 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/inspect_project/edit.html b/ruoyi-device/src/main/resources/templates/device/inspect_project/edit.html new file mode 100644 index 0000000..ec5dbd9 --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspect_project/edit.html @@ -0,0 +1,58 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/inspect_project/inspect_project.html b/ruoyi-device/src/main/resources/templates/device/inspect_project/inspect_project.html new file mode 100644 index 0000000..a063bae --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspect_project/inspect_project.html @@ -0,0 +1,153 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • + + + +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/inspection_manual/add.html b/ruoyi-device/src/main/resources/templates/device/inspection_manual/add.html new file mode 100644 index 0000000..644c913 --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspection_manual/add.html @@ -0,0 +1,37 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/inspection_manual/edit.html b/ruoyi-device/src/main/resources/templates/device/inspection_manual/edit.html new file mode 100644 index 0000000..27ae40c --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspection_manual/edit.html @@ -0,0 +1,38 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-device/src/main/resources/templates/device/inspection_manual/inspection_manual.html b/ruoyi-device/src/main/resources/templates/device/inspection_manual/inspection_manual.html new file mode 100644 index 0000000..b5e457b --- /dev/null +++ b/ruoyi-device/src/main/resources/templates/device/inspection_manual/inspection_manual.html @@ -0,0 +1,114 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 74085e0..3dfcc74 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -5,20 +5,9 @@ import java.util.List; import java.util.ArrayList; import com.ruoyi.common.core.domain.Ztree; #end - #foreach ($column in $columns) - #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') - import com.ruoyi.common.utils.DateUtils; - #break - #end + import com.ruoyi.common.utils.DateUtils; + import com.ruoyi.common.utils.ShiroUtils; - #if($column.javaField == 'createBy' || $column.javaField == 'updateBy') - import com.ruoyi.common.utils.ShiroUtils; - #break - #end - - - - #end import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) diff --git a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html index 2b030b4..ac30d68 100644 --- a/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html +++ b/ruoyi-manage/src/main/resources/templates/manage/record_inspection_task/record_inspection_task.html @@ -142,7 +142,6 @@ initinspectionTable = function (index, row, $detail) { // 为每个展开行生成唯一的标识符 var uniqueId = 'tab-' + row.objid + '-'; - var [childTable, childTable1] = $detail.html('
\n' + '
\n' + '
    \n' +