From aa4c2b5ac0b1ae6ccb863729a8a450ef567c4475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 13 Apr 2023 19:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ota/controller/OtaBaCxAqcsController.java  |  6 +++++-
 .../modules/ota/controller/OtaBaCxJbxxController.java  |  6 +++++-
 .../ota/controller/OtaBaCxJsfzbacsController.java      |  6 +++++-
 .../ota/controller/OtaBaCxKsjjsmccsController.java     |  6 +++++-
 .../ota/controller/OtaBaCxKsjxtmccsController.java     |  6 +++++-
 .../modules/ota/controller/OtaBaCxListController.java  |  6 +++++-
 .../ota/controller/OtaBaCxZxsjyqController.java        |  7 +++++--
 .../ota/controller/OtaBaSjGgnrfsController.java        |  6 +++++-
 .../modules/ota/controller/OtaBaSjListController.java  |  6 +++++-
 .../ota/controller/OtaBaSjSjfzbhController.java        |  6 +++++-
 .../ota/controller/OtaBaSjSjmbclController.java        |  6 +++++-
 .../ota/controller/OtaBaSjSjmbcxController.java        |  6 +++++-
 .../ota/controller/OtaBaSjSjxtbhController.java        |  6 +++++-
 .../ota/controller/OtaBaSjSjyxpgController.java        | 10 +++++++---
 14 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
index 42067c84f..f4d652ed7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxAqcsController.java
@@ -214,7 +214,11 @@ public class OtaBaCxAqcsController extends JeroController<OtaBaCxAqcs, IOtaBaCxA
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
index 8127b0c46..66f04f60c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJbxxController.java
@@ -213,7 +213,11 @@ public class OtaBaCxJbxxController extends JeroController<OtaBaCxJbxx, IOtaBaCxJ
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK(res).success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
index 5788a14bf..3edea1099 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxJsfzbacsController.java
@@ -210,7 +210,11 @@ public class OtaBaCxJsfzbacsController extends JeroController<OtaBaCxJsfzbacs, I
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
index 3fc1f7240..121c76aad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjjsmccsController.java
@@ -211,7 +211,11 @@ public class OtaBaCxKsjjsmccsController extends JeroController<OtaBaCxKsjjsmccs,
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
index ff69d9c4b..4a35bbc96 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxKsjxtmccsController.java
@@ -213,7 +213,11 @@ public class OtaBaCxKsjxtmccsController extends JeroController<OtaBaCxKsjxtmccs,
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
index 2a4a6554b..aabf9ba83 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java
@@ -245,7 +245,11 @@ public class OtaBaCxListController extends JeroController<OtaBaCxList, IOtaBaCxL
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
     @ApiOperation(value = "车型及功能备案列表-数据导出")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
index 2b2cda855..7df70ccf2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxZxsjyqController.java
@@ -209,7 +209,10 @@ public class OtaBaCxZxsjyqController extends JeroController<OtaBaCxZxsjyq, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
-
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
index f50fc5f5c..7131e2140 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjGgnrfsController.java
@@ -213,7 +213,11 @@ public class OtaBaSjGgnrfsController extends JeroController<OtaBaSjGgnrfs, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.OK().success(errMsg.toString());
+		 String errMsgStr = errMsg.toString();
+		 if (errMsgStr.endsWith(", ")) {
+			 errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+		 }
+		 return Result.OK().success(errMsgStr);
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
index 216efc815..472fed758 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjListController.java
@@ -241,7 +241,11 @@ public class OtaBaSjListController extends JeroController<OtaBaSjList, IOtaBaSjL
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
     @ApiOperation(value = "升级备案-数据导出")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
index e13b15f92..4f2cc5ec8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjfzbhController.java
@@ -211,7 +211,11 @@ public class OtaBaSjSjfzbhController extends JeroController<OtaBaSjSjfzbh, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.OK().success(errMsg.toString());
+		 String errMsgStr = errMsg.toString();
+		 if (errMsgStr.endsWith(", ")) {
+			 errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+		 }
+		 return Result.OK().success(errMsgStr);
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
index 350eab020..499e12464 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbclController.java
@@ -207,6 +207,10 @@ public class OtaBaSjSjmbclController extends JeroController<OtaBaSjSjmbcl, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
index 795fdda3a..b35579b20 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjmbcxController.java
@@ -208,7 +208,11 @@ public class OtaBaSjSjmbcxController extends JeroController<OtaBaSjSjmbcx, IOtaB
 			 e.printStackTrace();
 			 return Result.error(e.getMessage());
 		 }
-		 return Result.OK().success(errMsg.toString());
+		 String errMsgStr = errMsg.toString();
+		 if (errMsgStr.endsWith(", ")) {
+			 errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+		 }
+		 return Result.OK().success(errMsgStr);
 	 }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
index f4f071438..1c96e3181 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjxtbhController.java
@@ -213,7 +213,11 @@ public class OtaBaSjSjxtbhController extends JeroController<OtaBaSjSjxtbh, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
index 2f4404aaf..ebd3ea788 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaSjSjyxpgController.java
@@ -188,14 +188,14 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
         return super.importExcel(request, response, OtaBaSjSjyxpg.class);
     }
 
-    @ApiOperation(value = "车型备案-安全措施-模板下载")
+    @ApiOperation(value = "升级备案-升级影响评估-模板下载")
     @GetMapping(value = "/exportTemplate")
 //	@RequiresPermissions("otaBaCx:exportTemplate")
     public void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception {
         this.otaBaSjSjyxpgService.exportTemplate(response, request);
     }
 
-    @ApiOperation(value = "车型备案-安全措施-数据导入")
+    @ApiOperation(value = "升级备案-升级影响评估-数据导入")
     @PostMapping(value = "/importData")
 //	@RequiresPermissions("otaBaCx:importData")
     public Result<?> importData(@RequestParam(value = "file", required = false) MultipartFile file,
@@ -213,7 +213,11 @@ public class OtaBaSjSjyxpgController extends JeroController<OtaBaSjSjyxpg, IOtaB
             e.printStackTrace();
             return Result.error(e.getMessage());
         }
-        return Result.OK().success(errMsg.toString());
+        String errMsgStr = errMsg.toString();
+        if (errMsgStr.endsWith(", ")) {
+            errMsgStr = errMsgStr.substring(0, errMsgStr.lastIndexOf(","));
+        }
+        return Result.OK().success(errMsgStr);
     }
 
 }