From fef04eccf5208fc8d4d1f5336152dec3263c07d4 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Mon, 17 Mar 2025 11:02:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=88=B6=E5=BB=BA=E8=AE=BE=E5=92=8C?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E6=80=A7=E6=88=90=E6=9E=9C=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/update.sql | 2 +- .../HuzhouInformationMaterialController.java | 3 + ...ouInformationMaterialResultController.java | 105 ++++++++++++++++++ .../HuzhouInformationMaterialServiceImpl.java | 4 + 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialResultController.java diff --git a/db/update.sql b/db/update.sql index 6d186ae..f852d48 100644 --- a/db/update.sql +++ b/db/update.sql @@ -27,7 +27,7 @@ INSERT INTO `guoyan_huzhou`.`sys_permission`(`id`, `parent_id`, `type`, `title`, INSERT INTO `guoyan_huzhou`.`sys_permission`(`id`, `parent_id`, `type`, `title`, `name`, `code`, `icon`, `path`, `component`, `external`, `order_no`, `display`, `open_mode`, `status`, `remarks`, `version`, `create_user`, `create_date`, `edit_user`, `edit_date`) VALUES ('1899280498354561025', '1803680740161212418', 'menu', '标志性成果', NULL, NULL, 'ant-design:book-filled', '/informationSub/iconic/index', '/informationSub/iconic/index', '0', 4, '1', '1', '1', NULL, 0, '1', '2025-03-11 10:05:32', '1', '2025-03-11 10:05:32'); # 创建信息材料表 -CREATE TABLE `huzhou_informationmaterial` ( +CREATE TABLE `huzhou_information_material` ( `name` varchar(255) DEFAULT NULL COMMENT '期刊名称', `publish_time` date DEFAULT NULL COMMENT '发布日期', `id` varchar(255) NOT NULL COMMENT 'id', diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialController.java index b54a5cf..29014e4 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialController.java @@ -14,6 +14,7 @@ import java.io.IOException; /** * @author gjh + * 机制建设 */ @RestController @RequestMapping("/huzhouInformationMaterial") @@ -33,6 +34,8 @@ public class HuzhouInformationMaterialController { @RequestParam(name="current", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ + // 机制建设菜单默认显示:配套工作制度 + informationMaterial.setType("配套工作制度"); Page pageList = informationMaterialService.getInformationMaterialPageList(informationMaterial, pageNo, pageSize); return Result.ok(pageList); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialResultController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialResultController.java new file mode 100644 index 0000000..0f50363 --- /dev/null +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouInformationMaterialResultController.java @@ -0,0 +1,105 @@ +package com.easy.admin.modules.huzhou.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.easy.admin.common.api.vo.Result; +import com.easy.admin.common.core.exception.EasyException; +import com.easy.admin.modules.huzhou.entity.HuzhouInformationMaterial; +import com.easy.admin.modules.huzhou.service.IHuzhouInformationMaterialService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author gjh + * 标志性成果 + */ +@RestController +@RequestMapping("/huzhouInformationMaterial/result") +public class HuzhouInformationMaterialResultController { + @Autowired + private IHuzhouInformationMaterialService informationMaterialService; + + /** + * 查询信息材料分页 + * @param informationMaterial 条件 + * @param pageNo 分页 + * @param pageSize 页码 + * @return + */ + @GetMapping("/informationMaterialPageList") + public Result informationMaterialPageList(HuzhouInformationMaterial informationMaterial, + @RequestParam(name="current", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize){ + Page pageList = informationMaterialService.getInformationMaterialPageList(informationMaterial, pageNo, pageSize); + return Result.ok(pageList); + } + + /** + * 根据id获取详情信息材料 + * @param id + * @return + */ + @GetMapping("/getInformationMaterialById") + public Result getInformationMaterialById(String id){ + HuzhouInformationMaterial byId = informationMaterialService.getById(id); + return Result.ok(byId); + } + + /** + * 添加信息材料 + * @param file + * @param informationMaterial + * @return + * @throws IOException + */ + @PostMapping("/addInformationMaterial") + public Result addInformationMaterial(@RequestParam(value = "file") MultipartFile file, HuzhouInformationMaterial informationMaterial) throws IOException { + informationMaterialService.addInformationMaterial(file,informationMaterial); + return Result.ok("上传成功"); + } + + /** + * 修改信息材料 + * @param file + * @param informationMaterial + * @return + * @throws IOException + */ + @PostMapping("/modifyInformationMaterial") + public Result modifyInformationMaterial(@RequestParam(value = "file",required = false) MultipartFile file, HuzhouInformationMaterial informationMaterial) throws IOException { + Boolean aBoolean = informationMaterialService.modifyInformationMaterial(file, informationMaterial); + if(aBoolean){ + return Result.ok("修改成功"); + } + throw new EasyException("修改失败"); + } + + /** + * 删除信息材料 + * @param informationMaterial + * @return + * @throws IOException + */ + @PostMapping("/deleteInformationMaterial") + public Result deleteInformationMaterial(@RequestBody HuzhouInformationMaterial informationMaterial) throws IOException { + Boolean aBoolean = informationMaterialService.deleteInformationMaterial(informationMaterial); + if(aBoolean){ + return Result.ok("删除成功"); + } + throw new EasyException("删除失败"); + } + + /** + * 批量下载 + * @param informationMaterial + * @param response + */ + @GetMapping("/batchdownloadInformationMaterialFiles") + public void batchdownloadInformationMaterialFiles(HuzhouInformationMaterial informationMaterial, HttpServletResponse response){ + informationMaterialService.batchdownloadInformationMaterialFiles(informationMaterial,response); + } + +} diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java index 8715a30..55d58fb 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouInformationMaterialServiceImpl.java @@ -56,6 +56,10 @@ public class HuzhouInformationMaterialServiceImpl extends ServiceImpl informationMaterialPage = new Page<>(pageNo, pageSize); queryWrapper.like(StringUtils.isNotBlank(informationMaterialName),HuzhouInformationMaterial::getName,informationMaterialName); queryWrapper.eq(StringUtils.isNotBlank(type),HuzhouInformationMaterial::getType,type); + // 标志性成果页面展示的时候默认不展示:配套工作制度 + if (StringUtils.isEmpty(type)){ + queryWrapper.ne(HuzhouInformationMaterial::getType,"配套工作制度"); + } queryWrapper.eq(StringUtils.isNotBlank(workplace),HuzhouInformationMaterial::getDutyWorkplace,workplace); if(publishTime!=null){ queryWrapper.eq(HuzhouInformationMaterial::getPublishTime,publishTime);