diff --git a/pom.xml b/pom.xml index 09ef2b5..3b54e42 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ruoyi http://www.ruoyi.vip - 若依管理系统 + 数字乡村管理系统 3.8.7 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java index ae1c3ec..081c104 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java @@ -1,27 +1,23 @@ package com.ruoyi.web.core.config; -import java.util.ArrayList; -import java.util.List; +import com.ruoyi.common.config.RuoYiConfig; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; +import springfox.documentation.service.*; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; +import java.util.ArrayList; +import java.util.List; + /** * Swagger2的接口配置 * @@ -113,7 +109,7 @@ public class SwaggerConfig // 用ApiInfoBuilder进行定制 return new ApiInfoBuilder() // 设置标题 - .title("标题:若依管理系统_接口文档") + .title("标题:数字乡村管理系统_接口文档") // 描述 .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.java new file mode 100644 index 0000000..8195801 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXyAuditRecardController.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.SzxcXyAuditRecard; +import com.ruoyi.szxc.service.ISzxcXyAuditRecardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 心愿审核记录Controller + * + * @author hs + * @date 2024-04-13 + */ +@RestController +@RequestMapping("/szxc/xyrecard") +public class SzxcXyAuditRecardController extends BaseController +{ + @Autowired + private ISzxcXyAuditRecardService szxcXyAuditRecardService; + + /** + * 查询心愿审核记录列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:list')") + @GetMapping("/list") + public TableDataInfo list(SzxcXyAuditRecard szxcXyAuditRecard) + { + startPage(); + List list = szxcXyAuditRecardService.selectSzxcXyAuditRecardList(szxcXyAuditRecard); + return getDataTable(list); + } + + /** + * 导出心愿审核记录列表 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:export')") + @Log(title = "心愿审核记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SzxcXyAuditRecard szxcXyAuditRecard) + { + List list = szxcXyAuditRecardService.selectSzxcXyAuditRecardList(szxcXyAuditRecard); + ExcelUtil util = new ExcelUtil(SzxcXyAuditRecard.class); + util.exportExcel(response, list, "心愿审核记录数据"); + } + + /** + * 获取心愿审核记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(szxcXyAuditRecardService.selectSzxcXyAuditRecardById(id)); + } + + /** + * 新增心愿审核记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:add')") + @Log(title = "心愿审核记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) + { + return toAjax(szxcXyAuditRecardService.insertSzxcXyAuditRecard(szxcXyAuditRecard)); + } + + /** + * 修改心愿审核记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:edit')") + @Log(title = "心愿审核记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SzxcXyAuditRecard szxcXyAuditRecard) + { + return toAjax(szxcXyAuditRecardService.updateSzxcXyAuditRecard(szxcXyAuditRecard)); + } + + /** + * 删除心愿审核记录 + */ + @PreAuthorize("@ss.hasPermi('szxc:xyrecard:remove')") + @Log(title = "心愿审核记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(szxcXyAuditRecardService.deleteSzxcXyAuditRecardByIds(ids)); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java new file mode 100644 index 0000000..8782c17 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcXyAuditRecard.java @@ -0,0 +1,98 @@ +package com.ruoyi.szxc.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; + +/** + * 心愿审核记录对象 szxc_xy_audit_recard + * + * @author hs + * @date 2024-04-13 + */ +public class SzxcXyAuditRecard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 心愿id */ + @Excel(name = "心愿id") + private Long xyId; + + /** 审核结果 */ + @Excel(name = "审核结果") + private String auditResult; + + /** 审核原因 */ + @Excel(name = "审核原因") + private String auditReason; + + /** 审核人 */ + @Excel(name = "审核人") + private String auditName; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setXyId(Long xyId) + { + this.xyId = xyId; + } + + public Long getXyId() + { + return xyId; + } + public void setAuditResult(String auditResult) + { + this.auditResult = auditResult; + } + + public String getAuditResult() + { + return auditResult; + } + public void setAuditReason(String auditReason) + { + this.auditReason = auditReason; + } + + public String getAuditReason() + { + return auditReason; + } + public void setAuditName(String auditName) + { + this.auditName = auditName; + } + + public String getAuditName() + { + return auditName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("xyId", getXyId()) + .append("auditResult", getAuditResult()) + .append("auditReason", getAuditReason()) + .append("auditName", getAuditName()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java new file mode 100644 index 0000000..4d8cb4f --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/mapper/SzxcXyAuditRecardMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.mapper; + +import com.ruoyi.szxc.domain.SzxcXyAuditRecard; + +import java.util.List; + +/** + * 心愿审核记录Mapper接口 + * + * @author hs + * @date 2024-04-13 + */ +public interface SzxcXyAuditRecardMapper +{ + /** + * 查询心愿审核记录 + * + * @param id 心愿审核记录主键 + * @return 心愿审核记录 + */ + public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); + + /** + * 查询心愿审核记录列表 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 心愿审核记录集合 + */ + public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 新增心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 修改心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 删除心愿审核记录 + * + * @param id 心愿审核记录主键 + * @return 结果 + */ + public int deleteSzxcXyAuditRecardById(Long id); + + /** + * 批量删除心愿审核记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSzxcXyAuditRecardByIds(Long[] ids); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java new file mode 100644 index 0000000..07e091e --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/ISzxcXyAuditRecardService.java @@ -0,0 +1,62 @@ +package com.ruoyi.szxc.service; + +import com.ruoyi.szxc.domain.SzxcXyAuditRecard; + +import java.util.List; + +/** + * 心愿审核记录Service接口 + * + * @author hs + * @date 2024-04-13 + */ +public interface ISzxcXyAuditRecardService +{ + /** + * 查询心愿审核记录 + * + * @param id 心愿审核记录主键 + * @return 心愿审核记录 + */ + public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id); + + /** + * 查询心愿审核记录列表 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 心愿审核记录集合 + */ + public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 新增心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 修改心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard); + + /** + * 批量删除心愿审核记录 + * + * @param ids 需要删除的心愿审核记录主键集合 + * @return 结果 + */ + public int deleteSzxcXyAuditRecardByIds(Long[] ids); + + /** + * 删除心愿审核记录信息 + * + * @param id 心愿审核记录主键 + * @return 结果 + */ + public int deleteSzxcXyAuditRecardById(Long id); +} diff --git a/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java new file mode 100644 index 0000000..7cbfec2 --- /dev/null +++ b/ruoyi-szxc/src/main/java/com/ruoyi/szxc/service/impl/SzxcXyAuditRecardServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.szxc.service.impl; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.szxc.domain.SzxcXyAuditRecard; +import com.ruoyi.szxc.mapper.SzxcXyAuditRecardMapper; +import com.ruoyi.szxc.service.ISzxcXyAuditRecardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 心愿审核记录Service业务层处理 + * + * @author hs + * @date 2024-04-13 + */ +@Service +public class SzxcXyAuditRecardServiceImpl implements ISzxcXyAuditRecardService +{ + @Autowired + private SzxcXyAuditRecardMapper szxcXyAuditRecardMapper; + + /** + * 查询心愿审核记录 + * + * @param id 心愿审核记录主键 + * @return 心愿审核记录 + */ + @Override + public SzxcXyAuditRecard selectSzxcXyAuditRecardById(Long id) + { + return szxcXyAuditRecardMapper.selectSzxcXyAuditRecardById(id); + } + + /** + * 查询心愿审核记录列表 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 心愿审核记录 + */ + @Override + public List selectSzxcXyAuditRecardList(SzxcXyAuditRecard szxcXyAuditRecard) + { + return szxcXyAuditRecardMapper.selectSzxcXyAuditRecardList(szxcXyAuditRecard); + } + + /** + * 新增心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + @Override + public int insertSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard) + { + szxcXyAuditRecard.setCreateTime(DateUtils.getNowDate()); + return szxcXyAuditRecardMapper.insertSzxcXyAuditRecard(szxcXyAuditRecard); + } + + /** + * 修改心愿审核记录 + * + * @param szxcXyAuditRecard 心愿审核记录 + * @return 结果 + */ + @Override + public int updateSzxcXyAuditRecard(SzxcXyAuditRecard szxcXyAuditRecard) + { + szxcXyAuditRecard.setUpdateTime(DateUtils.getNowDate()); + return szxcXyAuditRecardMapper.updateSzxcXyAuditRecard(szxcXyAuditRecard); + } + + /** + * 批量删除心愿审核记录 + * + * @param ids 需要删除的心愿审核记录主键 + * @return 结果 + */ + @Override + public int deleteSzxcXyAuditRecardByIds(Long[] ids) + { + return szxcXyAuditRecardMapper.deleteSzxcXyAuditRecardByIds(ids); + } + + /** + * 删除心愿审核记录信息 + * + * @param id 心愿审核记录主键 + * @return 结果 + */ + @Override + public int deleteSzxcXyAuditRecardById(Long id) + { + return szxcXyAuditRecardMapper.deleteSzxcXyAuditRecardById(id); + } +} diff --git a/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml new file mode 100644 index 0000000..0136a2c --- /dev/null +++ b/ruoyi-szxc/src/main/resources/mapper/szxc/SzxcXyAuditRecardMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + select id, xy_id, audit_result, audit_reason, audit_name, remark, create_by, create_time, update_by, update_time from szxc_xy_audit_recard + + + + + + + + insert into szxc_xy_audit_recard + + xy_id, + audit_result, + audit_reason, + audit_name, + remark, + create_by, + create_time, + update_by, + update_time, + + + #{xyId}, + #{auditResult}, + #{auditReason}, + #{auditName}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update szxc_xy_audit_recard + + xy_id = #{xyId}, + audit_result = #{auditResult}, + audit_reason = #{auditReason}, + audit_name = #{auditName}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from szxc_xy_audit_recard where id = #{id} + + + + delete from szxc_xy_audit_recard where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 302ecd1..37c429d 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 数字乡村管理系统 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# 数字乡村管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index b4893b0..9f28d96 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 数字乡村管理系统 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 数字乡村管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging index 361859f..c374ec9 100644 --- a/ruoyi-ui/.env.staging +++ b/ruoyi-ui/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 数字乡村管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 数字乡村管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index f611c03..b37cee2 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi", "version": "3.8.7", - "description": "若依管理系统", + "description": "数字乡村管理系统", "author": "若依", "license": "MIT", "scripts": { diff --git a/ruoyi-ui/src/api/szxc/xyrecard.js b/ruoyi-ui/src/api/szxc/xyrecard.js new file mode 100644 index 0000000..34d9210 --- /dev/null +++ b/ruoyi-ui/src/api/szxc/xyrecard.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询心愿审核记录列表 +export function listXyrecard(query) { + return request({ + url: '/szxc/xyrecard/list', + method: 'get', + params: query + }) +} + +// 查询心愿审核记录详细 +export function getXyrecard(id) { + return request({ + url: '/szxc/xyrecard/' + id, + method: 'get' + }) +} + +// 新增心愿审核记录 +export function addXyrecard(data) { + return request({ + url: '/szxc/xyrecard', + method: 'post', + data: data + }) +} + +// 修改心愿审核记录 +export function updateXyrecard(data) { + return request({ + url: '/szxc/xyrecard', + method: 'put', + data: data + }) +} + +// 删除心愿审核记录 +export function delXyrecard(id) { + return request({ + url: '/szxc/xyrecard/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/szxc/xyrecard/index.vue b/ruoyi-ui/src/views/szxc/xyrecard/index.vue new file mode 100644 index 0000000..9babb0f --- /dev/null +++ b/ruoyi-ui/src/views/szxc/xyrecard/index.vue @@ -0,0 +1,296 @@ + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 0ad383d..9c5fb90 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '数字乡村管理系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口