修改OTA

This commit is contained in:
高嵩
2023-04-13 19:21:23 +08:00
parent 68ed12cb9b
commit aa4c2b5ac0
14 changed files with 72 additions and 17 deletions
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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 = "车型及功能备案列表-数据导出")
@@ -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);
}
}
@@ -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);
}
}
@@ -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 = "升级备案-数据导出")
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}
@@ -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);
}
}