From 84e57f0337401c8ffec32e72a3b38b0e2d9e6656 Mon Sep 17 00:00:00 2001 From: xiaofajia <1665375861@qq.com> Date: Sat, 30 Nov 2024 15:39:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=85=A5=E5=BA=93=E8=B6=85?= =?UTF-8?q?=E5=A4=9A=E5=B0=91=E5=A4=A9=EF=BC=88=E5=8F=AF=E4=BB=A5=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E8=AE=BE=E7=BD=AE=EF=BC=89=E6=B2=A1=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E8=AF=9D=E9=9C=80=E8=A6=81=E5=81=9A=E4=B8=80=E4=B8=AA=E4=B8=B4?= =?UTF-8?q?=E6=9C=9F=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/common/RepairDictConstants.java | 3 + .../iocoder/yudao/job/WaresTimeOverJob.java | 32 +++++++++ .../project/service/RepairWaresService.java | 8 +++ .../service/impl/RepairWaresServiceImpl.java | 72 +++++++++++++++++++ .../entity/WarnMessageByRepair.java | 62 ++++++++++++++++ .../mapper/WarnMessageByRepairMapper.java | 15 ++++ .../service/WarnMessageByRepairService.java | 13 ++++ .../impl/WarnMessageByRepairServiceImpl.java | 18 +++++ .../warnMessage/WarnMessageByRepairMapper.xml | 6 ++ 9 files changed, 229 insertions(+) create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/job/WaresTimeOverJob.java create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/entity/WarnMessageByRepair.java create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/mapper/WarnMessageByRepairMapper.java create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/WarnMessageByRepairService.java create mode 100644 dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/impl/WarnMessageByRepairServiceImpl.java create mode 100644 dl-module-repair/src/main/resources/mapper/warnMessage/WarnMessageByRepairMapper.xml diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairDictConstants.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairDictConstants.java index 76af5320..c58e973d 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairDictConstants.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/common/RepairDictConstants.java @@ -16,4 +16,7 @@ public interface RepairDictConstants { /** 配件属性 */ String WARES_ATTRIBUTE = "repair_attribute"; + + /** 配件相关提醒配置 */ + String REPAIR_WARES_NOTICE = "repair_wares_notice"; } diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/job/WaresTimeOverJob.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/job/WaresTimeOverJob.java new file mode 100644 index 00000000..8e6a37c7 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/job/WaresTimeOverJob.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.job; + +import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler; +import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; +import cn.iocoder.yudao.module.project.service.RepairWaresService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * 配件入库超多少天（可以自己设置）没用的话需要做一个临期提醒 + * + * @author 小李 + * @date 14:40 2024/11/30 +**/ +@Component +@TenantJob +@Slf4j +public class WaresTimeOverJob implements JobHandler { + + @Resource + @Lazy + private RepairWaresService waresService; + + @Override + public String execute(String param) throws Exception { + waresService.timeOver(); + return null; + } +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairWaresService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairWaresService.java index 1796669d..053aabce 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairWaresService.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/RepairWaresService.java @@ -86,4 +86,12 @@ public interface RepairWaresService extends IService { * @date 16:20 2024/11/29 **/ ImportExcelRespVO importData(List list, Boolean updateSupport); + + /** + * 配件入库超多少天（可以自己设置）没用的话需要做一个临期提醒 + * + * @author 小李 + * @date 14:42 2024/11/30 + **/ + void timeOver(); } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairWaresServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairWaresServiceImpl.java index 5fa05ca0..065cecdf 100644 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairWaresServiceImpl.java +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/project/service/impl/RepairWaresServiceImpl.java @@ -2,7 +2,11 @@ package cn.iocoder.yudao.module.project.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.iocoder.yudao.common.RepairDictConstants; +import cn.iocoder.yudao.common.RepairRoleEnum; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; +import cn.iocoder.yudao.module.base.service.RepairWorkerService; import cn.iocoder.yudao.module.conf.entity.BaseType; import cn.iocoder.yudao.module.conf.entity.BaseWarehouse; import cn.iocoder.yudao.module.conf.service.BaseTypeService; @@ -11,6 +15,12 @@ import cn.iocoder.yudao.module.project.entity.RepairWares; import cn.iocoder.yudao.module.project.mapper.RepairWaresMapper; import cn.iocoder.yudao.module.project.service.RepairWaresService; import cn.iocoder.yudao.module.project.vo.*; +import cn.iocoder.yudao.module.system.api.dict.DictDataApi; +import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO; +import cn.iocoder.yudao.module.system.api.permission.RoleApi; +import cn.iocoder.yudao.module.system.api.user.dto.UserDTO; +import cn.iocoder.yudao.module.warnMessage.entity.WarnMessageByRepair; +import cn.iocoder.yudao.module.warnMessage.service.WarnMessageByRepairService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -47,6 +58,22 @@ public class RepairWaresServiceImpl extends ServiceImpl dataList = dictDataApi.getDictDataList(RepairDictConstants.REPAIR_WARES_NOTICE); + // 取仓管、维修管理员 + List warehouse = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.WAREHOUSE.getCode()); + List admin = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADMIN.getCode()); + + // 取出第一个 + if (CollUtil.isEmpty(dataList)) { + // 如果为空就通知相关人员出现了问题 + if (CollUtil.isNotEmpty(warehouse)) { + warehouse.forEach(item -> workerService.sentMessage(item.getId(), "检查配件入库是否超时出现故障，请联系开发人员解决")); + } + if (CollUtil.isNotEmpty(admin)) { + admin.forEach(item -> workerService.sentMessage(item.getId(), "检查配件入库是否超时出现故障，请联系开发人员解决")); + } + } + DictDataRespDTO dictDataRespDTO = dataList.get(0); + String day = dictDataRespDTO.getValue(); + // 转时间，如果updateTime小于这个时间，那就是需要提醒的 + LocalDateTime dateAgo = LocalDateTime.now().minusDays(Integer.parseInt(day)); + + List repairWares = baseMapper.selectList(new LambdaQueryWrapper().le(RepairWares::getUpdateTime, dateAgo)); + if (CollUtil.isNotEmpty(repairWares)) { + // 构建对象 + List warnMessages = repairWares.stream().map(item -> + WarnMessageByRepair + .builder() + .title("配件超时未使用") + .content("名为:" + item.getName() + "的配件超过设定的未使用天数提醒,请及时处理相关事项！") + .warnTime(new Date()) + .isRead("0") + .build() + ).collect(Collectors.toList()); + warnMessageByRepairService.saveBatch(warnMessages); + } + } + } \ No newline at end of file diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/entity/WarnMessageByRepair.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/entity/WarnMessageByRepair.java new file mode 100644 index 00000000..1b6e089c --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/entity/WarnMessageByRepair.java @@ -0,0 +1,62 @@ +package cn.iocoder.yudao.module.warnMessage.entity; + +import cn.iocoder.yudao.annotation.Excel; +import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Builder; +import lombok.Data; + +import java.util.Date; + +/** + * warnMsg对象 warn_message + * + * @author 小李 + * @date 15:11 2024/11/30 + **/ +@Data +@Builder +public class WarnMessageByRepair extends TenantBaseDO { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + private Long id; + //equ设备提醒file文件提醒 + private String type; + //对应的数据主键 + private Long objectId; + + /** + * 标题 + */ + @Excel(name = "标题") + private String title; + + /** + * 内容 + */ + @Excel(name = "内容") + private String content; + + /** + * 提醒时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "提醒时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date warnTime; + + /** + * 店铺主键 + */ + @Excel(name = "店铺主键") + private Long partnerId; + + /** + * 是否已读 + */ + @Excel(name = "是否已读") + private String isRead; + +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/mapper/WarnMessageByRepairMapper.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/mapper/WarnMessageByRepairMapper.java new file mode 100644 index 00000000..d5f2bd7d --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/mapper/WarnMessageByRepairMapper.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.warnMessage.mapper; + +import cn.iocoder.yudao.module.warnMessage.entity.WarnMessageByRepair; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * warnMsgMapper接口 + * + * @author 小李 + * @date 15:14 2024/11/30 +**/ +@Mapper +public interface WarnMessageByRepairMapper extends BaseMapper { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/WarnMessageByRepairService.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/WarnMessageByRepairService.java new file mode 100644 index 00000000..604acdd2 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/WarnMessageByRepairService.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.warnMessage.service; + +import cn.iocoder.yudao.module.warnMessage.entity.WarnMessageByRepair; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * warnMsgService接口 + * + * @author 小李 + * @date 15:12 2024/11/30 +**/ +public interface WarnMessageByRepairService extends IService { +} diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/impl/WarnMessageByRepairServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/impl/WarnMessageByRepairServiceImpl.java new file mode 100644 index 00000000..63575d81 --- /dev/null +++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/impl/WarnMessageByRepairServiceImpl.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.warnMessage.service.impl; + +import cn.iocoder.yudao.module.warnMessage.entity.WarnMessageByRepair; +import cn.iocoder.yudao.module.warnMessage.mapper.WarnMessageByRepairMapper; +import cn.iocoder.yudao.module.warnMessage.service.WarnMessageByRepairService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + + +/** + * warnMsgService业务层处理 + * + * @author 小李 + * @date 15:15 2024/11/30 +**/ +@Service +public class WarnMessageByRepairServiceImpl extends ServiceImpl implements WarnMessageByRepairService { +} diff --git a/dl-module-repair/src/main/resources/mapper/warnMessage/WarnMessageByRepairMapper.xml b/dl-module-repair/src/main/resources/mapper/warnMessage/WarnMessageByRepairMapper.xml new file mode 100644 index 00000000..3fd1ad59 --- /dev/null +++ b/dl-module-repair/src/main/resources/mapper/warnMessage/WarnMessageByRepairMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file