| pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/project/system/domain/GetuiConfig.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application-jhy.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -50,7 +50,6 @@ <!-- <spring-security.version>5.7.12</spring-security.version>--> <!-- <spring-framework.version>5.3.39</spring-framework.version>--> <mybatis-plus.version>3.5.16</mybatis-plus.version> <getui-sdk.version>1.0.7.0</getui-sdk.version> <jsqlparser.version>4.9</jsqlparser.version> <thumbnailator.version>0.4.20</thumbnailator.version> <langchain4j.version>1.0.0-beta3</langchain4j.version> @@ -133,10 +132,6 @@ <artifactId>spring-boot-starter-data-redis</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-mongodb</artifactId> </dependency> <!-- pool å¯¹è±¡æ± --> <dependency> @@ -403,12 +398,6 @@ <version>3.3.3</version> </dependency> <dependency> <groupId>com.getui.push</groupId> <artifactId>restful-sdk</artifactId> <version>${getui-sdk.version}</version> <scope>compile</scope> </dependency> <!--hutoolå·¥å ·å --> <dependency> src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java
@@ -3,9 +3,7 @@ import com.ruoyi.basic.pojo.CustomerReturnVisit; import com.ruoyi.basic.service.CustomerReturnVisitService; import com.ruoyi.framework.redis.RedisCache; import com.ruoyi.project.system.domain.SysUserClient; import com.ruoyi.project.system.service.SysUserClientService; import com.ruoyi.project.system.service.impl.UnipushService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; @@ -33,8 +31,6 @@ private final CustomerReturnVisitService customerReturnVisitService; private final UnipushService unipushService; private final SysUserClientService userClientService; @SuppressWarnings("unchecked") @@ -59,30 +55,22 @@ } } @SuppressWarnings("unchecked") private void processReminder(Long returnVisitId) { CustomerReturnVisit returnVisit = customerReturnVisitService.getById(returnVisitId); if (returnVisit == null || returnVisit.getIsEnabled() == 0 || returnVisit.getIsCompleted() == 1) { return; } SysUserClient client = userClientService.getById(returnVisit.getRemindUserId()); if (client == null || client.getCid() == null) { log.warn("ç¨æ·æªç»å®CID, æ æ³åéUnipushæ¨é: userId={}", returnVisit.getRemindUserId()); return; } try { unipushService.sendReturnVisitReminder(returnVisitId, client.getCid(), returnVisit.getContent(), returnVisit.getCustomerId()); // æ è®°å·²å¤çï¼æ¨éåè½å·²ç¦ç¨ï¼ CustomerReturnVisit updateObj = new CustomerReturnVisit(); updateObj.setId(returnVisitId); updateObj.setIsCompleted(1); customerReturnVisitService.updateById(updateObj); log.info("å访æéå·²éè¿ Unipush åé: ID={}", returnVisitId); log.info("å访æéå·²å¤çï¼æ¨éåè½å·²ç¦ç¨ï¼: ID={}", returnVisitId); } catch (Exception e) { log.error("åéå访æé失败ï¼éæ°å å ¥éå: ID={}", returnVisitId, e); long retryTime = System.currentTimeMillis() + 60000; redisCache.redisTemplate.opsForZSet().add(REMINDER_QUEUE_KEY, returnVisitId, retryTime); log.error("å¤çå访æé失败: ID={}", returnVisitId, e); } } } src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -1,9 +1,7 @@ package com.ruoyi.project.system.controller; import com.ruoyi.framework.security.LoginUser; import com.ruoyi.framework.web.controller.BaseController; import com.ruoyi.framework.web.domain.AjaxResult; import com.ruoyi.project.system.domain.GetuiConfig; import com.ruoyi.project.system.domain.SysUserClient; import com.ruoyi.project.system.service.SysUserClientService; import com.ruoyi.common.utils.SecurityUtils; src/main/java/com/ruoyi/project/system/domain/GetuiConfig.java
ÎļþÒÑɾ³ý src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java
@@ -15,6 +15,7 @@ import com.ruoyi.project.system.mapper.SysUserMapper; import com.ruoyi.project.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,6 +27,7 @@ * * @author ruoyi */ @Slf4j @Service @RequiredArgsConstructor public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements ISysNoticeService { @@ -34,7 +36,6 @@ private final SysUserMapper userMapper; private final SysDeptMapper deptMapper; private final SysUserDeptMapper userDeptMapper; private final UnipushService unipushService; /** * æ¥è¯¢å ¬åä¿¡æ¯ @@ -128,14 +129,10 @@ Long userId = SecurityUtils.getLoginUser().getUserId(); Long tenantId = SecurityUtils.getLoginUser().getTenantId(); List<SysNotice> sysNotices = consigneeId.stream() .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, unipushService.convertWebPathToAppPath(jumpPath), userId)) .map(it -> convertSysNotice(title, message, it, tenantId, jumpPath, jumpPath, userId)) .collect(Collectors.toList()); noticeMapper.insert(sysNotices); try { unipushService.sendClientMessage(sysNotices); } catch (Exception e) { log.error("APPæ¨ééç¥å¤±è´¥ï¼åå : {}", e); } log.info("å ¬åå·²ä¿åè³æ°æ®åºï¼æ¨éåè½å·²ç¦ç¨"); } @Override @@ -182,16 +179,12 @@ it.getUserId(), it.getTenantId(), jumpPath, unipushService.convertWebPathToAppPath(jumpPath), jumpPath, userId )) .collect(Collectors.toList()); noticeMapper.insert(collect); try { unipushService.sendClientMessage(collect); } catch (Exception e) { log.error("APPæ¨ééç¥å¤±è´¥ï¼åå : {}", e); } log.info("å ¬åå·²ä¿åè³æ°æ®åºï¼æ¨éåè½å·²ç¦ç¨"); } src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java
ÎļþÒÑɾ³ý src/main/resources/application-jhy.yml
@@ -16,15 +16,6 @@ # åå审æ¹ç¼å·åç¼(é ç½®æä»¶åç¼å½å) approvalNumberPrefix: DEV # ä¸ªæ¨ Unipush é ç½® getui: appId: PfjyAAE0FK64FaO1w2CMb1 appKey: zTMb831OEL6J4GK1uE3Ob4 masterSecret: K1GFtsv42v61tXGnF7SGE5 domain: https://restapi.getui.cn/v2/ # 离线æ¨é使ç¨çå å/ç»ä»¶å intentComponent: uni.app.UNI099A590/io.dcloud.PandoraEntry # å¼åç¯å¢é ç½® server: # æå¡å¨çHTTP端å£ï¼é»è®¤ä¸º8080