root
/
agri
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

暂时提交

master
lld 2026-04-04 00:58:24 +08:00
parent e5b0ff6fc0
commit 7b520eb8be
4 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agri-admin/src/main/resources/application.yml
View File

@ -6,8 +6,8 @@ agri:
version: 3.9.0
# 版权年份
copyrightYear: 2025
# 文件路径 示例（ Windows配置D:/agri/uploadPath，Linux配置 /home/agri/uploadPath）
profile: D:/agri/uploadPath
# 文件路径 示例（ Windows配置D:/agri/uploadPath，Linux配置 /opt/agri/uploadPath）
profile: /opt/agri/uploadPath
# 获取ip地址开关
addressEnabled: true
# 验证码类型 math 数字计算 char 字符验证

19
agri-system/src/main/java/com/agri/system/controller/SysMessageController.java
View File

@ -1,9 +1,11 @@
package com.agri.system.controller;
import java.time.LocalDate;
import java.util.List;
import java.util.Queue;
import javax.servlet.http.HttpServletResponse;
import com.agri.common.utils.DateUtils;
import com.agri.common.utils.SecurityUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
@ -136,6 +138,7 @@ public class SysMessageController extends BaseController
sysMessageService.lambdaUpdate()
.eq(SysMessage::getReceiver, SecurityUtils.getUserId())
.eq(SysMessage::getReadStatus, 0)
.eq(sysMessage.getId()!=null, SysMessage::getId, sysMessage.getId())
.eq(StringUtils.isNotBlank(sysMessage.getMsgType()),
SysMessage::getMsgType, sysMessage.getMsgType())
.set(SysMessage::getReadStatus, 1)
@ -161,4 +164,20 @@ public class SysMessageController extends BaseController
List<SysMessage> list = sysMessageService.getMsgOverview(sysMessage);
return success(list);
}
@PreAuthorize("@ss.hasPermi('warn:message:list')")
@GetMapping("/unReadCount")
public AjaxResult unReadCount()
{
LocalDate localDate = LocalDate.now().minusDays(7);
LocalDate localDate1 = LocalDate.now().plusDays(1);
Long count = sysMessageService.lambdaQuery()
.eq(SysMessage::getReceiver, SecurityUtils.getUserId())
.eq(SysMessage::getReadStatus, 0)
.geSql(SysMessage::getCreateTime, "DATE_SUB(CURDATE(), INTERVAL 7 DAY)")
.leSql(SysMessage::getCreateTime, "DATE_ADD(CURDATE(), INTERVAL 1 DAY)")
.count();
return success(count);
}
}

9
agri-system/src/main/java/com/agri/system/service/impl/AgriServiceImpl.java
View File

@ -47,9 +47,8 @@ public class AgriServiceImpl implements AgriService {
List<SysMessage> msgList = new ArrayList<>();
for (SysAgriInfo agriInfo : offlineList) {
if (Objects.equals(agriInfo.getImei(), "864865085003722")) {
continue;
}
for (SysUserAgri userAgri : agriUser) {
if (userAgri.getAgriId().equals(agriInfo.getImei())) {
SysMessage message = new SysMessage();
message.setImei(agriInfo.getImei());
message.setTitle(agriInfo.getTitle());
@ -58,11 +57,11 @@ public class AgriServiceImpl implements AgriService {
message.setContent("大棚【" + agriInfo.getAgriName() + " - " + agriInfo.getImei() + "】" + agriInfo.getMsg());
message.setImgUrl("");
message.setLinkUrl(UrlEncodeUtil.buildControlPageUrl(agriInfo, "/pages/home/control/index?agriInfo="));
for (SysUserAgri userAgri : agriUser){
message.setReceiver(userAgri.getUserId());
}
msgList.add(message);
}
}
}
if (CollectionUtils.isNotEmpty(msgList)) {
messageService.saveBatch(msgList);
}

2
agri-system/src/main/resources/mapper/system/SysMessageMapper.xml
View File

@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="receiver != null and receiver != ''"> and receiver = #{receiver}</if>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="msgType != null and msgType != ''"> and msg_type = #{msgType}</if>
<if test="msgType != null and msgType == 'status'">
<if test="msgType != null ">
and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= CURDATE()
and DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
</if>