From f58e07efdced5dd1dac98582e1bb595125d930f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Sat, 4 Jan 2025 10:41:38 +0800
Subject: [PATCH] =?UTF-8?q?CommonInfo=20APP=E9=85=8D=E7=BD=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppCommonController.java   | 15 +++++++-
 .../sqx/modules/common/entity/CommonInfo.java |  5 +++
 .../common/service/CommonInfoService.java     |  5 +++
 .../service/impl/CommonInfoServiceImpl.java   | 38 ++++++++++++++++---
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java b/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
index 2a66d5ce..abb389ec 100644
--- a/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
+++ b/src/main/java/com/sqx/modules/common/controller/app/AppCommonController.java
@@ -1,7 +1,6 @@
 package com.sqx.modules.common.controller.app;
 
 import com.sqx.common.utils.Result;
-import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.common.service.CommonInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,7 +58,19 @@ public class AppCommonController {
         return commonService.findByTypeAndCondition(condition);
     }
 
+    @GetMapping("getAppUseKv")
+    @ApiOperation("获取APP使用的KV数据")
+    @ResponseBody
+    public Result getAppUseKv() {
+        return Result.success().put("data",commonService.findAppKv());
+    }
 
-
+    @PostMapping("cleanAppUseKv")
+    @ApiOperation("清理APP使用的KV数据")
+    @ResponseBody
+    public Result clean() {
+        commonService.cleanAppKv();
+        return Result.success();
+    }
 
 }
diff --git a/src/main/java/com/sqx/modules/common/entity/CommonInfo.java b/src/main/java/com/sqx/modules/common/entity/CommonInfo.java
index 11cfc724..bb34741d 100644
--- a/src/main/java/com/sqx/modules/common/entity/CommonInfo.java
+++ b/src/main/java/com/sqx/modules/common/entity/CommonInfo.java
@@ -32,5 +32,10 @@ public class CommonInfo implements Serializable {
 
     private String conditionFrom;
 
+    /**
+     * 是否在app中使用 1是，0否，默认0
+     */
+    private Integer isAppUse;
+
 }
 
diff --git a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java
index 8fe1deac..1ca3dabc 100644
--- a/src/main/java/com/sqx/modules/common/service/CommonInfoService.java
+++ b/src/main/java/com/sqx/modules/common/service/CommonInfoService.java
@@ -3,6 +3,8 @@ package com.sqx.modules.common.service;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.common.entity.CommonInfo;
 
+import java.util.Map;
+
 /**
  * @author fang
  * @date 2020/7/8
@@ -40,4 +42,7 @@ public interface CommonInfoService {
      */
     Result findByTypeAndCondition(String condition);
 
+    Map<Integer,String> findAppKv();
+
+    void cleanAppKv();
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
index c6729987..1e0fb0b7 100644
--- a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
+++ b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
@@ -1,5 +1,7 @@
 package com.sqx.modules.common.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.common.dao.CommonInfoDao;
@@ -7,14 +9,18 @@ import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.course.service.CourseService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author fang
@@ -29,6 +35,9 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Autowired
     private CourseService courseService;
 
+    @Autowired
+    private CacheManager cacheManager;
+
 
     @CacheEvict(key = "#commonInfo.id")
     @Override
@@ -36,15 +45,15 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date now = new Date();
         commonInfo.setCreateAt(sdf.format(now));
-        if(commonInfo.getType()==820){
+        if (commonInfo.getType() == 820) {
             Result result = courseService.setDyNotifyUrl(commonInfo.getValue());
             String code = String.valueOf(result.get("code"));
-            if(!"0".equals(code)){
+            if (!"0".equals(code)) {
                 return result;
             }
         }
         commonInfoDao.updateById(commonInfo);
-
+        cleanAppKv();
         return Result.success();
     }
 
@@ -57,6 +66,7 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Override
     public Result delete(long id) {
         commonInfoDao.deleteById(id);
+        cleanAppKv();
         return Result.success();
     }
 
@@ -64,18 +74,34 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Override
     public Result updateBody(CommonInfo commonInfo) {
         commonInfoDao.updateById(commonInfo);
+        cleanAppKv();
         return Result.success();
     }
 
     @Override
     public Result findByType(Integer type) {
-        return Result.success().put("data",commonInfoDao.findOne(type));
+        return Result.success().put("data", commonInfoDao.findOne(type));
     }
 
     @Override
     public Result findByTypeAndCondition(String condition) {
-        return Result.success().put("data",commonInfoDao.findByCondition(condition));
+        return Result.success().put("data", commonInfoDao.findByCondition(condition));
     }
 
+    @Override
+    @Cacheable("commonInfoAppKv")
+    public Map<Integer, String> findAppKv() {
+        List<CommonInfo> list = commonInfoDao.selectList(Wrappers.<CommonInfo>lambdaQuery().eq(CommonInfo::getIsAppUse, 1).orderByAsc(CommonInfo::getType).orderByAsc(CommonInfo::getId));
+        if (CollUtil.isEmpty(list)) {
+            return new HashMap<>(0);
+        }
+        Map<Integer, String> data = list.stream().collect(Collectors.toMap(CommonInfo::getType, CommonInfo::getValue));
+        return data;
+    }
+
+    @Override
+    public void cleanAppKv() {
+        cacheManager.getCache("commonInfoAppKv").clear();
+    }
 
 }
\ No newline at end of file