From fa677dec1c55db004a31beefb1e346e18c7858c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 18:41:29 +0800
Subject: [PATCH] bug修改

---
 src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java |   73 ++++++++++++++++++++++++++----------
 1 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java b/src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java
index 87be147..07e0065 100644
--- a/src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java
+++ b/src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java
@@ -72,24 +72,13 @@
 
     @ResponseBody
     @RequestMapping("setPayMoneyAndTime")
-    public String setPayMoneyAndTime(String moneys, String startSubmitTime, String endSubmitTime) {
-        if (StringUtil.isNullOrEmpty(moneys)) {
-            return JsonUtil.loadFalseResult("鏈笂浼犻噾棰�");
-        }
+    public String setPayMoneyAndTime(String startSubmitTime, String endSubmitTime) {
         if (StringUtil.isNullOrEmpty(startSubmitTime)) {
             return JsonUtil.loadFalseResult("鏈笂浼犲紑濮嬫椂闂�");
         }
         if (StringUtil.isNullOrEmpty(endSubmitTime)) {
             return JsonUtil.loadFalseResult("鏈笂浼犵粨鏉熸椂闂�");
         }
-        JSONArray moneyArrays = JSONArray.fromObject(moneys);
-        JSONArray fa = new JSONArray();
-        for (int i = 0; i < moneyArrays.size(); i++) {
-            // 缁熶竴淇濈暀2浣嶅皬鏁�
-            double money = moneyArrays.optDouble(i);
-            fa.add(new BigDecimal(money).setScale(2, RoundingMode.HALF_UP).toString());
-        }
-        systemConfigService.setValue(SystemConfigKeyEnum.PAY_MONEY_LIST, fa.toString());
         // 璁剧疆鏃堕棿锛岀敤閫楀彿鍒嗛殧
         systemConfigService.setValue(SystemConfigKeyEnum.KEY_SUBMIT_TIME_RANGE, startSubmitTime + "," + endSubmitTime);
         systemConfigService.clearCache();
@@ -100,16 +89,10 @@
     @ResponseBody
     @RequestMapping("getPayMoneyAndTime")
     public String getPayMoneyAndTime() {
-        String value = systemConfigService.getValue(SystemConfigKeyEnum.PAY_MONEY_LIST);
         PayMoneySettingsVO vo = new PayMoneySettingsVO();
-        if (StringUtil.isNullOrEmpty(value)) {
-            vo.setMoneys(new ArrayList<>());
-        } else {
-            vo.setMoneys(JsonUtil.getSimpleGson().fromJson(value, new TypeToken<List<String>>() {
-            }.getType()));
-        }
+        vo.setMoneys(new ArrayList<>());
         // 璁剧疆鏃堕棿锛岀敤閫楀彿鍒嗛殧
-        value = systemConfigService.getValue(SystemConfigKeyEnum.KEY_SUBMIT_TIME_RANGE);
+        String value = systemConfigService.getValue(SystemConfigKeyEnum.KEY_SUBMIT_TIME_RANGE);
         if (StringUtil.isNullOrEmpty(value)) {
             vo.setStartSubmitTime("");
             vo.setEndSubmitTime("");
@@ -122,6 +105,7 @@
 
     @Resource
     private UserSettingService userSettingService;
+
     @ResponseBody
     @RequestMapping("getUserSubmitKeyCountSetting")
     public String getUserSubmitKeyCountSetting() {
@@ -133,10 +117,57 @@
     @ResponseBody
     @RequestMapping("setUserSubmitKeyCount")
     public String setUserSubmitKeyCount(String value) {
-        List<UserSubmitKeyLimitDto> list =   new Gson().fromJson(value, new TypeToken<List<UserSubmitKeyLimitDto>>() {
+        List<UserSubmitKeyLimitDto> list = new Gson().fromJson(value, new TypeToken<List<UserSubmitKeyLimitDto>>() {
         }.getType());
         userSettingService.setUserSubmitKeyCount(list);
         return JsonUtil.loadTrueResult(new Gson().toJson(list));
     }
 
+    @ResponseBody
+    @RequestMapping("getTimeoutPayDevices")
+    public String getTimeoutPayDevices() {
+        String value = systemConfigService.getValue(SystemConfigKeyEnum.RE_EXCUTE_PAY_CLIENTS);
+        JSONObject data = new JSONObject();
+        data.put("timeout_devices", value);
+        return JsonUtil.loadTrueResult(data);
+    }
+
+
+    @ResponseBody
+    @RequestMapping("setTimeoutPayDevices")
+    public String setTimeoutPayDevices(String timeout_devices) {
+        timeout_devices = timeout_devices.trim();
+        List<Long> idList = new ArrayList<>();
+        String[] sts = timeout_devices.split(",");
+        for (String st : sts) {
+            st = st.trim();
+            if (!StringUtil.isNullOrEmpty(st)) {
+                idList.add(Long.parseLong(st));
+            }
+        }
+        String st = StringUtil.concat(idList, ",");
+        systemConfigService.setValue(SystemConfigKeyEnum.RE_EXCUTE_PAY_CLIENTS, st);
+        return JsonUtil.loadTrueResult("");
+    }
+
+
+
+    @ResponseBody
+    @RequestMapping("getForbiddenSubmitCitys")
+    public String getForbiddenSubmitCitys() {
+        String value = systemConfigService.getValue(SystemConfigKeyEnum.FORBIDDEN_SUBMIT_CITYS);
+        JSONObject data = new JSONObject();
+        data.put("citys", value);
+        return JsonUtil.loadTrueResult(data);
+    }
+
+
+    @ResponseBody
+    @RequestMapping("setForbiddenSubmitCitys")
+    public String setForbiddenSubmitCitys(String citys) {
+        systemConfigService.setValue(SystemConfigKeyEnum.FORBIDDEN_SUBMIT_CITYS, citys);
+        return JsonUtil.loadTrueResult("");
+    }
+
+
 }

--
Gitblit v1.8.0