:sparkles: 微信二维码设置，以及原首页配置、系统配置接口修改

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/controller/APIIndexenterController.java

@@ -313,9 +313,7 @@ public class APIIndexenterController {
             return result;
         }
     }
-
-
-    @ApiOperation(value="获取系统配置", notes="获取系统配置")
+    @ApiOperation(value="获取使用条款、隐私协议、关于我们配置", notes="获取使用条款、隐私协议、关于我们配置")
     @PostMapping(value = "/configInfo")
     public Result<PlatformParameter> configInfo(){
         Result<PlatformParameter> result = new Result<PlatformParameter>();
@@ -334,16 +332,22 @@ public class APIIndexenterController {
         }
     }
 
-    @ApiOperation(value="获取首页配置", notes="获取首页配置")
+    @ApiOperation(value="获取联系方式信息", notes="获取联系方式信息")
     @PostMapping(value = "/indexInfo")
     public Result<AaPlatformParameter> indexInfo(){
         Result<AaPlatformParameter> result = new Result<AaPlatformParameter>();
         try {
 
             List<AaPlatformParameter> list = aaPlatFormParameterService.list();
-            list.get( 0 ).setAaa( host + "/sys/common/static/"+ list.get( 0 ).getAaa() );
-            list.get( 0 ).setBbb( host + "/sys/common/static/"+ list.get( 0 ).getBbb() );
-            list.get( 0 ).setCcc( host + "/sys/common/static/"+ list.get( 0 ).getCcc() );
+            //list.get( 0 ).setAaa( host + "/sys/common/static/"+ list.get( 0 ).getAaa() );
+            //list.get( 0 ).setBbb( host + "/sys/common/static/"+ list.get( 0 ).getBbb() );
+            //list.get( 0 ).setCcc( host + "/sys/common/static/"+ list.get( 0 ).getCcc() );
+            if (!list.isEmpty()){
+                AaPlatformParameter aaPlatformParameter = list.get(0);
+                if (!Strings.isNullOrEmpty(aaPlatformParameter.getWechatQrCode()) && !aaPlatformParameter.getWechatQrCode().startsWith("http")){
+                    aaPlatformParameter.setWechatQrCode(host + "/" + aaPlatformParameter.getWechatQrCode());
+                }
+            }
             result.setMessage("获取首页配置成功");
             result.setResult( list.get( 0 ) );
             result.setCode( 200 );

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/controller/AaPlatFormParameterController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.aa.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.base.Strings;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +13,7 @@ import org.jeecg.modules.aa.entity.PlatformParameter;
 import org.jeecg.modules.aa.service.AaPlatFormParameterService;
 import org.jeecg.modules.aa.service.PlatFormParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -24,13 +27,21 @@ public class AaPlatFormParameterController extends JeecgController<AaPlatformPar
 
     @Autowired
     private AaPlatFormParameterService aaPlatFormParameterService;
-
+    @Value("${server.system.host}")
+    private String host;
 
 
     @PostMapping(value = "/one")
     public Result<AaPlatformParameter> queryPageList() {
-
-        List<AaPlatformParameter> list = aaPlatFormParameterService.list();
+        QueryWrapper<AaPlatformParameter> aaPlatformParameterQueryWrapper = new QueryWrapper<>();
+        aaPlatformParameterQueryWrapper.select("id,phone,mailbox,remark_wenan,remark_wenan_english,remark_wenan_german,wechat_qr_code");
+        List<AaPlatformParameter> list = aaPlatFormParameterService.list(aaPlatformParameterQueryWrapper);
+/*        if (!list.isEmpty()){
+            AaPlatformParameter aaPlatformParameter = list.get(0);
+            if (!Strings.isNullOrEmpty(aaPlatformParameter.getWechatQrCode()) && !aaPlatformParameter.getWechatQrCode().startsWith("http")){
+                aaPlatformParameter.setWechatQrCode(host + "/" + aaPlatformParameter.getWechatQrCode());
+            }
+        }*/
         return Result.OK(list.get( 0 ));
     }
 

jlsb/jeecg-boot-module-system/src/main/java/org/jeecg/modules/aa/entity/AaPlatformParameter.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.aa.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,6 +27,7 @@ public class AaPlatformParameter implements Serializable {
     private String id;
 
 
+    /* 不再使用 这idiot的命名
     private String aaa;
 
     private String aaaTitle;
@@ -73,17 +75,25 @@ public class AaPlatformParameter implements Serializable {
     private String bbbLink;
 
     private String cccLink;
+    */
 
 
     //联系我们
+    @ApiModelProperty(value = "联系我们手机号")
     private String phone;
+    @ApiModelProperty(value = "联系我们邮箱")
     private String mailbox;
-
+    @ApiModelProperty(value = "备注文案")
     private String remarkWenan;
+    @ApiModelProperty(value = "备注文案英语")
     private String remarkWenanEnglish;
+    @ApiModelProperty(value = "备注文案德语")
     private String remarkWenanGerman;
+    @ApiModelProperty(value = "微信二维码")
+    private String wechatQrCode;
 
     //手表列表顶部
+/*
 
     private String commodityPic;
 
@@ -98,5 +108,6 @@ public class AaPlatformParameter implements Serializable {
     private String commodityWaEnglish;
 
     private String commodityWaGerman;
+*/
 
 }