From 87a3f599922b38cc2bc118444047d6ae57311582 Mon Sep 17 00:00:00 2001 From: yanyan Date: Tue, 20 May 2025 17:21:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforceSystemNoticeController.java | 87 +++++++++++++++++++ .../AppEnforcementRegistrationController.java | 4 + .../project/system/notice/domain/Notice.java | 37 ++++++++ .../system/notice/service/INoticeService.java | 2 + .../notice/service/NoticeServiceImpl.java | 16 ++++ 5 files changed, 146 insertions(+) create mode 100644 lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforceSystemNoticeController.java diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforceSystemNoticeController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforceSystemNoticeController.java new file mode 100644 index 00000000..e89424a6 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforceSystemNoticeController.java @@ -0,0 +1,87 @@ +package com.zdxt.app.controller; + +import com.zdxt.auth.project.system.notice.domain.Notice; +import com.zdxt.auth.project.system.notice.service.INoticeService; +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; + +/** + * 后台通知Controller + * + * @author yanyan + * @date 2025-05-20 + */ +@Controller +@RequestMapping("/app/system/enforceNotice") +public class AppEnforceSystemNoticeController extends BaseController { + @Autowired + private INoticeService noticeService; + + /** + * 查询后台通知列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(Notice notice) { + startPage(); + List list = noticeService.selectNoticeList(notice); + return getDataTable(list); + } + + + @GetMapping("/listNoPermission") + @ResponseBody + public TableDataInfo listNoPermission(Notice notice) { + + List list = + noticeService.selectNoticeListNoPermission(notice); + return getDataTable(list); + } + + + /** + * 查看通知详情 + */ + @GetMapping("/detail/{id}") + @ResponseBody + public ZDResponse detailById(@PathVariable("id") String id) { + Notice notice = noticeService.selectNoticeById(id); + return ZDResponse.success("查询成功", notice); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @GetMapping("/queryFiles/{key}") + @ResponseBody + public ZDResponse queryFiles(@PathVariable String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", noticeService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + + /** + * 查询附件信息 + * + * @param key + * @return + */ + @PostMapping("/queryFilesPost") + @ResponseBody + public ZDResponse queryFilesPost(String key) { + HashMap map = new HashMap<>(); + map.put("filePreview", noticeService.queryFiles(key)); + return ZDResponse.success("获取成功", map); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java index 27f5674f..263579c2 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java @@ -194,6 +194,10 @@ public class AppEnforcementRegistrationController extends BaseController @ResponseBody public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) { + if (Objects.nonNull(enforcementRegistration.getUserId())) { + UserBean userByUserId = userApi.getUserByUserId(enforcementRegistration.getUserId()); + enforcementRegistration.setDeptId(userByUserId==null?null:userByUserId.getDeptId()); + } startPage(); if (StringUtils.isEmpty(enforcementRegistration.getSearchValue()) && StringUtils.isEmpty(enforcementRegistration.getEnterpriseNumber())) { diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java index 034feb59..308c37f6 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/domain/Notice.java @@ -1,5 +1,6 @@ package com.zdxt.auth.project.system.notice.domain; +import javax.tools.FileObject; import javax.validation.constraints.*; import javax.validation.constraints.Size; import com.zdxt.common.BaseDomain; @@ -52,6 +53,42 @@ public class Notice extends BaseDomain private String endTime; private String createTimeStr; + private FileObject fileObject; + + + /** + * 文件对象 + */ + public static class FileObject{ + private String fileName; + private String fileUrl; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + } + + public FileObject getFileObject() { + return fileObject; + } + + public void setFileObject(FileObject fileObject) { + this.fileObject = fileObject; + } + + public String getNoticeId() { diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/INoticeService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/INoticeService.java index 49d3940d..67d3f2b9 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/INoticeService.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/INoticeService.java @@ -29,6 +29,8 @@ public interface INoticeService */ public List selectNoticeList(Notice notice); + public List selectNoticeListNoPermission(Notice notice); + /** * 新增公告 * diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java index 60977ceb..0f0d08a8 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/notice/service/NoticeServiceImpl.java @@ -62,6 +62,22 @@ public class NoticeServiceImpl implements INoticeService return noticeMapper.selectNoticeList(notice); } + @Override + public List selectNoticeListNoPermission(Notice notice) { + List list = + noticeMapper.selectNoticeList(notice); + list.forEach(res ->{ + List zdxtFileCommons = zdxtFileCommonApi.selectZdxtFileById(res.getNoticeId()); + if(zdxtFileCommons != null && zdxtFileCommons.size() > 0){ + Notice.FileObject fileObject = new Notice.FileObject(); + fileObject.setFileName(zdxtFileCommons.get(0).getFileName()); + fileObject.setFileUrl(zdxtFileCommons.get(0).getUploadPath()); + res.setFileObject(fileObject); + } + }); + return list; + } + /** * 新增公告 *