From 2fd44d2311bda88b2524c82af12f63104b2028d4 Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 2 Apr 2024 10:10:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=AE=BE=E6=96=BD=E5=B7=A1?= =?UTF-8?q?=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szxc/controller/SzxcZcssxjController.java | 98 ++++ .../java/com/ruoyi/szxc/domain/SzxcZcss.java | 149 ++++-- .../com/ruoyi/szxc/domain/SzxcZcssxj.java | 258 ++++++++++ .../ruoyi/szxc/mapper/SzxcZcssxjMapper.java | 61 +++ .../szxc/service/ISzxcZcssxjService.java | 61 +++ .../service/impl/SzxcZcssServiceImpl.java | 97 ++++ .../service/impl/SzxcZcssxjServiceImpl.java | 96 ++++ .../resources/mapper/szxc/SzxcZcssMapper.xml | 40 +- .../mapper/szxc/SzxcZcssxjMapper.xml | 146 ++++++ ruoyi-ui/src/api/szxc/zcssxj.js | 44 ++ ruoyi-ui/src/views/szxc/zcss/index.vue | 411 +++++++++------- ruoyi-ui/src/views/szxc/zcssxj/index.vue | 458 ++++++++++++++++++ 12 files changed, 1700 insertions(+), 219 deletions(-) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcssxj.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssxjMapper.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssxjService.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java create mode 100644 ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml create mode 100644 ruoyi-ui/src/api/szxc/zcssxj.js create mode 100644 ruoyi-ui/src/views/szxc/zcssxj/index.vue diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java new file mode 100644 index 0000000..2fdb95f --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssxjController.java @@ -0,0 +1,98 @@ +package com.ruoyi.szxc.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.szxc.domain.SzxcZcssxj; +import com.ruoyi.szxc.service.ISzxcZcssxjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 资产设施巡检Controller + * + * @author hs + * @date 2024-04-02 + */ +@RestController +@RequestMapping("/szxc/zcssxj") +public class SzxcZcssxjController extends BaseController +{ + @Autowired + private ISzxcZcssxjService szxcZcssxjService; + + /** + * 查询资产设施巡检列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:list')") + @GetMapping("/list") + public TableDataInfo list(SzxcZcssxj szxcZcssxj) + { + startPage(); + List list = szxcZcssxjService.selectSzxcZcssxjList(szxcZcssxj); + return getDataTable(list); + } + + /** + * 导出资产设施巡检列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:export')") + @Log(title = "资产设施巡检", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SzxcZcssxj szxcZcssxj) + { + List list = szxcZcssxjService.selectSzxcZcssxjList(szxcZcssxj); + ExcelUtil util = new ExcelUtil(SzxcZcssxj.class); + util.exportExcel(response, list, "资产设施巡检数据"); + } + + /** + * 获取资产设施巡检详细信息 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(szxcZcssxjService.selectSzxcZcssxjById(id)); + } + + /** + * 新增资产设施巡检 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:add')") + @Log(title = "资产设施巡检", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SzxcZcssxj szxcZcssxj) + { + return toAjax(szxcZcssxjService.insertSzxcZcssxj(szxcZcssxj)); + } + + /** + * 修改资产设施巡检 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:edit')") + @Log(title = "资产设施巡检", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzxcZcssxj szxcZcssxj) + { + return toAjax(szxcZcssxjService.updateSzxcZcssxj(szxcZcssxj)); + } + + /** + * 删除资产设施巡检 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcssxj:remove')") + @Log(title = "资产设施巡检", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szxcZcssxjService.deleteSzxcZcssxjByIds(ids)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java index dde585e..2d90e0c 100644 --- a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java @@ -10,7 +10,7 @@ import java.util.Date; /** * 资产设施对象 szxc_zcss - * + * * @author hs * @date 2024-04-02 */ @@ -50,10 +50,29 @@ public class SzxcZcss extends BaseEntity @Excel(name = "资产照片") private String picture; - /** 是否巡检 */ - @Excel(name = "是否巡检") + /** 是否定期巡检 */ + @Excel(name = "是否定期巡检") private String xj; + /** 巡检周期(天) */ + @Excel(name = "巡检周期(天)") + private Long xjCycle; + + /** 上次巡检时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "上次巡检时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastTime; + + /** 巡检开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "巡检开始日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date xjStart; + + /** 巡检结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "巡检结束日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date xjEnd; + /** 部门id */ @Excel(name = "部门id") private Long deptId; @@ -66,111 +85,147 @@ public class SzxcZcss extends BaseEntity @Excel(name = "创建者ID") private Long userId; - public void setId(Long id) + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } - public void setZcName(String zcName) + public void setZcName(String zcName) { this.zcName = zcName; } - public String getZcName() + public String getZcName() { return zcName; } - public void setZcType(String zcType) + public void setZcType(String zcType) { this.zcType = zcType; } - public String getZcType() + public String getZcType() { return zcType; } - public void setInstallDate(Date installDate) + public void setInstallDate(Date installDate) { this.installDate = installDate; } - public Date getInstallDate() + public Date getInstallDate() { return installDate; } - public void setFzr(String fzr) + public void setFzr(String fzr) { this.fzr = fzr; } - public String getFzr() + public String getFzr() { return fzr; } - public void setPhone(String phone) + public void setPhone(String phone) { this.phone = phone; } - public String getPhone() + public String getPhone() { return phone; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setPicture(String picture) + public void setPicture(String picture) { this.picture = picture; } - public String getPicture() + public String getPicture() { return picture; } - public void setXj(String xj) + public void setXj(String xj) { this.xj = xj; } - public String getXj() + public String getXj() { return xj; } - public void setDeptId(Long deptId) + public void setXjCycle(Long xjCycle) + { + this.xjCycle = xjCycle; + } + + public Long getXjCycle() + { + return xjCycle; + } + public void setLastTime(Date lastTime) + { + this.lastTime = lastTime; + } + + public Date getLastTime() + { + return lastTime; + } + public void setXjStart(Date xjStart) + { + this.xjStart = xjStart; + } + + public Date getXjStart() + { + return xjStart; + } + public void setXjEnd(Date xjEnd) + { + this.xjEnd = xjEnd; + } + + public Date getXjEnd() + { + return xjEnd; + } + public void setDeptId(Long deptId) { this.deptId = deptId; } - public Long getDeptId() + public Long getDeptId() { return deptId; } - public void setDeptName(String deptName) + public void setDeptName(String deptName) { this.deptName = deptName; } - public String getDeptName() + public String getDeptName() { return deptName; } - public void setUserId(Long userId) + public void setUserId(Long userId) { this.userId = userId; } - public Long getUserId() + public Long getUserId() { return userId; } @@ -178,23 +233,27 @@ public class SzxcZcss extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("zcName", getZcName()) - .append("zcType", getZcType()) - .append("installDate", getInstallDate()) - .append("fzr", getFzr()) - .append("phone", getPhone()) - .append("address", getAddress()) - .append("picture", getPicture()) - .append("xj", getXj()) - .append("remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("deptId", getDeptId()) - .append("deptName", getDeptName()) - .append("userId", getUserId()) - .toString(); + .append("id", getId()) + .append("zcName", getZcName()) + .append("zcType", getZcType()) + .append("installDate", getInstallDate()) + .append("fzr", getFzr()) + .append("phone", getPhone()) + .append("address", getAddress()) + .append("picture", getPicture()) + .append("xj", getXj()) + .append("xjCycle", getXjCycle()) + .append("lastTime", getLastTime()) + .append("xjStart", getXjStart()) + .append("xjEnd", getXjEnd()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); } } diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcssxj.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcssxj.java new file mode 100644 index 0000000..7def439 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcssxj.java @@ -0,0 +1,258 @@ +package com.ruoyi.szxc.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 资产设施巡检对象 szxc_zcssxj + * + * @author hs + * @date 2024-04-02 + */ +public class SzxcZcssxj extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 资产设施id */ + @Excel(name = "资产设施id") + private Long zcssId; + + /** 资产设备名称 */ + @Excel(name = "资产设备名称") + private String zcName; + + /** 巡检人 */ + @Excel(name = "巡检人") + private String xjName; + + /** 巡检人电话 */ + @Excel(name = "巡检人电话") + private String phone; + + /** 巡检日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "巡检日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date xjDate; + + /** 巡检标题 */ + @Excel(name = "巡检标题") + private String title; + + /** 巡检结果 */ + @Excel(name = "巡检结果") + private String xjResult; + + /** 巡检说明 */ + @Excel(name = "巡检说明") + private String xjExplain; + + /** 巡检照片 */ + @Excel(name = "巡检照片") + private String picture; + + /** 巡检状态(字典) */ + @Excel(name = "巡检状态(字典)") + private String xjStatus; + + /** 开始时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date xjStart; + + /** 结束时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date xjEnd; + + /** 部门id */ + @Excel(name = "部门id") + private Long deptId; + + /** 所属网格 */ + @Excel(name = "所属网格") + private String deptName; + + /** 创建者ID */ + @Excel(name = "创建者ID") + private Long userId; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setZcssId(Long zcssId) + { + this.zcssId = zcssId; + } + + public Long getZcssId() + { + return zcssId; + } + public void setZcName(String zcName) + { + this.zcName = zcName; + } + + public String getZcName() + { + return zcName; + } + public void setXjName(String xjName) + { + this.xjName = xjName; + } + + public String getXjName() + { + return xjName; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setXjDate(Date xjDate) + { + this.xjDate = xjDate; + } + + public Date getXjDate() + { + return xjDate; + } + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + public void setXjResult(String xjResult) + { + this.xjResult = xjResult; + } + + public String getXjResult() + { + return xjResult; + } + public void setXjExplain(String xjExplain) + { + this.xjExplain = xjExplain; + } + + public String getXjExplain() + { + return xjExplain; + } + public void setPicture(String picture) + { + this.picture = picture; + } + + public String getPicture() + { + return picture; + } + public void setXjStatus(String xjStatus) + { + this.xjStatus = xjStatus; + } + + public String getXjStatus() + { + return xjStatus; + } + public void setXjStart(Date xjStart) + { + this.xjStart = xjStart; + } + + public Date getXjStart() + { + return xjStart; + } + public void setXjEnd(Date xjEnd) + { + this.xjEnd = xjEnd; + } + + public Date getXjEnd() + { + return xjEnd; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("zcssId", getZcssId()) + .append("zcName", getZcName()) + .append("xjName", getXjName()) + .append("phone", getPhone()) + .append("xjDate", getXjDate()) + .append("title", getTitle()) + .append("xjResult", getXjResult()) + .append("xjExplain", getXjExplain()) + .append("picture", getPicture()) + .append("xjStatus", getXjStatus()) + .append("xjStart", getXjStart()) + .append("xjEnd", getXjEnd()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("userId", getUserId()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssxjMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssxjMapper.java new file mode 100644 index 0000000..8f5730d --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssxjMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.mapper; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcZcssxj; + +/** + * 资产设施巡检Mapper接口 + * + * @author hs + * @date 2024-04-02 + */ +public interface SzxcZcssxjMapper +{ + /** + * 查询资产设施巡检 + * + * @param id 资产设施巡检主键 + * @return 资产设施巡检 + */ + public SzxcZcssxj selectSzxcZcssxjById(Long id); + + /** + * 查询资产设施巡检列表 + * + * @param szxcZcssxj 资产设施巡检 + * @return 资产设施巡检集合 + */ + public List selectSzxcZcssxjList(SzxcZcssxj szxcZcssxj); + + /** + * 新增资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + public int insertSzxcZcssxj(SzxcZcssxj szxcZcssxj); + + /** + * 修改资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + public int updateSzxcZcssxj(SzxcZcssxj szxcZcssxj); + + /** + * 删除资产设施巡检 + * + * @param id 资产设施巡检主键 + * @return 结果 + */ + public int deleteSzxcZcssxjById(Long id); + + /** + * 批量删除资产设施巡检 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcZcssxjByIds(Long[] ids); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssxjService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssxjService.java new file mode 100644 index 0000000..4c2f19f --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssxjService.java @@ -0,0 +1,61 @@ +package com.ruoyi.szxc.service; + +import java.util.List; +import com.ruoyi.szxc.domain.SzxcZcssxj; + +/** + * 资产设施巡检Service接口 + * + * @author hs + * @date 2024-04-02 + */ +public interface ISzxcZcssxjService +{ + /** + * 查询资产设施巡检 + * + * @param id 资产设施巡检主键 + * @return 资产设施巡检 + */ + public SzxcZcssxj selectSzxcZcssxjById(Long id); + + /** + * 查询资产设施巡检列表 + * + * @param szxcZcssxj 资产设施巡检 + * @return 资产设施巡检集合 + */ + public List selectSzxcZcssxjList(SzxcZcssxj szxcZcssxj); + + /** + * 新增资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + public int insertSzxcZcssxj(SzxcZcssxj szxcZcssxj); + + /** + * 修改资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + public int updateSzxcZcssxj(SzxcZcssxj szxcZcssxj); + + /** + * 批量删除资产设施巡检 + * + * @param ids 需要删除的资产设施巡检主键集合 + * @return 结果 + */ + public int deleteSzxcZcssxjByIds(Long[] ids); + + /** + * 删除资产设施巡检信息 + * + * @param id 资产设施巡检主键 + * @return 结果 + */ + public int deleteSzxcZcssxjById(Long id); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java new file mode 100644 index 0000000..d6d52c1 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.szxc.domain.SzxcZcss; +import com.ruoyi.szxc.mapper.SzxcZcssMapper; +import com.ruoyi.szxc.service.ISzxcZcssService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 资产设施Service业务层处理 + * + * @author hs + * @date 2024-04-02 + */ +@Service +public class SzxcZcssServiceImpl implements ISzxcZcssService +{ + @Autowired + private SzxcZcssMapper szxcZcssMapper; + + /** + * 查询资产设施 + * + * @param id 资产设施主键 + * @return 资产设施 + */ + @Override + public SzxcZcss selectSzxcZcssById(Long id) + { + return szxcZcssMapper.selectSzxcZcssById(id); + } + + /** + * 查询资产设施列表 + * + * @param szxcZcss 资产设施 + * @return 资产设施 + */ + @Override + public List selectSzxcZcssList(SzxcZcss szxcZcss) + { + return szxcZcssMapper.selectSzxcZcssList(szxcZcss); + } + + /** + * 新增资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + @Override + public int insertSzxcZcss(SzxcZcss szxcZcss) + { + szxcZcss.setCreateTime(DateUtils.getNowDate()); + return szxcZcssMapper.insertSzxcZcss(szxcZcss); + } + + /** + * 修改资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + @Override + public int updateSzxcZcss(SzxcZcss szxcZcss) + { + szxcZcss.setUpdateTime(DateUtils.getNowDate()); + return szxcZcssMapper.updateSzxcZcss(szxcZcss); + } + + /** + * 批量删除资产设施 + * + * @param ids 需要删除的资产设施主键 + * @return 结果 + */ + @Override + public int deleteSzxcZcssByIds(Long[] ids) + { + return szxcZcssMapper.deleteSzxcZcssByIds(ids); + } + + /** + * 删除资产设施信息 + * + * @param id 资产设施主键 + * @return 结果 + */ + @Override + public int deleteSzxcZcssById(Long id) + { + return szxcZcssMapper.deleteSzxcZcssById(id); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java new file mode 100644 index 0000000..484dfe1 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcZcssxjServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.szxc.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.szxc.mapper.SzxcZcssxjMapper; +import com.ruoyi.szxc.domain.SzxcZcssxj; +import com.ruoyi.szxc.service.ISzxcZcssxjService; + +/** + * 资产设施巡检Service业务层处理 + * + * @author hs + * @date 2024-04-02 + */ +@Service +public class SzxcZcssxjServiceImpl implements ISzxcZcssxjService +{ + @Autowired + private SzxcZcssxjMapper szxcZcssxjMapper; + + /** + * 查询资产设施巡检 + * + * @param id 资产设施巡检主键 + * @return 资产设施巡检 + */ + @Override + public SzxcZcssxj selectSzxcZcssxjById(Long id) + { + return szxcZcssxjMapper.selectSzxcZcssxjById(id); + } + + /** + * 查询资产设施巡检列表 + * + * @param szxcZcssxj 资产设施巡检 + * @return 资产设施巡检 + */ + @Override + public List selectSzxcZcssxjList(SzxcZcssxj szxcZcssxj) + { + return szxcZcssxjMapper.selectSzxcZcssxjList(szxcZcssxj); + } + + /** + * 新增资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + @Override + public int insertSzxcZcssxj(SzxcZcssxj szxcZcssxj) + { + szxcZcssxj.setCreateTime(DateUtils.getNowDate()); + return szxcZcssxjMapper.insertSzxcZcssxj(szxcZcssxj); + } + + /** + * 修改资产设施巡检 + * + * @param szxcZcssxj 资产设施巡检 + * @return 结果 + */ + @Override + public int updateSzxcZcssxj(SzxcZcssxj szxcZcssxj) + { + szxcZcssxj.setUpdateTime(DateUtils.getNowDate()); + return szxcZcssxjMapper.updateSzxcZcssxj(szxcZcssxj); + } + + /** + * 批量删除资产设施巡检 + * + * @param ids 需要删除的资产设施巡检主键 + * @return 结果 + */ + @Override + public int deleteSzxcZcssxjByIds(Long[] ids) + { + return szxcZcssxjMapper.deleteSzxcZcssxjByIds(ids); + } + + /** + * 删除资产设施巡检信息 + * + * @param id 资产设施巡检主键 + * @return 结果 + */ + @Override + public int deleteSzxcZcssxjById(Long id) + { + return szxcZcssxjMapper.deleteSzxcZcssxjById(id); + } +} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml index 91f1266..089e32e 100644 --- a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml @@ -1,9 +1,9 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -14,6 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -25,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, zc_name, zc_type, install_date, fzr, phone, address, picture, xj, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_zcss + select id, zc_name, zc_type, install_date, fzr, phone, address, picture, xj, xj_cycle, last_time, xj_start, xj_end, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_zcss - + - + insert into szxc_zcss @@ -61,6 +69,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" address, picture, xj, + xj_cycle, + last_time, + xj_start, + xj_end, remark, create_by, create_time, @@ -69,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_id, dept_name, user_id, - + #{zcName}, #{zcType}, @@ -79,6 +91,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{address}, #{picture}, #{xj}, + #{xjCycle}, + #{lastTime}, + #{xjStart}, + #{xjEnd}, #{remark}, #{createBy}, #{createTime}, @@ -87,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deptId}, #{deptName}, #{userId}, - + @@ -101,6 +117,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" address = #{address}, picture = #{picture}, xj = #{xj}, + xj_cycle = #{xjCycle}, + last_time = #{lastTime}, + xj_start = #{xjStart}, + xj_end = #{xjEnd}, remark = #{remark}, create_by = #{createBy}, create_time = #{createTime}, @@ -118,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from szxc_zcss where id in + delete from szxc_zcss where id in #{id} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml new file mode 100644 index 0000000..fa88f57 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssxjMapper.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, zcss_id, zc_name, xj_name, phone, xj_date, title, xj_result, xj_explain, picture, xj_status, xj_start, xj_end, remark, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_zcssxj + + + + + + + + insert into szxc_zcssxj + + zcss_id, + zc_name, + xj_name, + phone, + xj_date, + title, + xj_result, + xj_explain, + picture, + xj_status, + xj_start, + xj_end, + remark, + create_by, + create_time, + update_by, + update_time, + dept_id, + dept_name, + user_id, + + + #{zcssId}, + #{zcName}, + #{xjName}, + #{phone}, + #{xjDate}, + #{title}, + #{xjResult}, + #{xjExplain}, + #{picture}, + #{xjStatus}, + #{xjStart}, + #{xjEnd}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + #{userId}, + + + + + update szxc_zcssxj + + zcss_id = #{zcssId}, + zc_name = #{zcName}, + xj_name = #{xjName}, + phone = #{phone}, + xj_date = #{xjDate}, + title = #{title}, + xj_result = #{xjResult}, + xj_explain = #{xjExplain}, + picture = #{picture}, + xj_status = #{xjStatus}, + xj_start = #{xjStart}, + xj_end = #{xjEnd}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + dept_id = #{deptId}, + dept_name = #{deptName}, + user_id = #{userId}, + + where id = #{id} + + + + delete from szxc_zcssxj where id = #{id} + + + + delete from szxc_zcssxj where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/szxc/zcssxj.js b/ruoyi-ui/src/api/szxc/zcssxj.js new file mode 100644 index 0000000..175fa95 --- /dev/null +++ b/ruoyi-ui/src/api/szxc/zcssxj.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询资产设施巡检列表 +export function listZcssxj(query) { + return request({ + url: '/szxc/zcssxj/list', + method: 'get', + params: query + }) +} + +// 查询资产设施巡检详细 +export function getZcssxj(id) { + return request({ + url: '/szxc/zcssxj/' + id, + method: 'get' + }) +} + +// 新增资产设施巡检 +export function addZcssxj(data) { + return request({ + url: '/szxc/zcssxj', + method: 'post', + data: data + }) +} + +// 修改资产设施巡检 +export function updateZcssxj(data) { + return request({ + url: '/szxc/zcssxj', + method: 'put', + data: data + }) +} + +// 删除资产设施巡检 +export function delZcssxj(id) { + return request({ + url: '/szxc/zcssxj/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/szxc/zcss/index.vue b/ruoyi-ui/src/views/szxc/zcss/index.vue index 22ec82b..a8f8eb5 100644 --- a/ruoyi-ui/src/views/szxc/zcss/index.vue +++ b/ruoyi-ui/src/views/szxc/zcss/index.vue @@ -11,10 +11,10 @@ + v-model="queryParams.installDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择安装时间"> @@ -49,14 +49,46 @@ @keyup.enter.native="handleQuery" /> - + + + + + + + + + + + + + + + + - + + + + + + + + + + + @@ -171,7 +219,7 @@ - + + v-model="form.installDate" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择安装时间"> @@ -206,8 +254,35 @@ - - + + + + + + + + + + + + + + + + + @@ -231,162 +306,170 @@ diff --git a/ruoyi-ui/src/views/szxc/zcssxj/index.vue b/ruoyi-ui/src/views/szxc/zcssxj/index.vue new file mode 100644 index 0000000..86c90b9 --- /dev/null +++ b/ruoyi-ui/src/views/szxc/zcssxj/index.vue @@ -0,0 +1,458 @@ + + +