From 83e8981accbc513b287184ca4094a50b5e5299ca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 19:33:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
index 3218661..4fe42ed 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TStoredValueConfigController.java
@@ -26,7 +26,6 @@
@Controller
@RequestMapping("/storeValueConfig")
public class TStoredValueConfigController {
-
private String PREFIX = "/system/storeValueConfig/";
@Autowired
private StoreValueConfigClient storeValueConfigClient;
@@ -41,7 +40,7 @@
// 解析json串 获取时间
JSONObject jsonObject = new JSONObject(storeValueConfig.getContent());
JSONArray timeRulesArray = jsonObject.getJSONArray("time_rules");
- model.addAttribute("content",jsonObject);
+ model.addAttribute("content",jsonObject.toString());
if (timeRulesArray.length() > 0) {
JSONObject timeRule = timeRulesArray.getJSONObject(0);
String startTime = timeRule.getString("startTime");
@@ -49,6 +48,8 @@
model.addAttribute("time",startTime+" - " + endTime);
System.out.println("StartTime: " + startTime);
System.out.println("EndTime: " + endTime);
+ }else{
+ model.addAttribute("time","");
}
return PREFIX + "StoreValueConfig.html";
}
--
Gitblit v1.7.1