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 25596aa3..60b4836d 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 @@ -246,12 +246,15 @@ public class RepairWaresServiceImpl extends ServiceImpl warehouse = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.WAREHOUSE.getCode()); + List admin = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADMIN.getCode()); // 取配置 List dataList = dictDataApi.getDictDataList(RepairDictConstants.REPAIR_WARES_NOTICE); // 取出第一个 if (CollUtil.isEmpty(dataList)) { - noticeByFlag(true); + noticeByFlag(true, admin, warehouse); return; } DictDataRespDTO dictDataRespDTO = dataList.get(0); @@ -261,17 +264,11 @@ public class RepairWaresServiceImpl extends ServiceImpl repairWares = baseMapper.selectList(new LambdaQueryWrapper().le(RepairWares::getUpdateTime, dateAgo)); if (CollUtil.isNotEmpty(repairWares)) { - // 构建对象 todo 表需要做适配 - List warnMessages = repairWares.stream().map(item -> - WarnMessageByRepair - .builder() - .title("配件超时未使用") - .content("名为:" + item.getName() + "的配件未使用天数超过设定的未使用天数提醒,请及时处理相关事项!") - .warnTime(new Date()) - .isRead("0") - .build() - ).collect(Collectors.toList()); - warnMessageByRepairService.saveBatch(warnMessages); + List names = repairWares.stream().map(RepairWares::getName).collect(Collectors.toList()); + String result = String.join(",", names); + String message = "以下配件未使用天数超过设定的未使用天数提醒,请及时处理相关事项!" + result; + warehouse.forEach(item -> workerService.sentMessage(item.getId(), message)); + admin.forEach(item -> workerService.sentMessage(item.getId(), message)); } } @@ -283,12 +280,15 @@ public class RepairWaresServiceImpl extends ServiceImpl warehouse = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.WAREHOUSE.getCode()); + List admin = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADMIN.getCode()); // 取配置 List dataList = dictDataApi.getDictDataList(RepairDictConstants.REPAIR_WARES_NOTICE); // 取出第二个 if (CollUtil.isEmpty(dataList)) { - noticeByFlag(false); + noticeByFlag(false, admin, warehouse); return; } DictDataRespDTO dictDataRespDTO = dataList.get(1); @@ -296,17 +296,11 @@ public class RepairWaresServiceImpl extends ServiceImpl repairWares = baseMapper.selectList(new LambdaQueryWrapper().le(RepairWares::getStock, count)); if (CollUtil.isNotEmpty(repairWares)) { - // 构建对象 todo 表需要做适配 - List warnMessages = repairWares.stream().map(item -> - WarnMessageByRepair - .builder() - .title("配件库存不足") - .content("名为:" + item.getName() + "的配件库存低于设定的库存不足提醒,请及时处理相关事项!") - .warnTime(new Date()) - .isRead("0") - .build() - ).collect(Collectors.toList()); - warnMessageByRepairService.saveBatch(warnMessages); + List names = repairWares.stream().map(RepairWares::getName).collect(Collectors.toList()); + String result = String.join(",", names); + String message = "以下配件库存低于设定的库存不足提醒,请及时处理相关事项!\n" + result; + warehouse.forEach(item -> workerService.sentMessage(item.getId(), message)); + admin.forEach(item -> workerService.sentMessage(item.getId(), message)); } } @@ -316,12 +310,10 @@ public class RepairWaresServiceImpl extends ServiceImpl warehouse = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.WAREHOUSE.getCode()); - List admin = roleApi.selectUserListByRoleCode(TenantContextHolder.getRequiredTenantId(), RepairRoleEnum.ADMIN.getCode()); - + private void noticeByFlag(Boolean flag, List admin, List warehouse){ String message = flag ? "检查配件入库是否超时出现故障,请联系开发人员解决" : "检查配件库存是否充足出现故障,请联系开发人员解决"; // 如果为空就通知相关人员出现了问题 if (CollUtil.isNotEmpty(warehouse)) { 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 deleted file mode 100644 index 1b6e089c..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/entity/WarnMessageByRepair.java +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index d5f2bd7d..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/mapper/WarnMessageByRepairMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 604acdd2..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/WarnMessageByRepairService.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 63575d81..00000000 --- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/warnMessage/service/impl/WarnMessageByRepairServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -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 { -}