From b3aa9222ed37dd44822e0a9d55e28b6439d7c38e Mon Sep 17 00:00:00 2001 From: "pan.wl.2" Date: Mon, 18 Nov 2024 15:01:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/SettingWebsiteController.java | 25 +++++++++++++++++++ .../SettingSiteStatisticsValidate.java | 18 +++++++++++++ .../vo/setting/SettingSiteStatisticsVo.java | 18 +++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSiteStatisticsValidate.java create mode 100644 server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSiteStatisticsVo.java diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java index dd40780d..4b1d88bd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java @@ -6,11 +6,14 @@ import com.mdd.admin.service.ISettingProtocolService; import com.mdd.admin.service.ISettingWebsiteService; import com.mdd.admin.validate.setting.SettingCopyrightValidate; import com.mdd.admin.validate.setting.SettingAgreementValidate; +import com.mdd.admin.validate.setting.SettingSiteStatisticsValidate; import com.mdd.admin.validate.setting.SettingWebsiteValidate; import com.mdd.admin.vo.setting.SettingCopyrightVo; import com.mdd.admin.vo.setting.SettingAgreementVo; +import com.mdd.admin.vo.setting.SettingSiteStatisticsVo; import com.mdd.admin.vo.setting.SettingWebsiteVo; import com.mdd.common.core.AjaxResult; +import com.mdd.common.util.ConfigUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -80,4 +83,26 @@ public class SettingWebsiteController { return AjaxResult.success(); } + + @GetMapping("/getSiteStatistics") + @ApiOperation(value="获取站点统计配置") + public AjaxResult getSiteStatistics() { + + SettingSiteStatisticsVo vo = new SettingSiteStatisticsVo(); + + vo.setClarityCode(ConfigUtils.get("siteStatistics", "clarity_code")); + + return AjaxResult.success(vo); + } + + @Log(title = "站点统计配置") + @PostMapping("/setSiteStatistics") + @ApiOperation(value="站点统计配置") + public AjaxResult setSiteStatistics(@Validated @RequestBody SettingSiteStatisticsValidate settingSiteStatisticsValidate) { + + ConfigUtils.set("siteStatistics", "clarity_code", settingSiteStatisticsValidate.getClarityCode()); + + return AjaxResult.success(); + } + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSiteStatisticsValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSiteStatisticsValidate.java new file mode 100644 index 00000000..fc35aa86 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/setting/SettingSiteStatisticsValidate.java @@ -0,0 +1,18 @@ +package com.mdd.admin.validate.setting; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("站点统计设置参数") +public class SettingSiteStatisticsValidate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "clarityCode") + private String clarityCode; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSiteStatisticsVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSiteStatisticsVo.java new file mode 100644 index 00000000..b929ee2f --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/setting/SettingSiteStatisticsVo.java @@ -0,0 +1,18 @@ +package com.mdd.admin.vo.setting; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel("站点统计配置信息Vo") +public class SettingSiteStatisticsVo implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "clarityCode") + private String clarityCode; + +} From fd4f5c12e13481dc40206bbc1d3f7e0788338f3b Mon Sep 17 00:00:00 2001 From: "pan.wl.2" Date: Mon, 18 Nov 2024 15:17:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/controller/setting/SettingWebsiteController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java index 4b1d88bd..0f818f4c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java @@ -90,7 +90,7 @@ public class SettingWebsiteController { SettingSiteStatisticsVo vo = new SettingSiteStatisticsVo(); - vo.setClarityCode(ConfigUtils.get("siteStatistics", "clarity_code")); + vo.setClarityCode(ConfigUtils.get("siteStatistics", "clarity_code", "")); return AjaxResult.success(vo); } From 41ab5407ca2d6acf9242767df36ccfe896e2c0df Mon Sep 17 00:00:00 2001 From: "pan.wl.2" Date: Mon, 18 Nov 2024 15:19:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/setting/SettingWebsiteController.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java index 0f818f4c..8d67714b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/SettingWebsiteController.java @@ -87,11 +87,8 @@ public class SettingWebsiteController { @GetMapping("/getSiteStatistics") @ApiOperation(value="获取站点统计配置") public AjaxResult getSiteStatistics() { - SettingSiteStatisticsVo vo = new SettingSiteStatisticsVo(); - vo.setClarityCode(ConfigUtils.get("siteStatistics", "clarity_code", "")); - return AjaxResult.success(vo); } @@ -99,9 +96,7 @@ public class SettingWebsiteController { @PostMapping("/setSiteStatistics") @ApiOperation(value="站点统计配置") public AjaxResult setSiteStatistics(@Validated @RequestBody SettingSiteStatisticsValidate settingSiteStatisticsValidate) { - ConfigUtils.set("siteStatistics", "clarity_code", settingSiteStatisticsValidate.getClarityCode()); - return AjaxResult.success(); }