From 52394e095a2790030104a96e2a63465fa0d570bf Mon Sep 17 00:00:00 2001 From: djz8236 Date: Wed, 7 Jun 2023 09:21:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=B0=83=E5=BA=A6=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20=E5=AE=8C=E5=96=84=E6=A0=B9=E6=8D=AEsid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/dispatchmodletemplate/DispatchModleTemplateRest.java | 2 ++ .../biz/dispatchmodletemplate/DispatchModleTemplateService.java | 2 ++ .../biz/dispatchopmalarm/DispatchOpmAlarmRest.java | 2 ++ .../biz/dispatchopmalarm/DispatchOpmAlarmService.java | 2 ++ .../biz/dispatchopmalarmhis/DispatchOpmAlarmHisRest.java | 2 ++ .../biz/dispatchopmalarmhis/DispatchOpmAlarmHisService.java | 2 ++ .../biz/dispatchorderinfo/DispatchOrderinfoRest.java | 2 ++ .../biz/dispatchorderinfo/DispatchOrderinfoService.java | 2 ++ .../biz/dispatchorderstandards/DispatchOrderStandardsRest.java | 2 ++ .../dispatchorderstandards/DispatchOrderStandardsService.java | 2 ++ .../biz/dispatchpatrolmodle/DispatchPatrolModleRest.java | 2 ++ .../biz/dispatchpatrolmodle/DispatchPatrolModleService.java | 2 ++ .../biz/dispatchpatrolplan/DispatchPatrolPlanRest.java | 2 ++ .../biz/dispatchpatrolplan/DispatchPatrolPlanService.java | 2 ++ .../biz/dispatchplanworker/DispatchPlanWorkerRest.java | 2 ++ .../biz/dispatchplanworker/DispatchPlanWorkerService.java | 2 ++ .../biz/dispatchstandards/DispatchStandardsRest.java | 2 ++ .../biz/dispatchstandards/DispatchStandardsService.java | 2 ++ .../biz/dispatchtemplate/DispatchTemplateRest.java | 2 ++ .../biz/dispatchtemplate/DispatchTemplateService.java | 2 ++ .../dispatchcenter/biz/dispatchworker/DispatchWorkerRest.java | 2 ++ .../biz/dispatchworker/DispatchWorkerService.java | 2 ++ 22 files changed, 44 insertions(+) diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java index bbf1d00b..ffdaa754 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java @@ -102,6 +102,8 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java index d58e89aa..a1a2e4e7 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java @@ -107,6 +107,8 @@ public class DispatchModleTemplateService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchOpmAlarmDetailsVo vo = dispatchOpmAlarmService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java index 57e887a2..0ee9f4e8 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarm/DispatchOpmAlarmService.java @@ -116,6 +116,8 @@ public class DispatchOpmAlarmService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchOpmAlarmHisDetailsVo vo = dispatchOpmAlarmHisService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarmhis/DispatchOpmAlarmHisService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarmhis/DispatchOpmAlarmHisService.java index b1c140f2..2bb8d511 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarmhis/DispatchOpmAlarmHisService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchopmalarmhis/DispatchOpmAlarmHisService.java @@ -103,6 +103,8 @@ public class DispatchOpmAlarmHisService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchOrderinfoDetailsVo vo = dispatchOrderinfoService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java index 08288e3a..bfcd848a 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java @@ -154,6 +154,8 @@ public class DispatchOrderinfoService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchOrderStandardsDetailsVo vo = dispatchOrderStandardsService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java index 951e25d1..051eade2 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java @@ -132,6 +132,8 @@ public class DispatchOrderStandardsService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchPatrolModleDetailsVo vo = dispatchPatrolModleService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleService.java index c1fb506b..69c2fb46 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleService.java @@ -103,6 +103,8 @@ public class DispatchPatrolModleService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchPatrolPlanDetailsVo vo = dispatchPatrolPlanService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java index 7f65b769..24d1994d 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java @@ -120,6 +120,8 @@ public class DispatchPatrolPlanService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchPlanWorkerDetailsVo vo = dispatchPlanWorkerService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java index b790926a..f7a6926b 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchplanworker/DispatchPlanWorkerService.java @@ -104,6 +104,8 @@ public class DispatchPlanWorkerService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchStandardsDetailsVo vo = dispatchStandardsService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java index 1853b0e9..6f43f438 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java @@ -116,6 +116,8 @@ public class DispatchStandardsService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchTemplateDetailsVo vo = dispatchTemplateService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java index 66163276..d66b5f1d 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplateService.java @@ -103,6 +103,8 @@ public class DispatchTemplateService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchWorkerDetailsVo vo = dispatchWorkerService.fetchDetailsVoBySid(sid); + if (vo==null) + return rb.setMsg("查询不到数据"); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java index 9d8596bd..0ff16adf 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java @@ -116,6 +116,8 @@ public class DispatchWorkerService extends MybatisBaseService