skyline 1 vuosi sitten
vanhempi
säilyke
c156657473

+ 6 - 9
admin-web/src/views/admin/platform/rate/index.vue

@@ -169,14 +169,11 @@ const state = reactive({
           }, row.name || row.title)])
       }
     },
-    {label: '平台费率(0.1代表10%)', width: 180, prop: 'feeRate', query: true, type: '', resizable: true},
-    {label: '充值冻结金额比例(0.3代表30%)', width: 180, prop: 'frozenRatio', query: true, type: '', resizable: true},
-
-    {label: '提现手续费率(0.006代表6‰)', width: 180, prop: 'withdrawalFeeRate', query: true, type: '', resizable: true},
-
-    {label: '创建时间', width: 180, prop: 'createTime', query: true, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
-
-    {label: '更新时间', width: 180, prop: 'updateTime', query: true, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
+    {label: '平台费率', width: 180, prop: 'feeRate', query: true, type: '', resizable: true},
+    {label: '充值冻结金额比例', width: 180, prop: 'frozenRatio', query: true, type: '', resizable: true},
+    {label: '提现手续费率', width: 180, prop: 'withdrawalFeeRate', query: true, type: '', resizable: true},
+    {label: '创建时间', width: 180, prop: 'createTime', sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
+    {label: '更新时间', width: 180, prop: 'updateTime',  sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
     {
       label: '操作', prop: 'action', type: 'render', width: 180, align: 'center', fixed: 'right',
     }
@@ -252,4 +249,4 @@ const handleRowDelete = (row: any) => {
 // defineExpose({
 //     loadData,
 // });
-</script>
+</script>

+ 16 - 3
car-wash-admin/src/main/java/com/kym/admin/controller/DeviceConfigController.java

@@ -43,14 +43,27 @@ public class DeviceConfigController extends IController {
     }
 
     /**
-     * 读取设备配置
+     * 获取设备配置
+     *
+     * @param id
+     * @return Res
+     */
+//    @SaCheckPermission(value = "deviceConfig.list")
+    @PostMapping("/{id}")
+    @SysLog(value = "获取设备配置")
+    public R<?> add(@PathVariable("id") String id) {
+        return resp(() -> deviceConfigService.getById(id));
+    }
+
+    /**
+     * 读取远程设备配置
      *
      * @param shortId
      * @return Res
      */
 //    @SaCheckPermission(value = "deviceConfig.list")
-    @PostMapping("/{shortId}")
-    @SysLog(value = "读取设备配置")
+    @GetMapping("/{shortId}")
+    @SysLog(value = "读取远程设备配置")
     public R<?> readDeviceConfig(@PathVariable("shortId") String shortId) {
         return resp(() -> deviceConfigService.readDeviceConfig(shortId));
     }