From dd3f57317edc84965849d3eb78bf0216dfd02206 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期三, 14 六月 2023 14:57:42 +0800
Subject: [PATCH] 修复密码策略异常bug
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index 87aa4dd..ee01f3b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -31,9 +31,7 @@
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
//@AllArgsConstructor
@@ -96,20 +94,20 @@
String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
File file1 = new File(excelFileName);
try {
-// file.transferTo(new File(excelFileName));
-// CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
-// if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
-// //鏀惧埌map閲�
-// R result = R.fail("瀵煎叆澶辫触");
-// if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
-// String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
-// codeImProtRusultVO.setFileOid(filedUUid);
-// }
-// result.setData(codeImProtRusultVO);
-// return result;
-// }else {
-// return R.success("鎿嶄綔鎴愬姛锛�");
-// }
+ file.transferTo(new File(excelFileName));
+ CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
+ if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
+ //鏀惧埌map閲�
+ R result = R.fail("瀵煎叆澶辫触");
+ if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
+ String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
+ codeImProtRusultVO.setFileOid(filedUUid);
+ }
+ result.setData(codeImProtRusultVO);
+ return result;
+ }else {
+ return R.success("鎿嶄綔鎴愬姛锛�");
+ }
}catch (Throwable e) {
logger.error("瀵煎叆閿欒",e);
String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
@@ -126,7 +124,7 @@
}finally {
file1.delete();
}
- return null;
+// return null;
}
@@ -474,8 +472,63 @@
@GetMapping("/thisistest")
@ResponseBody
- public List<BaseModel> thisistest(String codeClassifyOid, String functionId) throws Exception {
- return engineService.selectByTypeAndOid("wupin", "b1511bb3-a773-43e2-ac85-a7fde7314a0f,3e08970024835e69f6c2b2ecd90c48c3,582ff205-0dfb-43e0-8223-e772ff1851ab,db0400fe-cc90-4d9d-8da7-1edf06b1481b");
+ public Integer thisistest(String codeClassifyOid, String functionId) throws Exception {
+// return engineService.selectByTypeAndOid("wupin", "b1511bb3-a773-43e2-ac85-a7fde7314a0f,3e08970024835e69f6c2b2ecd90c48c3,582ff205-0dfb-43e0-8223-e772ff1851ab,db0400fe-cc90-4d9d-8da7-1edf06b1481b");
+
+ List<BaseModel> models = new ArrayList<>();
+ BaseModel baseModel = new BaseModel();
+ Map<String,String > map = new HashMap<>();
+ map.put("JZL","6789");
+ map.put("JZRXX","67891");
+ map.put("JZXZB","67892");
+ map.put("JSZGL","67893");
+ map.put("JSSXT","67894");
+ baseModel.setBtmname("djii");
+ baseModel.setCreator("fjivis");
+ baseModel.setId("vcia");
+ baseModel.setOid("0d86b1ba-9e9e-4d3d-9ae4-f862c3684e74");
+ baseModel.setCreateTime(new Date());
+ baseModel.setTs(new Date());
+ baseModel.setData(map);
+ models.add(baseModel);
+
+ BaseModel baseModel1 = new BaseModel();
+ Map<String,String > map1 = new HashMap<>();
+ map1.put("JZL","6789z");
+ map1.put("JZRXX","67891z");
+ map1.put("JZXZB","67892z");
+ map1.put("JSZGL","67893z");
+ map1.put("JSSXT","67894z");
+ baseModel1.setBtmname("djiiz");
+ baseModel1.setCreator("fjivisz");
+ baseModel1.setId("vciaz");
+ baseModel1.setTs(new Date());
+ baseModel1.setOid("4a00be07-f5a8-4a9b-88fb-d52a0d9cf546");
+ baseModel1.setCreateTime(new Date());
+ baseModel1.setData(map1);
+ models.add(baseModel1);
+
+ BaseModel baseModel2 = new BaseModel();
+ Map<String,String > map2 = new HashMap<>();
+ map2.put("JZL","67892");
+ map2.put("JZRXX","678912");
+ map2.put("JZXZB","678922");
+ map2.put("JSZGL","678932");
+ map2.put("JSSXT","678942");
+ baseModel2.setBtmname("djii2");
+ baseModel2.setCreator("fjivis2");
+ baseModel2.setTs(new Date());
+ baseModel2.setId("vcia2");
+ baseModel2.setOid("fa430ff9-f141-4dcf-8809-6f87905c1dea");
+ baseModel2.setCreateTime(new Date());
+ baseModel2.setData(map2);
+ models.add(baseModel2);
+
+ return 0;
+
+
+
+// return engineService.updateBatchByBaseModel("wupin", models);
// return engineService.getUIInfoByClassifyOid(codeClassifyOid,functionId);
}
}
--
Gitblit v1.9.3