From 136e05a4e61fe61a24adb18c42916b3de59d1f33 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 14 May 2024 14:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/system/api}/domain/SysNoticeGroup.java | 6 +++--- .../com/op/system/controller/SysNoticeGroupController.java | 5 +++-- .../src/main/java/com/op/system/domain/SysNotice.java | 2 +- .../java/com/op/system/mapper/SysNoticeGroupMapper.java | 2 +- .../java/com/op/system/service/ISysNoticeGroupService.java | 4 ++-- .../op/system/service/impl/SysNoticeGroupServiceImpl.java | 4 +--- .../src/main/resources/mapper/system/SysNoticeMapper.xml | 3 ++- 7 files changed, 13 insertions(+), 13 deletions(-) rename {op-modules/op-system/src/main/java/com/op/system => op-api/op-api-system/src/main/java/com/op/system/api}/domain/SysNoticeGroup.java (98%) diff --git a/op-modules/op-system/src/main/java/com/op/system/domain/SysNoticeGroup.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java similarity index 98% rename from op-modules/op-system/src/main/java/com/op/system/domain/SysNoticeGroup.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java index 90ad2a5a8..30fb0dc7a 100644 --- a/op-modules/op-system/src/main/java/com/op/system/domain/SysNoticeGroup.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java @@ -1,9 +1,9 @@ -package com.op.system.domain; +package com.op.system.api.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 通知公告-班组对象 sys_notice_group diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java index 60ff2f06b..35bc30af0 100644 --- a/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java +++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java @@ -3,6 +3,8 @@ package com.op.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.system.api.domain.SysNoticeGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -15,11 +17,10 @@ import org.springframework.web.bind.annotation.RestController; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; -import com.op.system.domain.SysNoticeGroup; + import com.op.system.service.ISysNoticeGroupService; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; -import com.op.common.core.utils.poi.ExcelUtil; import com.op.common.core.web.page.TableDataInfo; /** diff --git a/op-modules/op-system/src/main/java/com/op/system/domain/SysNotice.java b/op-modules/op-system/src/main/java/com/op/system/domain/SysNotice.java index 0b240a103..90fa83157 100644 --- a/op-modules/op-system/src/main/java/com/op/system/domain/SysNotice.java +++ b/op-modules/op-system/src/main/java/com/op/system/domain/SysNotice.java @@ -55,7 +55,7 @@ public class SysNotice extends BaseEntity { @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") + @Size(min = 0, max = 225, message = "公告标题不能超过225个字符") public String getNoticeTitle() { return noticeTitle; } diff --git a/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java b/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java index 92f02b74f..fad50935c 100644 --- a/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java +++ b/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java @@ -2,7 +2,7 @@ package com.op.system.mapper; import java.util.List; -import com.op.system.domain.SysNoticeGroup; +import com.op.system.api.domain.SysNoticeGroup; import org.apache.ibatis.annotations.Mapper; /** diff --git a/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java b/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java index 332a77315..813ed1e64 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java @@ -1,8 +1,8 @@ package com.op.system.service; -import java.util.List; +import com.op.system.api.domain.SysNoticeGroup; -import com.op.system.domain.SysNoticeGroup; +import java.util.List; /** * 通知公告-班组Service接口 diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java index 62c6fa07d..8060ac79c 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java @@ -6,13 +6,11 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.domain.SysNoticeGroup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.system.mapper.SysNoticeGroupMapper; -import com.op.system.domain.SysNoticeGroup; import com.op.system.service.ISysNoticeGroupService; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 4bdd275e1..37bd980c3 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -18,7 +18,8 @@ - select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark + select notice_id, notice_title, notice_type, notice_content, + status, create_by, create_time, update_by, update_time, remark from sys_notice