From 605d43b75dbc752862d822d0a62c34859c7f9154 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 20 Dec 2024 20:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BonusMaterialMallApplication.java | 2 + .../material/device/mapper/MaDevQcMapper.java | 2 + .../notice/controller/NoticeController.java | 10 ----- .../bonus/material/notice/entity/Notice.java | 2 +- .../material/notice/mapper/NoticeMapper.java | 2 + .../service/impl/NoticeServiceImpl.java | 2 + .../com/bonus/material/task/NoticeTask.java | 40 +++++++++++++++++++ .../mapper/material/device/MaDevQcMapper.xml | 12 ++++++ .../mapper/material/notice/ReplyMapper.xml | 25 ++++++++++++ 9 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java index 0ef0c22..8f561c9 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/BonusMaterialMallApplication.java @@ -6,6 +6,7 @@ import com.bonus.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 系统模块 @@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; */ @EnableCustomConfig @EnableCustomSwagger2 +@EnableScheduling @EnableRyFeignClients @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class BonusMaterialMallApplication diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java index d431821..c2c1c06 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/MaDevQcMapper.java @@ -49,4 +49,6 @@ public interface MaDevQcMapper { MaDevQc getQcListByOne(Long maId); Integer updateById(MaDevQc maDevQc); + + List checkQcTime(); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java index 020e5d5..94f7975 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/controller/NoticeController.java @@ -1,18 +1,9 @@ package com.bonus.material.notice.controller; -import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.common.log.annotation.SysLog; -import com.bonus.common.log.enums.OperaType; -import com.bonus.common.security.annotation.InnerAuth; -import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import com.bonus.material.notice.entity.Notice; import com.bonus.material.notice.service.NoticeService; -import com.bonus.system.api.RemoteNoticeService; -import com.bonus.system.api.domain.SysNotice; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java index 2a92bc9..d92fb2b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/entity/Notice.java @@ -25,7 +25,7 @@ public class Notice { /** * 公告类型（1通知 2公告 3质检到期提醒） */ - private String noticeType; + private Integer noticeType; /** * 公告内容 diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java index 739a53a..f10c6af 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/mapper/NoticeMapper.java @@ -11,4 +11,6 @@ import java.util.List; */ public interface NoticeMapper { List selectNoticeList(Notice notice); + + void addNotice(Notice notice); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java index e80f1c8..a95c366 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/notice/service/impl/NoticeServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.material.notice.service.impl; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.notice.entity.Notice; import com.bonus.material.notice.mapper.NoticeMapper; import com.bonus.material.notice.service.NoticeService; @@ -20,6 +21,7 @@ public class NoticeServiceImpl implements NoticeService { private NoticeMapper noticeMapper; @Override public List selectNoticeList(Notice notice) { + notice.setOwnCo(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); return noticeMapper.selectNoticeList(notice); } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java new file mode 100644 index 0000000..d9a3b02 --- /dev/null +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/task/NoticeTask.java @@ -0,0 +1,40 @@ +package com.bonus.material.task; + +import com.bonus.material.device.domain.MaDevQc; +import com.bonus.material.device.mapper.MaDevQcMapper; +import com.bonus.material.notice.entity.Notice; +import com.bonus.material.notice.mapper.NoticeMapper; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2024/12/20 - 19:53 + */ +@Component +public class NoticeTask { + @Resource + private MaDevQcMapper maDevQcMapper; + + @Resource + private NoticeMapper noticeMapper; + @Scheduled(cron = "0 0 0 * * ?") + public void setNotice() { + List qcList = maDevQcMapper.checkQcTime(); + if (qcList.size() > 0) { + for (MaDevQc maDevQc : qcList) { + Notice notice = new Notice(); + notice.setNoticeType(3); + notice.setNoticeContent("您好，系统检测出" + maDevQc.getDeviceName() + "已过质检日期，请及时上传质检报告"); + notice.setCreateBy("admin"); + notice.setCreateTime(new Date()); + notice.setOwnCo(Integer.parseInt(maDevQc.getQcCom())); + noticeMapper.addNotice(notice); + } + } + } +} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml index 6f202c5..a7605c9 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/MaDevQcMapper.xml @@ -148,5 +148,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by mdc.qc_time desc LIMIT 1 + diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml index 784a30f..274fdd3 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/notice/ReplyMapper.xml @@ -3,6 +3,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + insert into sys_notice( + notice_title, + notice_type, + notice_content, + status, + create_by, + create_time, + update_by, + update_time, + remark, + own_co + ) + values( + #{noticeTitle}, + #{noticeType}, + #{noticeContent}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + ) +