From a592f3dc14f342ceab26fb904cae1c4020244368 Mon Sep 17 00:00:00 2001 From: admin <1101184511@qq.com> Date: 星期日, 09 二月 2025 19:35:36 +0800 Subject: [PATCH] Changes --- src/main/java/com/taoke/autopay/controller/admin/AdminSettingsController.java | 54 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 33 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..fd94301 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,38 @@ @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(""); + } + + } -- Gitblit v1.8.0