gongchunyi
3 天以前 5d33059ad9fe7fe70bb43e09ea9199a074cc7c78
refactor: 去除个推和mongo
已修改5个文件
已删除2个文件
323 ■■■■■ 文件已修改
pom.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/basic/task/ReturnVisitReminderTask.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/domain/GetuiConfig.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/system/service/impl/UnipushService.java 218 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-jhy.yml 9 ●●●●● 补丁 | 查看 | 原始文档 | 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