From 0330ca5619f2be3a1be2cb9ed0893f9aa90bb11a Mon Sep 17 00:00:00 2001 From: hansha Date: Mon, 1 Apr 2024 12:30:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 ruoyi-admin/src/main/resources/application-test.yml diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..26d9a70 --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,61 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://localhost:3306/szxc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: ceshi + password: ruanfa + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file From 9b50ddaafcbe6d2c0aa6e8a235371b2277cb592d Mon Sep 17 00:00:00 2001 From: hansha Date: Tue, 2 Apr 2024 08:39:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=AE=BE=E6=96=BD?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szxc/controller/SzxcZcssController.java | 104 +++++ .../java/com/ruoyi/szxc/domain/SzxcZcss.java | 200 +++++++++ .../com/ruoyi/szxc/mapper/SzxcZcssMapper.java | 62 +++ .../ruoyi/szxc/service/ISzxcZcssService.java | 62 +++ .../szxc/service/impl/ISzxcZcssService.java | 62 +++ .../resources/mapper/szxc/SzxcZcssMapper.xml | 126 ++++++ ruoyi-ui/src/api/szxc/zcss.js | 44 ++ ruoyi-ui/src/views/szxc/zcss/index.vue | 392 ++++++++++++++++++ 8 files changed, 1052 insertions(+) create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssMapper.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssService.java create mode 100644 ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/ISzxcZcssService.java create mode 100644 ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml create mode 100644 ruoyi-ui/src/api/szxc/zcss.js create mode 100644 ruoyi-ui/src/views/szxc/zcss/index.vue diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java new file mode 100644 index 0000000..4410438 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcZcssController.java @@ -0,0 +1,104 @@ +package com.ruoyi.szxc.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.szxc.domain.SzxcZcss; +import com.ruoyi.szxc.service.ISzxcZcssService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 资产设施Controller + * + * @author hs + * @date 2024-04-02 + */ +@RestController +@RequestMapping("/szxc/zcss") +public class SzxcZcssController extends BaseController +{ + @Autowired + private ISzxcZcssService szxcZcssService; + + /** + * 查询资产设施列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:list')") + @GetMapping("/list") + public TableDataInfo list(SzxcZcss szxcZcss) + { + startPage(); + List list = szxcZcssService.selectSzxcZcssList(szxcZcss); + return getDataTable(list); + } + + /** + * 导出资产设施列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:export')") + @Log(title = "资产设施", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SzxcZcss szxcZcss) + { + List list = szxcZcssService.selectSzxcZcssList(szxcZcss); + ExcelUtil util = new ExcelUtil(SzxcZcss.class); + util.exportExcel(response, list, "资产设施数据"); + } + + /** + * 获取资产设施详细信息 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(szxcZcssService.selectSzxcZcssById(id)); + } + + /** + * 新增资产设施 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:add')") + @Log(title = "资产设施", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SzxcZcss szxcZcss) + { + return toAjax(szxcZcssService.insertSzxcZcss(szxcZcss)); + } + + /** + * 修改资产设施 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:edit')") + @Log(title = "资产设施", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzxcZcss szxcZcss) + { + return toAjax(szxcZcssService.updateSzxcZcss(szxcZcss)); + } + + /** + * 删除资产设施 + */ + @PreAuthorize("@ss.hasPermi('szxc:zcss:remove')") + @Log(title = "资产设施", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szxcZcssService.deleteSzxcZcssByIds(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 new file mode 100644 index 0000000..dde585e --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcZcss.java @@ -0,0 +1,200 @@ +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_zcss + * + * @author hs + * @date 2024-04-02 + */ +public class SzxcZcss extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 资产名称 */ + @Excel(name = "资产名称") + private String zcName; + + /** 资产类型(字典) */ + @Excel(name = "资产类型(字典)") + private String zcType; + + /** 安装时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date installDate; + + /** 负责人 */ + @Excel(name = "负责人") + private String fzr; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String phone; + + /** 详细地址 */ + @Excel(name = "详细地址") + private String address; + + /** 资产照片 */ + @Excel(name = "资产照片") + private String picture; + + /** 是否巡检 */ + @Excel(name = "是否巡检") + private String xj; + + /** 部门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 setZcName(String zcName) + { + this.zcName = zcName; + } + + public String getZcName() + { + return zcName; + } + public void setZcType(String zcType) + { + this.zcType = zcType; + } + + public String getZcType() + { + return zcType; + } + public void setInstallDate(Date installDate) + { + this.installDate = installDate; + } + + public Date getInstallDate() + { + return installDate; + } + public void setFzr(String fzr) + { + this.fzr = fzr; + } + + public String getFzr() + { + return fzr; + } + public void setPhone(String phone) + { + this.phone = phone; + } + + public String getPhone() + { + return phone; + } + public void setAddress(String address) + { + this.address = address; + } + + public String getAddress() + { + return address; + } + public void setPicture(String picture) + { + this.picture = picture; + } + + public String getPicture() + { + return picture; + } + public void setXj(String xj) + { + this.xj = xj; + } + + public String getXj() + { + return xj; + } + 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("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(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssMapper.java new file mode 100644 index 0000000..d6934d6 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcZcssMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.mapper; + +import com.ruoyi.szxc.domain.SzxcZcss; + +import java.util.List; + +/** + * 资产设施Mapper接口 + * + * @author hs + * @date 2024-04-02 + */ +public interface SzxcZcssMapper +{ + /** + * 查询资产设施 + * + * @param id 资产设施主键 + * @return 资产设施 + */ + public SzxcZcss selectSzxcZcssById(Long id); + + /** + * 查询资产设施列表 + * + * @param szxcZcss 资产设施 + * @return 资产设施集合 + */ + public List selectSzxcZcssList(SzxcZcss szxcZcss); + + /** + * 新增资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int insertSzxcZcss(SzxcZcss szxcZcss); + + /** + * 修改资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int updateSzxcZcss(SzxcZcss szxcZcss); + + /** + * 删除资产设施 + * + * @param id 资产设施主键 + * @return 结果 + */ + public int deleteSzxcZcssById(Long id); + + /** + * 批量删除资产设施 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcZcssByIds(Long[] ids); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssService.java new file mode 100644 index 0000000..5c129e9 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcZcssService.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.service; + +import com.ruoyi.szxc.domain.SzxcZcss; + +import java.util.List; + +/** + * 资产设施Service接口 + * + * @author hs + * @date 2024-04-02 + */ +public interface ISzxcZcssService +{ + /** + * 查询资产设施 + * + * @param id 资产设施主键 + * @return 资产设施 + */ + public SzxcZcss selectSzxcZcssById(Long id); + + /** + * 查询资产设施列表 + * + * @param szxcZcss 资产设施 + * @return 资产设施集合 + */ + public List selectSzxcZcssList(SzxcZcss szxcZcss); + + /** + * 新增资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int insertSzxcZcss(SzxcZcss szxcZcss); + + /** + * 修改资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int updateSzxcZcss(SzxcZcss szxcZcss); + + /** + * 批量删除资产设施 + * + * @param ids 需要删除的资产设施主键集合 + * @return 结果 + */ + public int deleteSzxcZcssByIds(Long[] ids); + + /** + * 删除资产设施信息 + * + * @param id 资产设施主键 + * @return 结果 + */ + public int deleteSzxcZcssById(Long id); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/ISzxcZcssService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/ISzxcZcssService.java new file mode 100644 index 0000000..6ee4820 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/ISzxcZcssService.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.szxc.domain.SzxcZcss; + +import java.util.List; + +/** + * 资产设施Service接口 + * + * @author hs + * @date 2024-04-02 + */ +public interface ISzxcZcssService +{ + /** + * 查询资产设施 + * + * @param id 资产设施主键 + * @return 资产设施 + */ + public SzxcZcss selectSzxcZcssById(Long id); + + /** + * 查询资产设施列表 + * + * @param szxcZcss 资产设施 + * @return 资产设施集合 + */ + public List selectSzxcZcssList(SzxcZcss szxcZcss); + + /** + * 新增资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int insertSzxcZcss(SzxcZcss szxcZcss); + + /** + * 修改资产设施 + * + * @param szxcZcss 资产设施 + * @return 结果 + */ + public int updateSzxcZcss(SzxcZcss szxcZcss); + + /** + * 批量删除资产设施 + * + * @param ids 需要删除的资产设施主键集合 + * @return 结果 + */ + public int deleteSzxcZcssByIds(Long[] ids); + + /** + * 删除资产设施信息 + * + * @param id 资产设施主键 + * @return 结果 + */ + public int deleteSzxcZcssById(Long id); +} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml new file mode 100644 index 0000000..91f1266 --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcZcssMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + insert into szxc_zcss + + 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, + + + #{zcName}, + #{zcType}, + #{installDate}, + #{fzr}, + #{phone}, + #{address}, + #{picture}, + #{xj}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{deptId}, + #{deptName}, + #{userId}, + + + + + update szxc_zcss + + zc_name = #{zcName}, + zc_type = #{zcType}, + install_date = #{installDate}, + fzr = #{fzr}, + phone = #{phone}, + address = #{address}, + picture = #{picture}, + xj = #{xj}, + 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_zcss where id = #{id} + + + + delete from szxc_zcss where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/szxc/zcss.js b/ruoyi-ui/src/api/szxc/zcss.js new file mode 100644 index 0000000..123021d --- /dev/null +++ b/ruoyi-ui/src/api/szxc/zcss.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询资产设施列表 +export function listZcss(query) { + return request({ + url: '/szxc/zcss/list', + method: 'get', + params: query + }) +} + +// 查询资产设施详细 +export function getZcss(id) { + return request({ + url: '/szxc/zcss/' + id, + method: 'get' + }) +} + +// 新增资产设施 +export function addZcss(data) { + return request({ + url: '/szxc/zcss', + method: 'post', + data: data + }) +} + +// 修改资产设施 +export function updateZcss(data) { + return request({ + url: '/szxc/zcss', + method: 'put', + data: data + }) +} + +// 删除资产设施 +export function delZcss(id) { + return request({ + url: '/szxc/zcss/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/szxc/zcss/index.vue b/ruoyi-ui/src/views/szxc/zcss/index.vue new file mode 100644 index 0000000..22ec82b --- /dev/null +++ b/ruoyi-ui/src/views/szxc/zcss/index.vue @@ -0,0 +1,392 @@ + + +