From 9e45c11b5d9db91ea3681fc99e00ea2b4a4c601b Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 17 Dec 2024 15:56:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/modules/fdr/controller/FaultRecorderController.java | 2 +- .../java/com/das/modules/plc/controller/PlcLogsController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java b/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java index 0af9179b..9c844598 100644 --- a/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java +++ b/das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java @@ -51,7 +51,7 @@ public class FaultRecorderController { String code = jsonObject.getString("deviceCode"); String startTime = jsonObject.getString("startTime"); String endTime = jsonObject.getString("endTime"); - List result = faultRecorderService.getDirOrFileList("Statuscode",code,startTime,endTime); + List result = faultRecorderService.getDirOrFileList("Tracelog",code,startTime,endTime); return R.success(result); } diff --git a/das/src/main/java/com/das/modules/plc/controller/PlcLogsController.java b/das/src/main/java/com/das/modules/plc/controller/PlcLogsController.java index 7f69e56a..dd176596 100644 --- a/das/src/main/java/com/das/modules/plc/controller/PlcLogsController.java +++ b/das/src/main/java/com/das/modules/plc/controller/PlcLogsController.java @@ -44,7 +44,7 @@ public class PlcLogsController { String code = jsonObject.getString("deviceCode"); String startTime = jsonObject.getString("startTime"); String endTime = jsonObject.getString("endTime"); - List result = plcLogService.getDirOrFileList("Tracelog",code,startTime,endTime); + List result = plcLogService.getDirOrFileList("Statuscode",code,startTime,endTime); return R.success(result); } From c6c63327e6df67aae5eb372c9459fec57e263e43 Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 17 Dec 2024 15:59:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/fdr/service/impl/FaultRecorderServiceImpl.java | 2 +- .../com/das/modules/plc/service/impl/PlcLogsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java index 6f17e958..3cf43f35 100644 --- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java +++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java @@ -191,7 +191,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); } catch (Exception e) { - e.printStackTrace(); + log.error("文件解析异常：{}",e); throw new ServiceException("配置解析异常"); } return resultMap; diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index 958880d9..d284ca30 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -86,7 +86,7 @@ public class PlcLogsServiceImpl implements PlcLogService { resultMap = parseFile(fileStream, fdrFormatVo.getTimeFormat(), fdrFormatVo.getDelimiter(), fdrFormatVo.getValidStartLine()); } catch (Exception e) { - e.printStackTrace(); + log.error("文件解析异常：{}",e); throw new ServiceException("配置解析异常"); } return resultMap; From f0cd49362bf20d7866fdd7fd672d961cde4a8afb Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 17 Dec 2024 16:11:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/fdr/service/impl/FaultRecorderServiceImpl.java | 3 ++- .../com/das/modules/plc/service/impl/PlcLogsServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java index 3cf43f35..514d4721 100644 --- a/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java +++ b/das/src/main/java/com/das/modules/fdr/service/impl/FaultRecorderServiceImpl.java @@ -192,7 +192,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { } catch (Exception e) { log.error("文件解析异常：{}",e); - throw new ServiceException("配置解析异常"); + throw new ServiceException("文件解析异常，请检查配置"); } return resultMap; } @@ -231,6 +231,7 @@ public class FaultRecorderServiceImpl implements FaultRecorderService { stringListMap = parseDataCurve(result, timeFormat); } catch (Exception e) { log.error("文件解析失败{}", e); + throw new ServiceException("文件解析失败"); } return stringListMap; } diff --git a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java index d284ca30..843a7f67 100644 --- a/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java +++ b/das/src/main/java/com/das/modules/plc/service/impl/PlcLogsServiceImpl.java @@ -87,7 +87,7 @@ public class PlcLogsServiceImpl implements PlcLogService { } catch (Exception e) { log.error("文件解析异常：{}",e); - throw new ServiceException("配置解析异常"); + throw new ServiceException("文件解析异常，请检查配置"); } return resultMap; } @@ -163,6 +163,7 @@ public class PlcLogsServiceImpl implements PlcLogService { stringListMap = parseDataCurve(result, timeFormat); } catch (Exception e) { log.error("文件解析失败{}", e); + throw new ServiceException("文件解析失败"); } return stringListMap; } From 1fa7b697f34ea4bebea7dcd8c0741ba73a9db17d Mon Sep 17 00:00:00 2001 From: fengrong Date: Tue, 17 Dec 2024 16:18:40 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/backend/SystemParam/request.ts | 18 + .../src/views/backend/SystemParam/index.vue | 333 ++++++++++++------ 2 files changed, 238 insertions(+), 113 deletions(-) create mode 100644 ui/dasadmin/src/api/backend/SystemParam/request.ts diff --git a/ui/dasadmin/src/api/backend/SystemParam/request.ts b/ui/dasadmin/src/api/backend/SystemParam/request.ts new file mode 100644 index 00000000..cfb96f26 --- /dev/null +++ b/ui/dasadmin/src/api/backend/SystemParam/request.ts @@ -0,0 +1,18 @@ +import createAxios from '/@/utils/axios' + +export function getParamList(params: object = {}) { + return createAxios({ + url: '/api/page/home/set/getList', + method: 'POST', + data: params, + }) +} + +export function Paramupdate(params: object = {}) { + return createAxios({ + url: '/api/page/home/set/update', + method: 'POST', + data: params, + }) +} + diff --git a/ui/dasadmin/src/views/backend/SystemParam/index.vue b/ui/dasadmin/src/views/backend/SystemParam/index.vue index 92018c59..f8c1caac 100644 --- a/ui/dasadmin/src/views/backend/SystemParam/index.vue +++ b/ui/dasadmin/src/views/backend/SystemParam/index.vue @@ -9,13 +9,13 @@
- - + +