From 0fb9f8f47878cf96131cbcb07f6b63899e7c5bff Mon Sep 17 00:00:00 2001 From: zhangjing <924187658@qq.com> Date: Tue, 10 Dec 2024 16:33:11 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warn/common/constants/EntityConstants.java | 2 +- .../com/fxzy/warn/common/response/StatusCode.java | 1 + .../warn/controller/AnnouncementController.java | 116 ++++++++++++++++++++ .../warn/controller/AuditRecordsController.java | 56 ++++++++++ .../warn/controller/MonitorUsersController.java | 2 +- .../fxzy/warn/controller/NewsManageController.java | 122 +++++++++++++++++++++ .../fxzy/warn/controller/PermissionController.java | 96 ++++++++++++++++ .../warn/controller/VersionManageController.java | 96 ++++++++++++++++ .../com/fxzy/warn/mapper/AnnouncementMapper.java | 14 +++ .../com/fxzy/warn/mapper/AuditRecordsMapper.java | 14 +++ .../com/fxzy/warn/mapper/NewsManageMapper.java | 14 +++ .../com/fxzy/warn/mapper/PermissionMapper.java | 14 +++ .../com/fxzy/warn/mapper/PermissionUserMapper.java | 15 +++ .../com/fxzy/warn/mapper/VersionManageMapper.java | 14 +++ .../java/com/fxzy/warn/model/Announcement.java | 65 +++++++++++ src/main/java/com/fxzy/warn/model/NewsManage.java | 72 ++++++++++++ src/main/java/com/fxzy/warn/model/Permission.java | 42 +++++++ .../java/com/fxzy/warn/model/PermissionUser.java | 37 +++++++ src/main/java/com/fxzy/warn/model/User.java | 30 +---- .../java/com/fxzy/warn/model/VersionManage.java | 67 +++++++++++ src/main/java/com/fxzy/warn/model/vo/UserVO.java | 116 ++++++++++++++++++++ .../com/fxzy/warn/service/AnnouncementService.java | 53 +++++++++ .../com/fxzy/warn/service/AuditRecordsService.java | 13 ++- .../com/fxzy/warn/service/NewsManageService.java | 53 +++++++++ .../com/fxzy/warn/service/PermissionService.java | 53 +++++++++ .../fxzy/warn/service/PermissionUserService.java | 44 ++++++++ .../fxzy/warn/service/VersionManageService.java | 53 +++++++++ .../warn/service/impl/AnnouncementServiceImpl.java | 80 ++++++++++++++ .../warn/service/impl/AuditRecordsServiceImpl.java | 28 +++-- .../warn/service/impl/NewsManageServiceImpl.java | 68 ++++++++++++ .../warn/service/impl/PermissionServiceImpl.java | 84 ++++++++++++++ .../service/impl/PermissionUserServiceImpl.java | 45 ++++++++ .../fxzy/warn/service/impl/UserServiceImpl.java | 6 +- .../service/impl/VersionManageServiceImpl.java | 75 +++++++++++++ src/main/resources/mapper/AuditRecordsMapper.xml | 24 ++++ src/main/resources/mapper/FileMapper.xml | 2 +- 36 files changed, 1641 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/fxzy/warn/controller/AnnouncementController.java create mode 100644 src/main/java/com/fxzy/warn/controller/AuditRecordsController.java create mode 100644 src/main/java/com/fxzy/warn/controller/NewsManageController.java create mode 100644 src/main/java/com/fxzy/warn/controller/PermissionController.java create mode 100644 src/main/java/com/fxzy/warn/controller/VersionManageController.java create mode 100644 src/main/java/com/fxzy/warn/mapper/AnnouncementMapper.java create mode 100644 src/main/java/com/fxzy/warn/mapper/NewsManageMapper.java create mode 100644 src/main/java/com/fxzy/warn/mapper/PermissionMapper.java create mode 100644 src/main/java/com/fxzy/warn/mapper/PermissionUserMapper.java create mode 100644 src/main/java/com/fxzy/warn/mapper/VersionManageMapper.java create mode 100644 src/main/java/com/fxzy/warn/model/Announcement.java create mode 100644 src/main/java/com/fxzy/warn/model/NewsManage.java create mode 100644 src/main/java/com/fxzy/warn/model/Permission.java create mode 100644 src/main/java/com/fxzy/warn/model/PermissionUser.java create mode 100644 src/main/java/com/fxzy/warn/model/VersionManage.java create mode 100644 src/main/java/com/fxzy/warn/model/vo/UserVO.java create mode 100644 src/main/java/com/fxzy/warn/service/AnnouncementService.java create mode 100644 src/main/java/com/fxzy/warn/service/NewsManageService.java create mode 100644 src/main/java/com/fxzy/warn/service/PermissionService.java create mode 100644 src/main/java/com/fxzy/warn/service/PermissionUserService.java create mode 100644 src/main/java/com/fxzy/warn/service/VersionManageService.java create mode 100644 src/main/java/com/fxzy/warn/service/impl/AnnouncementServiceImpl.java create mode 100644 src/main/java/com/fxzy/warn/service/impl/NewsManageServiceImpl.java create mode 100644 src/main/java/com/fxzy/warn/service/impl/PermissionServiceImpl.java create mode 100644 src/main/java/com/fxzy/warn/service/impl/PermissionUserServiceImpl.java create mode 100644 src/main/java/com/fxzy/warn/service/impl/VersionManageServiceImpl.java create mode 100644 src/main/resources/mapper/AuditRecordsMapper.xml diff --git a/src/main/java/com/fxzy/warn/common/constants/EntityConstants.java b/src/main/java/com/fxzy/warn/common/constants/EntityConstants.java index 68d33c7..fa3d5f8 100644 --- a/src/main/java/com/fxzy/warn/common/constants/EntityConstants.java +++ b/src/main/java/com/fxzy/warn/common/constants/EntityConstants.java @@ -21,6 +21,6 @@ public class EntityConstants { */ public final static Integer IS_ONLINE = 1; - + public static final String SHELF_MSG = "已有上架版本，请先下架"; } diff --git a/src/main/java/com/fxzy/warn/common/response/StatusCode.java b/src/main/java/com/fxzy/warn/common/response/StatusCode.java index ad2a3ba..dc4af60 100644 --- a/src/main/java/com/fxzy/warn/common/response/StatusCode.java +++ b/src/main/java/com/fxzy/warn/common/response/StatusCode.java @@ -21,6 +21,7 @@ public class StatusCode { static { statusCodes.put(200, new StatusCode(200, "操作成功")); statusCodes.put(500, new StatusCode(500, "操作失败")); + statusCodes.put(501, new StatusCode(501, "用户查询失败")); InputStreamReader in = null; try { ClassPathResource resource = new ClassPathResource("/errorCode.properties"); diff --git a/src/main/java/com/fxzy/warn/controller/AnnouncementController.java b/src/main/java/com/fxzy/warn/controller/AnnouncementController.java new file mode 100644 index 0000000..f132f54 --- /dev/null +++ b/src/main/java/com/fxzy/warn/controller/AnnouncementController.java @@ -0,0 +1,116 @@ +package com.fxzy.warn.controller; + +import com.alibaba.fastjson.JSONObject; +import com.fxzy.warn.common.constants.ResponseMsgConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.Announcement; +import com.fxzy.warn.service.AnnouncementService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author zhangjing + * @date 2024/05/21 11:22 + * @description + */ +@Api(tags = "通知公告管理") +@RestController +@RequestMapping("announcement/") +@Slf4j +public class AnnouncementController { + @Resource + private AnnouncementService announcementService ; + + @RequestMapping(value = "save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "新增") + public ApiResponse save(@ApiParam("{\n" + + "\"title\":\"标题\",\n" + + "\"content\":\"公告内容\",\n" + + "}") @RequestBody Announcement entity, @RequestHeader String ticket) { + ApiResponse response = new ApiResponse(); + try { + return announcementService.saveModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + + /** + * 修改 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "修改") + @RequestMapping(value = "edit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse edit(@ApiParam() @RequestBody Announcement entity,@RequestHeader String ticket) { + log.info("修改==== 参数{" + entity != null ? entity.toString() : "null" + "}"); + ApiResponse response = new ApiResponse(); + try { + return announcementService.updateModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + /** + * 通过ids删除 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "删除") + @RequestMapping(value = "remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse remove(@ApiParam("{\"ids\":[\"1\",\"2\"]}") @RequestBody JSONObject jsonObject) { + ApiResponse apiResponse = new ApiResponse(); + try { + return announcementService.deleteModel(jsonObject.getJSONArray("ids").toJavaList(String.class)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + @RequestMapping(value = "queryPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "分页查询") + public ApiResponse queryPage(@ApiParam() @RequestBody RequestParameter parameter) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(announcementService.queryPage(parameter)); + apiResponse.setMessage(ResponseMsgConstants.OPERATE_SUCCESS); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + /** + * 发布 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "发布") + @RequestMapping(value = "release", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse release(@ApiParam("{\n" + + "\"id\":\"标题\",\n" + + "\"isRelease\":\"是否发布\",\n" + + "}") @RequestBody Announcement entity,@RequestHeader String ticket) { + ApiResponse response = new ApiResponse(); + try { + return announcementService.release(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } +} diff --git a/src/main/java/com/fxzy/warn/controller/AuditRecordsController.java b/src/main/java/com/fxzy/warn/controller/AuditRecordsController.java new file mode 100644 index 0000000..b8f521f --- /dev/null +++ b/src/main/java/com/fxzy/warn/controller/AuditRecordsController.java @@ -0,0 +1,56 @@ +package com.fxzy.warn.controller; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.fxzy.warn.common.constants.ResponseMsgConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.AuditRecords; +import com.fxzy.warn.service.AuditRecordsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author zhangjing + * @date 2024/05/21 11:22 + * @description + */ +@Api(tags = "授权历史") +@RestController +@RequestMapping("auditRecords/") +@Slf4j +public class AuditRecordsController { + @Resource + private AuditRecordsService auditRecordsService ; + + + @RequestMapping(value = "queryPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "分页查询") + public ApiResponse queryPage(@ApiParam() @RequestBody RequestParameter parameter) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(auditRecordsService.queryPage(parameter)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + @RequestMapping(value = "record", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "授权审批记录") + public ApiResponse record(@ApiParam() @RequestBody JSONObject jsonObject) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(auditRecordsService.record(jsonObject.getInteger("id"))); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + +} diff --git a/src/main/java/com/fxzy/warn/controller/MonitorUsersController.java b/src/main/java/com/fxzy/warn/controller/MonitorUsersController.java index 7b19503..c68dad4 100644 --- a/src/main/java/com/fxzy/warn/controller/MonitorUsersController.java +++ b/src/main/java/com/fxzy/warn/controller/MonitorUsersController.java @@ -31,7 +31,7 @@ public class MonitorUsersController { private MonitorUsersService monitorUsersService ; @RequestMapping(value = "save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) - @ApiOperation(value = "创建用户") + @ApiOperation(value = "新增监控用户") public ApiResponse save(@ApiParam("{\n" + "\"companyName\":\"企业名称\",\n" + "\"creditCode\":\"统一社会信用代码\",\n" + diff --git a/src/main/java/com/fxzy/warn/controller/NewsManageController.java b/src/main/java/com/fxzy/warn/controller/NewsManageController.java new file mode 100644 index 0000000..6f54bb4 --- /dev/null +++ b/src/main/java/com/fxzy/warn/controller/NewsManageController.java @@ -0,0 +1,122 @@ +package com.fxzy.warn.controller; + +import com.alibaba.fastjson.JSONObject; +import com.fxzy.warn.common.constants.ResponseMsgConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.NewsManage; +import com.fxzy.warn.service.NewsManageService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author zhangjing + * @date 2024/05/21 11:22 + * @description + */ +@Api(tags = "新闻资讯管理") +@RestController +@RequestMapping("newsManage/") +@Slf4j +public class NewsManageController { + @Resource + private NewsManageService newsManageService ; + + @RequestMapping(value = "save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "新增") + public ApiResponse save(@ApiParam("{\n" + + "\"companyName\":\"文章标题\",\n" + + "\"creditCode\":\"文章类型\",\n" + + "\"legalPerson\":\"发布范围\",\n" + + "\"authorizationId\":\"内容简述\"\n" + + "\"authorizationId\":\"缩略图 URL\"\n" + + "\"authorizationId\":\"内容详情\"\n" + + "}") @RequestBody NewsManage entity, @RequestHeader String ticket) { + ApiResponse response = new ApiResponse(); + try { + return newsManageService.saveModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + + /** + * 修改 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "修改") + @RequestMapping(value = "edit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse edit(@ApiParam() @RequestBody NewsManage entity,@RequestHeader String ticket) { + log.info("修改==== 参数{" + entity != null ? entity.toString() : "null" + "}"); + ApiResponse response = new ApiResponse(); + try { + return newsManageService.updateModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + /** + * 通过ids删除 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "删除") + @RequestMapping(value = "remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse remove(@ApiParam("{\"ids\":[\"1\",\"2\"]}") @RequestBody JSONObject jsonObject) { + ApiResponse apiResponse = new ApiResponse(); + try { + return newsManageService.deleteModel(jsonObject.getJSONArray("ids").toJavaList(String.class)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + @RequestMapping(value = "queryPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "分页查询") + public ApiResponse queryPage(@ApiParam() @RequestBody RequestParameter parameter) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(newsManageService.queryPage(parameter)); + apiResponse.setMessage(ResponseMsgConstants.OPERATE_SUCCESS); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + + /** + * 发布 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "发布") + @RequestMapping(value = "publish", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse publish(@ApiParam("{\n" + + "\"id\":\"id\",\n" + + "\"status\":\"0待发布1发布\",\n" + + "}") @RequestBody NewsManage entity,@RequestHeader String ticket) { + log.info("修改==== 参数{" + entity != null ? entity.toString() : "null" + "}"); + ApiResponse response = new ApiResponse(); + try { + return newsManageService.publish(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } +} diff --git a/src/main/java/com/fxzy/warn/controller/PermissionController.java b/src/main/java/com/fxzy/warn/controller/PermissionController.java new file mode 100644 index 0000000..98a18c1 --- /dev/null +++ b/src/main/java/com/fxzy/warn/controller/PermissionController.java @@ -0,0 +1,96 @@ +package com.fxzy.warn.controller; + +import com.alibaba.fastjson.JSONObject; +import com.fxzy.warn.common.constants.ResponseMsgConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.Permission; +import com.fxzy.warn.service.PermissionService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author zhangjing + * @date 2024/05/21 11:22 + * @description + */ +@Api(tags = "数据权限管理") +@RestController +@RequestMapping("Permission/") +@Slf4j +public class PermissionController { + @Resource + private PermissionService permissionService ; + + @RequestMapping(value = "save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "新增") + public ApiResponse save(@ApiParam("{\n" + + "\"name\":\"名称\",\n" + + "\"organization\":\"组织\",\n" + + "}") @RequestBody Permission entity, @RequestHeader String ticket) { + ApiResponse response = new ApiResponse(); + try { + return permissionService.saveModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + + /** + * 修改 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "修改") + @RequestMapping(value = "edit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse edit(@ApiParam() @RequestBody Permission entity,@RequestHeader String ticket) { + log.info("修改==== 参数{" + entity != null ? entity.toString() : "null" + "}"); + ApiResponse response = new ApiResponse(); + try { + return permissionService.updateModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + /** + * 通过ids删除 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "删除") + @RequestMapping(value = "remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse remove(@ApiParam("{\"ids\":[\"1\",\"2\"]}") @RequestBody JSONObject jsonObject) { + ApiResponse apiResponse = new ApiResponse(); + try { + return permissionService.deleteModel(jsonObject.getJSONArray("ids").toJavaList(String.class)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + @RequestMapping(value = "queryPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "分页查询") + public ApiResponse queryPage(@ApiParam() @RequestBody RequestParameter parameter) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(permissionService.queryPage(parameter)); + apiResponse.setMessage(ResponseMsgConstants.OPERATE_SUCCESS); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + +} diff --git a/src/main/java/com/fxzy/warn/controller/VersionManageController.java b/src/main/java/com/fxzy/warn/controller/VersionManageController.java new file mode 100644 index 0000000..42c1dbb --- /dev/null +++ b/src/main/java/com/fxzy/warn/controller/VersionManageController.java @@ -0,0 +1,96 @@ +package com.fxzy.warn.controller; + +import com.alibaba.fastjson.JSONObject; +import com.fxzy.warn.common.constants.ResponseMsgConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.VersionManage; +import com.fxzy.warn.service.VersionManageService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @author zhangjing + * @date 2024/05/21 11:22 + * @description + */ +@Api(tags = "版本信息管理") +@RestController +@RequestMapping("versionManage/") +@Slf4j +public class VersionManageController { + @Resource + private VersionManageService versionManageService ; + + @RequestMapping(value = "save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ApiOperation(value = "新增") + public ApiResponse save(@ApiParam("{\n" + + "\"versionTitle\":\"版本标题\",\n" + + "\"versionNumber\":\"版本号\",\n" + + "\"versionInfo\":\"版本信息\",\n" + + "}") @RequestBody VersionManage entity, @RequestHeader String ticket) { + ApiResponse response = new ApiResponse(); + try { + return versionManageService.saveModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + + /** + * 修改 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "修改") + @RequestMapping(value = "edit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse edit(@ApiParam() @RequestBody VersionManage entity,@RequestHeader String ticket) { + log.info("修改==== 参数{" + entity != null ? entity.toString() : "null" + "}"); + ApiResponse response = new ApiResponse(); + try { + return versionManageService.updateModel(entity,ticket); + } catch (Exception e) { + response.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return response; + } + /** + * 通过ids删除 + * + * @param + * @return + */ + @ResponseBody + @ApiOperation(value = "删除") + @RequestMapping(value = "remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + public ApiResponse remove(@ApiParam("{\"ids\":[\"1\",\"2\"]}") @RequestBody JSONObject jsonObject) { + ApiResponse apiResponse = new ApiResponse(); + try { + return versionManageService.deleteModel(jsonObject.getJSONArray("ids").toJavaList(String.class)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + @RequestMapping(value = "queryPage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @ApiOperation(value = "分页查询") + public ApiResponse queryPage(@ApiParam() @RequestBody RequestParameter parameter) { + ApiResponse apiResponse = new ApiResponse(); + try { + apiResponse.setData(versionManageService.queryPage(parameter)); + } catch (Exception e) { + apiResponse.recordError(ResponseMsgConstants.OPERATE_FAIL); + } + return apiResponse; + } + +} diff --git a/src/main/java/com/fxzy/warn/mapper/AnnouncementMapper.java b/src/main/java/com/fxzy/warn/mapper/AnnouncementMapper.java new file mode 100644 index 0000000..30ed923 --- /dev/null +++ b/src/main/java/com/fxzy/warn/mapper/AnnouncementMapper.java @@ -0,0 +1,14 @@ +package com.fxzy.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fxzy.warn.model.Announcement; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author zhangjing + * @date 2024/12/04 14:48 + * @description + */ +@Mapper +public interface AnnouncementMapper extends BaseMapper { +} diff --git a/src/main/java/com/fxzy/warn/mapper/AuditRecordsMapper.java b/src/main/java/com/fxzy/warn/mapper/AuditRecordsMapper.java index 17afb1c..a447de0 100644 --- a/src/main/java/com/fxzy/warn/mapper/AuditRecordsMapper.java +++ b/src/main/java/com/fxzy/warn/mapper/AuditRecordsMapper.java @@ -1,8 +1,13 @@ package com.fxzy.warn.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fxzy.warn.model.AuditRecords; +import com.fxzy.warn.model.vo.UserVO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; /** * @author zhangjing @@ -11,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface AuditRecordsMapper extends BaseMapper { + /** + * 分页查询授权历史 + * + * @param page + * @param map + * @return + */ + Page queryPage(@Param("UserVO") Page page, + @Param("map") Map map); } diff --git a/src/main/java/com/fxzy/warn/mapper/NewsManageMapper.java b/src/main/java/com/fxzy/warn/mapper/NewsManageMapper.java new file mode 100644 index 0000000..ff07e8c --- /dev/null +++ b/src/main/java/com/fxzy/warn/mapper/NewsManageMapper.java @@ -0,0 +1,14 @@ +package com.fxzy.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fxzy.warn.model.NewsManage; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author zhangjing + * @date 2024/12/04 14:48 + * @description + */ +@Mapper +public interface NewsManageMapper extends BaseMapper { +} diff --git a/src/main/java/com/fxzy/warn/mapper/PermissionMapper.java b/src/main/java/com/fxzy/warn/mapper/PermissionMapper.java new file mode 100644 index 0000000..12353bc --- /dev/null +++ b/src/main/java/com/fxzy/warn/mapper/PermissionMapper.java @@ -0,0 +1,14 @@ +package com.fxzy.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fxzy.warn.model.Permission; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author zhangjing + * @date 2024/12/04 14:48 + * @description + */ +@Mapper +public interface PermissionMapper extends BaseMapper { +} diff --git a/src/main/java/com/fxzy/warn/mapper/PermissionUserMapper.java b/src/main/java/com/fxzy/warn/mapper/PermissionUserMapper.java new file mode 100644 index 0000000..250d904 --- /dev/null +++ b/src/main/java/com/fxzy/warn/mapper/PermissionUserMapper.java @@ -0,0 +1,15 @@ +package com.fxzy.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fxzy.warn.model.Permission; +import com.fxzy.warn.model.PermissionUser; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author zhangjing + * @date 2024/12/04 14:48 + * @description + */ +@Mapper +public interface PermissionUserMapper extends BaseMapper { +} diff --git a/src/main/java/com/fxzy/warn/mapper/VersionManageMapper.java b/src/main/java/com/fxzy/warn/mapper/VersionManageMapper.java new file mode 100644 index 0000000..87ff46a --- /dev/null +++ b/src/main/java/com/fxzy/warn/mapper/VersionManageMapper.java @@ -0,0 +1,14 @@ +package com.fxzy.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fxzy.warn.model.VersionManage; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author zhangjing + * @date 2024/12/04 14:48 + * @description + */ +@Mapper +public interface VersionManageMapper extends BaseMapper { +} diff --git a/src/main/java/com/fxzy/warn/model/Announcement.java b/src/main/java/com/fxzy/warn/model/Announcement.java new file mode 100644 index 0000000..d7ba939 --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/Announcement.java @@ -0,0 +1,65 @@ +package com.fxzy.warn.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 通知公告 + * @author zhangjing + * @date 2024/12/05 14:07 + * @description + */ +@Data +@TableName("t_announcement") +public class Announcement extends BaseField{ + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 版本标题 + */ + @ApiModelProperty("标题") + private String title; + + /** + * 版本信息 + */ + @ApiModelProperty("公告内容") + private String content; + /** + * 发布时间 + */ + @ApiModelProperty("公告时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date announcementTime; + /** + * 发布人id + */ + @ApiModelProperty("发布人id") + private Integer releasedUserId; + /** + * 发布人姓名 + */ + @ApiModelProperty("发布人姓名") + private String releasedUserName; + /** + * 发布时间 + */ + @ApiModelProperty("发布时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date releasedTime; + /** + * 是否发布 + */ + @ApiModelProperty("是否发布") + private Integer isRelease; +} diff --git a/src/main/java/com/fxzy/warn/model/NewsManage.java b/src/main/java/com/fxzy/warn/model/NewsManage.java new file mode 100644 index 0000000..60cb344 --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/NewsManage.java @@ -0,0 +1,72 @@ +package com.fxzy.warn.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 新闻资讯管理 + * @author zhangjing + * @date 2024/12/05 14:07 + * @description + */ +@Data +@TableName("t_news_manage") +public class NewsManage extends BaseField{ + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 文章标题 + */ + @ApiModelProperty("文章标题") + private String title; + /** + * 文章类型 + */ + @ApiModelProperty("文章类型") + private String type; + /** + * 发布范围 + */ + @ApiModelProperty("发布范围") + private String publishScope; + /** + * 发布时间 + */ + @ApiModelProperty("发布时间") + private Date publishTime; + /** + * 内容简述 + */ + @ApiModelProperty("内容简述") + private String contentSummary; + /** + * 缩略图 URL + */ + @ApiModelProperty("缩略图 URL") + private String thumbnail; + /** + * 内容详情 + */ + @ApiModelProperty("内容详情") + private String contentDetails; + /** + * 阅读次数 + */ + @ApiModelProperty("阅读次数") + private Integer readCount; + + /** + * 发布状态 + */ + @ApiModelProperty("发布状态") + private Integer status; +} diff --git a/src/main/java/com/fxzy/warn/model/Permission.java b/src/main/java/com/fxzy/warn/model/Permission.java new file mode 100644 index 0000000..12b1adf --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/Permission.java @@ -0,0 +1,42 @@ +package com.fxzy.warn.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 新闻资讯管理 + * @author zhangjing + * @date 2024/12/05 14:07 + * @description + */ +@Data +@TableName("t_permission") +public class Permission extends BaseField{ + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 文章标题 + */ + @ApiModelProperty("名称") + private String name; + /** + * 文章类型 + */ + @ApiModelProperty("状态") + private String status; + /** + * 发布范围 + */ + @ApiModelProperty("组织") + private String organization; + +} diff --git a/src/main/java/com/fxzy/warn/model/PermissionUser.java b/src/main/java/com/fxzy/warn/model/PermissionUser.java new file mode 100644 index 0000000..7403e5c --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/PermissionUser.java @@ -0,0 +1,37 @@ +package com.fxzy.warn.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 新闻资讯管理 + * @author zhangjing + * @date 2024/12/05 14:07 + * @description + */ +@Data +@TableName("t_permission_user") +public class PermissionUser extends Model { + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 权限id + */ + @ApiModelProperty("权限id") + private Integer permissionId; + /** + * userId + */ + @ApiModelProperty("userId") + private Integer userId; + + +} diff --git a/src/main/java/com/fxzy/warn/model/User.java b/src/main/java/com/fxzy/warn/model/User.java index fe6bd20..adaed34 100644 --- a/src/main/java/com/fxzy/warn/model/User.java +++ b/src/main/java/com/fxzy/warn/model/User.java @@ -1,9 +1,6 @@ package com.fxzy.warn.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -96,32 +93,13 @@ public class User extends BaseField{ @ApiModelProperty("密码") private String password; - - /** * 授权状态 0待申请1待审批2授权有效3授权过期 */ @ApiModelProperty("授权状态 0待申请1待审批2授权有效3授权过期") private Integer authorizationStatus; - /** - * 授权开始日期 - */ - @TableField(exist = false) - @ApiModelProperty("授权开始日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private Date startDate; - /** - * 授权截止日期 - */ - @TableField(exist = false) - @ApiModelProperty("授权截止日期") - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - private Date endDate; - /** - * 授权书 - */ - @TableField(exist = false) - @ApiModelProperty("授权书") - private File file; + @ApiModelProperty("授权时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date auditDate; } diff --git a/src/main/java/com/fxzy/warn/model/VersionManage.java b/src/main/java/com/fxzy/warn/model/VersionManage.java new file mode 100644 index 0000000..e1a7eab --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/VersionManage.java @@ -0,0 +1,67 @@ +package com.fxzy.warn.model; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 新闻资讯管理 + * @author zhangjing + * @date 2024/12/05 14:07 + * @description + */ +@Data +@TableName("t_version_manage") +public class VersionManage extends BaseField{ + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + /** + * 版本标题 + */ + @ApiModelProperty("版本标题") + private String versionTitle; + /** + * 版本号 + */ + @ApiModelProperty("版本号") + private String versionNumber; + /** + * 版本信息 + */ + @ApiModelProperty("版本信息") + private String versionInfo ; + /** + * 发布时间 + */ + @ApiModelProperty("发布时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date publishTime; + /** + * 发布人id + */ + @ApiModelProperty("发布人id") + private String publishUserId; + /** + * 发布人姓名 + */ + @ApiModelProperty("发布人姓名") + private String publishUserName; + /** + * 上架时间 + */ + @ApiModelProperty("上架时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date shelfTime; + /** + * 是否上架 + */ + @ApiModelProperty("是否上架") + private Integer isShelf; +} diff --git a/src/main/java/com/fxzy/warn/model/vo/UserVO.java b/src/main/java/com/fxzy/warn/model/vo/UserVO.java new file mode 100644 index 0000000..707f29c --- /dev/null +++ b/src/main/java/com/fxzy/warn/model/vo/UserVO.java @@ -0,0 +1,116 @@ +package com.fxzy.warn.model.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fxzy.warn.model.File; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author zhangjing + * @date 2024/12/06 10:48 + * @description + */ +@Data +public class UserVO { + /** + * id + */ + @ApiModelProperty("id") + @TableId(type = IdType.AUTO) + private Integer id; + + /** + * 企业名称 + */ + @ApiModelProperty("企业名称") + private String companyName; + /** + * 统一社会信用代码 + */ + @ApiModelProperty("统一社会信用代码") + private String creditCode; + /** + * 企业法人 + */ + @ApiModelProperty("企业法人") + private String legalPerson; + /** + * 手机号 + */ + @ApiModelProperty("手机号") + private String phoneNumber; + /** + * 邮箱 + */ + @ApiModelProperty("邮箱") + private String email; + /** + * 所在省 + */ + @ApiModelProperty("所在省") + private String province; + /** + * 所在市 + */ + @ApiModelProperty("所在市") + private String city; + /** + * 所在区 + */ + @ApiModelProperty("所在区") + private String district; + /** + * 详细地址 + */ + @ApiModelProperty("详细地址") + private String detailedAddress; + /** + * 商务负责人 + */ + @ApiModelProperty("商务负责人") + private String businessPerson; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String remarks; + /** + * 授权id + */ + @ApiModelProperty("授权id") + private Integer authorizationId; + /** + * 是否为正式账号 + */ + @ApiModelProperty("是否为正式账号") + private Integer isOfficialAccount; + + /** + * 授权状态 0待申请1待审批2授权有效3授权过期 + */ + @ApiModelProperty("授权状态 0待申请1待审批2授权有效3授权过期") + private Integer authorizationStatus; + + /** + * 授权开始日期 + */ + @ApiModelProperty("授权开始日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date startDate; + /** + * 授权截止日期 + */ + @ApiModelProperty("授权截止日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private Date endDate; + /** + * 授权书 + */ + @ApiModelProperty("授权书") + private File file; +} diff --git a/src/main/java/com/fxzy/warn/service/AnnouncementService.java b/src/main/java/com/fxzy/warn/service/AnnouncementService.java new file mode 100644 index 0000000..791fa02 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/AnnouncementService.java @@ -0,0 +1,53 @@ +package com.fxzy.warn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.Announcement; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +public interface AnnouncementService extends IService { + + /** + * 保存 + * @param entity + * @return + */ + ApiResponse saveModel(Announcement entity,String ticket); + + /** + * 修改 + * @param entity + * @return + */ + ApiResponse updateModel(Announcement entity,String ticket); + + /** + * 删除 + * @param ids + * @return + */ + ApiResponse deleteModel(List ids); + + /** + * 分页查询 + * @param parameter + * @return + */ + Page queryPage(RequestParameter parameter); + + + /** + * 修改 + * @param entity + * @return + */ + ApiResponse release(Announcement entity,String ticket); +} diff --git a/src/main/java/com/fxzy/warn/service/AuditRecordsService.java b/src/main/java/com/fxzy/warn/service/AuditRecordsService.java index 860c511..2c15e08 100644 --- a/src/main/java/com/fxzy/warn/service/AuditRecordsService.java +++ b/src/main/java/com/fxzy/warn/service/AuditRecordsService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.fxzy.warn.common.request.RequestParameter; import com.fxzy.warn.common.response.ApiResponse; import com.fxzy.warn.model.AuditRecords; +import com.fxzy.warn.model.User; +import com.fxzy.warn.model.vo.UserVO; import java.util.List; @@ -34,7 +36,7 @@ public interface AuditRecordsService extends IService { * @param * @return */ - void deleteModel(Integer businessId); + void deleteModel(List ids); /** * 获取当前审核状态 @@ -47,8 +49,13 @@ public interface AuditRecordsService extends IService { * @param parameter * @return */ - Page queryPage(RequestParameter parameter); - + Page queryPage(RequestParameter parameter); + /** + * 分页查询 + * @param parameter + * @return + */ + List record(Integer businessId); } diff --git a/src/main/java/com/fxzy/warn/service/NewsManageService.java b/src/main/java/com/fxzy/warn/service/NewsManageService.java new file mode 100644 index 0000000..f936618 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/NewsManageService.java @@ -0,0 +1,53 @@ +package com.fxzy.warn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.NewsManage; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +public interface NewsManageService extends IService { + + /** + * 保存 + * @param entity + * @return + */ + ApiResponse saveModel(NewsManage entity,String ticket); + + /** + * 修改 + * @param entity + * @return + */ + ApiResponse updateModel(NewsManage entity,String ticket); + + /** + * 删除 + * @param ids + * @return + */ + ApiResponse deleteModel(List ids); + + /** + * 分页查询 + * @param parameter + * @return + */ + Page queryPage(RequestParameter parameter); + + /** + * 发布 + * @param entity + * @return + */ + ApiResponse publish(NewsManage entity,String ticket); + +} diff --git a/src/main/java/com/fxzy/warn/service/PermissionService.java b/src/main/java/com/fxzy/warn/service/PermissionService.java new file mode 100644 index 0000000..3162ad7 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/PermissionService.java @@ -0,0 +1,53 @@ +package com.fxzy.warn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.Permission; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +public interface PermissionService extends IService { + + /** + * 保存 + * @param entity + * @return + */ + ApiResponse saveModel(Permission entity,String ticket); + + /** + * 修改 + * @param entity + * @return + */ + ApiResponse updateModel(Permission entity,String ticket); + + /** + * 删除 + * @param ids + * @return + */ + ApiResponse deleteModel(List ids); + + /** + * 分页查询 + * @param parameter + * @return + */ + Page queryPage(RequestParameter parameter); + + + /** + * 维护人员 + * @param ids + * @return + */ + ApiResponse bindPerson(Integer permissionId,List ids); +} diff --git a/src/main/java/com/fxzy/warn/service/PermissionUserService.java b/src/main/java/com/fxzy/warn/service/PermissionUserService.java new file mode 100644 index 0000000..ff1dcdd --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/PermissionUserService.java @@ -0,0 +1,44 @@ +package com.fxzy.warn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.Permission; +import com.fxzy.warn.model.PermissionUser; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +public interface PermissionUserService extends IService { + + /** + * 保存 + * @param entity + * @return + */ + void saveModel(PermissionUser entity,String ticket); + + /** + * 修改 + * @param entity + * @return + */ + void updateModel(PermissionUser entity,String ticket); + + /** + * 删除 + * @param ids + * @return + */ + void deleteModel(List ids); + + + + + +} diff --git a/src/main/java/com/fxzy/warn/service/VersionManageService.java b/src/main/java/com/fxzy/warn/service/VersionManageService.java new file mode 100644 index 0000000..6d3d33c --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/VersionManageService.java @@ -0,0 +1,53 @@ +package com.fxzy.warn.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.model.VersionManage; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +public interface VersionManageService extends IService { + + /** + * 保存 + * @param entity + * @return + */ + ApiResponse saveModel(VersionManage entity,String ticket); + + /** + * 修改 + * @param entity + * @return + */ + ApiResponse updateModel(VersionManage entity,String ticket); + + /** + * 删除 + * @param ids + * @return + */ + ApiResponse deleteModel(List ids); + + /** + * 分页查询 + * @param parameter + * @return + */ + Page queryPage(RequestParameter parameter); + + /** + * 上架 + * @param entity + * @return + */ + ApiResponse shelf(VersionManage entity,String ticket); + +} diff --git a/src/main/java/com/fxzy/warn/service/impl/AnnouncementServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/AnnouncementServiceImpl.java new file mode 100644 index 0000000..0d0a2c0 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/impl/AnnouncementServiceImpl.java @@ -0,0 +1,80 @@ +package com.fxzy.warn.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fxzy.warn.common.constants.EntityConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.mapper.AnnouncementMapper; +import com.fxzy.warn.model.Announcement; +import com.fxzy.warn.model.User; +import com.fxzy.warn.model.vo.UserVO; +import com.fxzy.warn.service.AnnouncementService; +import com.fxzy.warn.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +@Service +public class AnnouncementServiceImpl extends ServiceImpl implements + AnnouncementService { + + @Autowired + private UserService userService; + + @Override + public ApiResponse saveModel(Announcement entity, String ticket) { + save(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse updateModel(Announcement entity,String ticket) { + this.updateById(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse deleteModel(List ids) { + Announcement entity = new Announcement(); + entity.setIsDel(EntityConstants.DEL); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id", ids); + update(entity, wrapper); + return new ApiResponse(); + } + + @Override + public Page queryPage(RequestParameter parameter) { + Announcement entity = parameter.getParameter().toJavaObject(Announcement.class); + Page page = new Page(parameter.getCurrent(), parameter.getSize()); + page.setSearchCount(true); + page.setOptimizeCountSql(true); + QueryWrapper eWrapper = new QueryWrapper(entity); + Page result = this.page(page, eWrapper); + return result; + } + + @Override + public ApiResponse release(Announcement entity, String ticket) { + ApiResponse response = new ApiResponse(); + User user = userService.getUserByTicket(ticket); + if (user == null) { + response.recordError(501); + return response; + } + entity.setReleasedTime(new Date()); + entity.setReleasedUserId(user.getId()); + entity.setReleasedUserName(user.getBusinessPerson()); + updateById(entity); + return response; + } +} diff --git a/src/main/java/com/fxzy/warn/service/impl/AuditRecordsServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/AuditRecordsServiceImpl.java index 2f6ab19..fe06352 100644 --- a/src/main/java/com/fxzy/warn/service/impl/AuditRecordsServiceImpl.java +++ b/src/main/java/com/fxzy/warn/service/impl/AuditRecordsServiceImpl.java @@ -8,10 +8,15 @@ import com.fxzy.warn.common.request.RequestParameter; import com.fxzy.warn.common.response.ApiResponse; import com.fxzy.warn.mapper.AuditRecordsMapper; import com.fxzy.warn.model.AuditRecords; +import com.fxzy.warn.model.MonitorUsers; +import com.fxzy.warn.model.User; +import com.fxzy.warn.model.vo.UserVO; import com.fxzy.warn.service.AuditRecordsService; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author zhangjing @@ -34,9 +39,9 @@ public class AuditRecordsServiceImpl extends ServiceImpl ids) { QueryWrapper wrapper = new QueryWrapper(); - wrapper.eq("business_id", businessId); + wrapper.in("id", ids); remove(wrapper); } @@ -53,13 +58,16 @@ public class AuditRecordsServiceImpl extends ServiceImpl queryPage(RequestParameter parameter) { - AuditRecords entity = parameter.getParameter().toJavaObject(AuditRecords.class); - Page page = new Page(parameter.getCurrent(), parameter.getSize()); - page.setSearchCount(true); - page.setOptimizeCountSql(true); - QueryWrapper eWrapper = new QueryWrapper(entity); - Page result = this.page(page, eWrapper); - return result; + public Page queryPage(RequestParameter parameter) { + Page page = new Page<>(parameter.getCurrent(), parameter.getSize()); + Map map = new HashMap(); + return baseMapper.queryPage(page,map); + } + + @Override + public List record(Integer businessId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("business_id", businessId); + return list(wrapper); } } diff --git a/src/main/java/com/fxzy/warn/service/impl/NewsManageServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/NewsManageServiceImpl.java new file mode 100644 index 0000000..d834a2b --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/impl/NewsManageServiceImpl.java @@ -0,0 +1,68 @@ +package com.fxzy.warn.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fxzy.warn.common.constants.EntityConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.mapper.NewsManageMapper; +import com.fxzy.warn.model.NewsManage; +import com.fxzy.warn.service.NewsManageService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +@Service +public class NewsManageServiceImpl extends ServiceImpl implements + NewsManageService { + + + @Override + public ApiResponse saveModel(NewsManage entity, String ticket) { + save(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse updateModel(NewsManage entity,String ticket) { + this.updateById(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse deleteModel(List ids) { + NewsManage entity = new NewsManage(); + entity.setIsDel(EntityConstants.DEL); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id", ids); + update(entity, wrapper); + return new ApiResponse(); + } + + @Override + public Page queryPage(RequestParameter parameter) { + NewsManage entity = parameter.getParameter().toJavaObject(NewsManage.class); + Page page = new Page(parameter.getCurrent(), parameter.getSize()); + page.setSearchCount(true); + page.setOptimizeCountSql(true); + QueryWrapper eWrapper = new QueryWrapper(entity); + Page result = this.page(page, eWrapper); + eWrapper.eq("is_del", EntityConstants.NORMAL) + .orderByDesc("status") + .orderByDesc("create_time"); + return result; + } + + @Override + public ApiResponse publish(NewsManage entity, String ticket) { + ApiResponse response = new ApiResponse(); + updateById(entity); + return response; + } +} diff --git a/src/main/java/com/fxzy/warn/service/impl/PermissionServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/PermissionServiceImpl.java new file mode 100644 index 0000000..413d294 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/impl/PermissionServiceImpl.java @@ -0,0 +1,84 @@ +package com.fxzy.warn.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fxzy.warn.common.constants.EntityConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.mapper.PermissionMapper; +import com.fxzy.warn.model.Permission; +import com.fxzy.warn.model.PermissionUser; +import com.fxzy.warn.service.PermissionService; +import com.fxzy.warn.service.PermissionUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +@Service +public class PermissionServiceImpl extends ServiceImpl implements + PermissionService { + + @Autowired + PermissionUserService permissionUserService; + + + @Override + public ApiResponse saveModel(Permission entity, String ticket) { + save(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse updateModel(Permission entity,String ticket) { + this.updateById(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse deleteModel(List ids) { + Permission entity = new Permission(); + entity.setIsDel(EntityConstants.DEL); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id", ids); + update(entity, wrapper); + return new ApiResponse(); + } + + @Override + public Page queryPage(RequestParameter parameter) { + Permission entity = parameter.getParameter().toJavaObject(Permission.class); + Page page = new Page(parameter.getCurrent(), parameter.getSize()); + page.setSearchCount(true); + page.setOptimizeCountSql(true); + QueryWrapper eWrapper = new QueryWrapper(entity); + Page result = this.page(page, eWrapper); + eWrapper.eq("is_del", EntityConstants.NORMAL) + .orderByDesc("create_time"); + return result; + } + + @Override + public ApiResponse bindPerson(Integer permissionId, List ids) { + ApiResponse response = new ApiResponse(); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("permission_id",permissionId); + permissionUserService.remove(wrapper); + List list = new ArrayList<>(); + for (Integer id : ids) { + PermissionUser p = new PermissionUser(); + p.setUserId(id); + p.setPermissionId(permissionId); + list.add(p); + } + permissionUserService.saveBatch(list); + return response; + } +} diff --git a/src/main/java/com/fxzy/warn/service/impl/PermissionUserServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/PermissionUserServiceImpl.java new file mode 100644 index 0000000..9a43d42 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/impl/PermissionUserServiceImpl.java @@ -0,0 +1,45 @@ +package com.fxzy.warn.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fxzy.warn.common.constants.EntityConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.mapper.PermissionUserMapper; +import com.fxzy.warn.model.PermissionUser; +import com.fxzy.warn.service.PermissionUserService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +@Service +public class PermissionUserServiceImpl extends ServiceImpl implements + PermissionUserService { + + + @Override + public void saveModel(PermissionUser entity, String ticket) { + save(entity); + } + + @Override + public void updateModel(PermissionUser entity,String ticket) { + this.updateById(entity); + } + + @Override + public void deleteModel(List ids) { + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id", ids); + remove(wrapper); + + } + + +} diff --git a/src/main/java/com/fxzy/warn/service/impl/UserServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/UserServiceImpl.java index 8284796..04a77e5 100644 --- a/src/main/java/com/fxzy/warn/service/impl/UserServiceImpl.java +++ b/src/main/java/com/fxzy/warn/service/impl/UserServiceImpl.java @@ -218,9 +218,9 @@ public class UserServiceImpl extends ServiceImpl implements user.setAuthorizationStatus(AuthorizationConstants.STATUS_AUTHORIZED_VALID); Authorization authorization = authorizationService.getById(user.getAuthorizationId()); if (authorization != null) { - user.setStartDate(authorization.getStartDate()); - user.setEndDate(authorization.getEndDate()); - user.setFile(fileService.getById(authorization.getFileId())); +// user.setStartDate(authorization.getStartDate()); +// user.setEndDate(authorization.getEndDate()); +// user.setFile(fileService.getById(authorization.getFileId())); //检查日期 //大于当前时间授权到期 if (authorization.getEndDate().after(new Date())) { diff --git a/src/main/java/com/fxzy/warn/service/impl/VersionManageServiceImpl.java b/src/main/java/com/fxzy/warn/service/impl/VersionManageServiceImpl.java new file mode 100644 index 0000000..e7cffa2 --- /dev/null +++ b/src/main/java/com/fxzy/warn/service/impl/VersionManageServiceImpl.java @@ -0,0 +1,75 @@ +package com.fxzy.warn.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fxzy.warn.common.constants.EntityConstants; +import com.fxzy.warn.common.request.RequestParameter; +import com.fxzy.warn.common.response.ApiResponse; +import com.fxzy.warn.mapper.VersionManageMapper; +import com.fxzy.warn.model.VersionManage; +import com.fxzy.warn.service.VersionManageService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author zhangjing + * @date 2023/10/16 18:17 + * @description + */ +@Service +public class VersionManageServiceImpl extends ServiceImpl implements + VersionManageService { + + + @Override + public ApiResponse saveModel(VersionManage entity, String ticket) { + save(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse updateModel(VersionManage entity, String ticket) { + this.updateById(entity); + return new ApiResponse(); + } + + @Override + public ApiResponse deleteModel(List ids) { + VersionManage entity = new VersionManage(); + entity.setIsDel(EntityConstants.DEL); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.in("id", ids); + update(entity, wrapper); + return new ApiResponse(); + } + + @Override + public Page queryPage(RequestParameter parameter) { + VersionManage entity = parameter.getParameter().toJavaObject(VersionManage.class); + Page page = new Page(parameter.getCurrent(), parameter.getSize()); + page.setSearchCount(true); + page.setOptimizeCountSql(true); + QueryWrapper eWrapper = new QueryWrapper(entity); + eWrapper.eq("is_del", EntityConstants.NORMAL) + .orderByDesc("is_shelf") + .orderByDesc("create_time"); + Page result = this.page(page, eWrapper); + return result; + } + + @Override + public ApiResponse shelf(VersionManage entity, String ticket) { + ApiResponse response = new ApiResponse(); + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("is_del", EntityConstants.NORMAL); + wrapper.eq("is_shelf", EntityConstants.IS_ONLINE); + if (entity.getIsShelf().equals(EntityConstants.IS_ONLINE) && getOne(wrapper) != null) { + response.recordMsgError(EntityConstants.SHELF_MSG); + return response; + } + updateById(entity); + return response; + } +} diff --git a/src/main/resources/mapper/AuditRecordsMapper.xml b/src/main/resources/mapper/AuditRecordsMapper.xml new file mode 100644 index 0000000..3a3a5e9 --- /dev/null +++ b/src/main/resources/mapper/AuditRecordsMapper.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/FileMapper.xml b/src/main/resources/mapper/FileMapper.xml index dca292d..7eaf8cf 100644 --- a/src/main/resources/mapper/FileMapper.xml +++ b/src/main/resources/mapper/FileMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +