From 179d50734d66896e0170466d38ff13b582572b2f Mon Sep 17 00:00:00 2001
From: lzx_mac <2602107437@qq.com>
Date: Thu, 31 Oct 2024 10:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/api/service/LoginApiService.java |  3 +++
 .../api/service/impl/LoginApiServiceImpl.java      | 30 +++++++++++++++++++---
 .../api/service/impl/YaoDuApiServiceImpl.java      |  5 ++--
 .../modules/api/yaoduapi/YaoDuLoginController.java |  6 +++++
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java
index 9fedea9..2c8d8e1 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/LoginApiService.java
@@ -14,4 +14,7 @@ public interface LoginApiService {
 
     //获取隐私政策
     Result<?> getPrivacyPolicy();
+
+    //查询所有配置信息
+    Result<?> getConfigInfo();
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java
index eed5aaa..9d10ea3 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java
@@ -3,15 +3,21 @@ package org.jeecg.modules.api.service.impl;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.service.LoginApiService;
 import org.jeecg.modules.bean.LoginReq;
+import org.jeecg.modules.cityConf.entity.CityConf;
+import org.jeecg.modules.cityConf.service.ICityConfService;
 import org.jeecg.modules.service.AppletLoginService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class LoginApiServiceImpl implements LoginApiService {
     @Resource
     private AppletLoginService appletLoginService;
+    //查询配置
+    @Resource
+    private ICityConfService cityConfService;
 
     //小程序-登录接口
     @Override
@@ -25,8 +31,12 @@ public class LoginApiServiceImpl implements LoginApiService {
     @Override
     public Result<?> getUserAgreement()
     {
-
-        return Result.OK("用户协议");
+        //查询用户协议
+        CityConf cityConf = cityConfService.
+                lambdaQuery().
+                eq(CityConf::getKeyIcon, "userAgreement").
+                one();
+        return Result.OK(cityConf.getKeyDetails());
     }
 
     //获取隐私政策
@@ -34,8 +44,22 @@ public class LoginApiServiceImpl implements LoginApiService {
     public Result<?> getPrivacyPolicy()
     {
 
-        return Result.OK("隐私政策");
+        //查询隐私政策
+        CityConf cityConf = cityConfService.
+                lambdaQuery().
+                eq(CityConf::getKeyIcon, "privacyPolicy").
+                one();
+        return Result.OK(cityConf.getKeyDetails());
     }
 
 
+
+
+    //查询所有配置信息
+    @Override
+    public Result<?> getConfigInfo(){
+        List<CityConf> list = cityConfService.list();
+        return Result.OK(list);
+    }
+
 }
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java
index 71e7d75..9983a8a 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java
@@ -275,7 +275,6 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
 
         }
-
         //获取评论数量
         List<CityTrends> records = page1.getRecords();
         //创建一个新的集合
@@ -304,6 +303,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             }
             newRecords.add(cityTrends);
         }
+        //随机排序帖子列表数据，每次刷新展示的数据不同
+        Collections.shuffle(newRecords);
         page1.setRecords(newRecords);
 
         return Result.OK(page1);
@@ -332,7 +333,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         //获取今年是多少年
         cityTrends.setYearDate(LocalDate.now().getYear() - one.getYearDate());
 
-        cityTrends.setAddress(one.getAddress());
+        cityTrends.setAddId(one.getAddress());
         if (one.getIdCardOpen() == null){
             cityTrends.setIsContent("");
         }else if (one.getIdCardOpen()== 1){
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java
index cc40659..96d7dfd 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuLoginController.java
@@ -47,6 +47,12 @@ public class YaoDuLoginController {
         return loginApiService.getPrivacyPolicy();
     }
 
+    //查询所有配置信息
+    @ApiOperation(value="小程序-查询所有配置信息", notes="小程序-查询所有配置信息")
+    @GetMapping("/getConfigInfo")
+    public Result<?> getConfigInfo(){
+        return loginApiService.getConfigInfo();
+    }
 
 
 }