From 23f02e6b45dd7cf0ab2e7827144913ca59575ea4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 04 三月 2025 18:59:23 +0800
Subject: [PATCH] jar
---
src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java | 223 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 145 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
index 557a72c..d4bbe69 100644
--- a/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
+++ b/src/main/java/com/example/server/progressTrack/service/DjJdgzNetworkLevel3Service.java
@@ -2,6 +2,7 @@
import com.example.client.dto.JComboBoxItem;
import com.example.client.service.BaseService;
+import com.example.server.cabin.service.CabinService;
import com.example.server.progressTrack.Dto.NetworkNodeStatusDto;
import com.example.server.progressTrack.dao.DjJdgzNetworkLevel3Dao;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
@@ -39,13 +40,15 @@
DjJdgzNetworkLevel3ListService DjJdgzNetworkLevel3ListService;
@Autowired
SysTeamGroupClassService sysTeamGroupClassService;
+ @Autowired
+ CabinService cabinService;
@Value("${zt.oss.local-path}")
private String path;
- public List<DjJdgzNetworkLevel3> getList(Long shipId) {
- List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId);
+ public List<DjJdgzNetworkLevel3> getList(Long shipId, Long deptId, Long teamId, Long cabinId, String type, String name) {
+ List<DjJdgzNetworkLevel3> list = baseDao.getList(shipId, deptId, teamId, cabinId, type, name);
return list;
}
@@ -120,15 +123,33 @@
sum = sum + num;
Map<Integer, String> mapProcessName = new HashMap<>();
- mapProcessName.put(1,"璁惧鎷嗗嵏鍑鸿埍");
- mapProcessName.put(2,"璁惧鍒嗕氦");
- mapProcessName.put(3,"鎷嗘閴村畾");
- mapProcessName.put(4,"璁惧杩斿巶");
- mapProcessName.put(5,"鍥炶");
+ mapProcessName.put(1, "璁惧鎷嗗嵏鍑鸿埍");
+ mapProcessName.put(2, "璁惧鍒嗕氦");
+ mapProcessName.put(3, "鎷嗘閴村畾");
+ mapProcessName.put(4, "璁惧杩斿巶");
+ mapProcessName.put(5, "鍥炶");
Map<String, String> mapTeamGroup = sysTeamGroupClassService.getMapGroup(false, "hld");
+ JComboBoxItem[] cabinList = cabinService.getList();
+ JComboBoxItem[] deptList = sysTeamGroupClassService.getDeptList();
+ JComboBoxItem[] teamList = sysTeamGroupClassService.getTeamList(null);
+
+ Map<String, Long> cabinMap = new HashMap<>();
+ Map<String, Long> deptMap = new HashMap<>();
+ Map<String, Long> teamMap = new HashMap<>();
+
+ for (JComboBoxItem item : cabinList) {
+ cabinMap.put(item.getName(), item.getId());
+ }
+ for (JComboBoxItem item : deptList) {
+ deptMap.put(item.getName(), item.getId());
+ }
+ for (JComboBoxItem item : teamList) {
+ teamMap.put(item.getName(), item.getId());
+ }
for (int j = 1; j <= num; j++) {
+ int sort = 0;
DjJdgzNetworkLevel3 data = new DjJdgzNetworkLevel3();
DjJdgzNetworkLevel3List node = new DjJdgzNetworkLevel3List();
@@ -138,206 +159,247 @@
Row row = sheet.getRow(j);
String name = ImportUtil.getCellValue(row, 0, pattern);
- String teamGroup = ImportUtil.getCellValue(row, 1, pattern);
- String time1 = ImportUtil.getCellValue(row, 2, pattern);
- String time2 = ImportUtil.getCellValue(row, 3, pattern);
- String time3 = ImportUtil.getCellValue(row, 4, pattern);
- String time4 = ImportUtil.getCellValue(row, 5, pattern);
- String time5 = ImportUtil.getCellValue(row, 6, pattern);
- String repairUnit = ImportUtil.getCellValue(row, 7, pattern);
- String repairUnitDirector = ImportUtil.getCellValue(row, 8, pattern);
- String repairUnitContact = ImportUtil.getCellValue(row, 9, pattern);
- String generalRepairUnit = ImportUtil.getCellValue(row, 10, pattern);
- String generalRepairUnitDirector = ImportUtil.getCellValue(row, 11, pattern);
- String generalRepairUnitContact = ImportUtil.getCellValue(row, 12, pattern);
+ String deptStr = ImportUtil.getCellValue(row, 1, pattern);
+ String teamGroupStr = ImportUtil.getCellValue(row, 2, pattern);
+ String cabinStr = ImportUtil.getCellValue(row, 3, pattern);
+ String typeStr = ImportUtil.getCellValue(row, 4, pattern);
+ String time1 = ImportUtil.getCellValue(row, 5, pattern);
+ String time2 = ImportUtil.getCellValue(row, 6, pattern);
+ String time3 = ImportUtil.getCellValue(row, 7, pattern);
+ String time4 = ImportUtil.getCellValue(row, 8, pattern);
+ String time5 = ImportUtil.getCellValue(row, 9, pattern);
+ String repairUnit = ImportUtil.getCellValue(row, 10, pattern);
+ String repairUnitDirector = ImportUtil.getCellValue(row, 11, pattern);
+ String repairUnitContact = ImportUtil.getCellValue(row, 12, pattern);
+ String generalRepairUnit = ImportUtil.getCellValue(row, 13, pattern);
+ String generalRepairUnitDirector = ImportUtil.getCellValue(row, 14, pattern);
+ String generalRepairUnitContact = ImportUtil.getCellValue(row, 15, pattern);
Long id = UUIDUtil.generateId();
if (StringUtils.isEmpty(name)) {
- result = "绗�"+j+"琛�"+"璁惧鍚嶇О涓嶈兘涓虹┖";
+ result = "绗�" + j + "琛�" + "璁惧鍚嶇О涓嶈兘涓虹┖";
isErr = true;
+ continue;
} else {
data.setId(id);
+ node.setNetworkId(id);
data.setName(name);
data.setLevel1NetworkId(level1NetworkId);
data.setLevel2NetworkId(level2NetworkId);
data.setLevel2NodeId(level2NodeId);
}
- if (StringUtils.isEmpty(teamGroup)) {
- result = "绗�"+j+"琛�"+"涓撲笟涓嶈兘涓虹┖";
+ if (StringUtils.isEmpty(deptStr)) {
+ result = "绗�" + j + "琛�" + "閮ㄩ棬涓嶈兘涓虹┖";
isErr = true;
+ continue;
} else {
- Long teamGroupId = Long.valueOf(mapTeamGroup.get(teamGroup));
- //鍒犻櫎鏁版嵁搴撲腑鐩稿悓涓撲笟鍙婄浉鍚屼笁绾х綉缁滃浘鏁版嵁
- baseDao.deleteByTeamGroup(teamGroupId, name);
-
- node.setTeamgroupId(teamGroupId);
- node.setTeamgroupName(teamGroup);
- node.setNetworkId(id);
+ if (deptMap.get(deptStr) == null) {
+ result = "绗�" + j + "琛�" + "閮ㄩ棬涓嶅瓨鍦�";
+ isErr = true;
+ continue;
+ } else {
+ Long deptId = deptMap.get(deptStr);
+ data.setDeptId(deptId);
+ }
}
- if (StringUtils.isEmpty(time1)) {
- result = "绗�"+j+"琛�"+"绗�"+1+"涓�"+"鑺傜偣鏃堕棿涓嶈兘涓虹┖";
+ if (StringUtils.isEmpty(teamGroupStr)) {
+ result = "绗�" + j + "琛�" + "涓撲笟涓嶈兘涓虹┖";
isErr = true;
+ continue;
} else {
+ if (teamMap.get(teamGroupStr) == null) {
+ result = "绗�" + j + "琛�" + "涓撲笟涓嶅瓨鍦�";
+ isErr = true;
+ continue;
+ } else {
+ Long teamId = teamMap.get(teamGroupStr);
+ data.setTeamgroupId(teamId);
+ data.setTeamgroupName(teamGroupStr);
+ }
+ }
+
+ if (StringUtils.isEmpty(cabinStr)) {
+ result = "绗�" + j + "琛�" + "鑸卞涓嶈兘涓虹┖";
+ isErr = true;
+ continue;
+ } else {
+ String[] cabins = cabinStr.split(",");
+
+ // 鐢ㄤ簬瀛樺偍鎷兼帴鍚庣殑 id
+ StringBuilder idBuilder = new StringBuilder();
+
+ // 閬嶅巻姣忎釜閿�
+ for (String key : cabins) {
+ key = key.trim(); // 鍘婚櫎鍙兘鐨勭┖鏍�
+ Long cabinId = cabinMap.get(key);
+ // 濡傛灉閿湪 Map 涓瓨鍦�
+ if (cabinId != null) {
+ if (idBuilder.length() > 0) {
+ idBuilder.append(","); // 娣诲姞鍒嗛殧绗�
+ }
+ idBuilder.append(cabinId); // 娣诲姞 id
+ } else {
+ result = "绗�" + j + "琛�" + "鑸卞涓嶅瓨鍦�";
+ isErr = true;
+ continue;
+ }
+ }
+ data.setCabinId(idBuilder.toString());
+ }
+
+ if (StringUtils.isNotBlank(time1)) {
if (time1.matches("[0-9/]+")) {
time1 = time1.replace("/", "-");
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(1);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9.]+")) {
time1 = time1.replace(".", "-");
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(1);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time1.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time1);
node.setProcessName(mapProcessName.get(1));
- node.setSort(1);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
- result = "绗�"+j+"琛�"+"绗�"+1+"涓�"+"鑺傜偣鏃堕棿鏃ユ湡鏍煎紡涓嶈鑼�";
+ result = "绗�" + j + "琛�" + "绗�" + 1 + "涓�" + "鑺傜偣鏃堕棿鏃ユ湡鏍煎紡涓嶈鑼�";
isErr = true;
}
}
- if (StringUtils.isEmpty(time2)) {
- result = "绗�"+j+"琛�"+"绗�"+2+"涓�"+"鑺傜偣鏃堕棿涓嶈兘涓虹┖";
- isErr = true;
- } else {
- if (node.getId()!=null){
+ if (StringUtils.isNotBlank(time2)) {
+ if (node.getId() != null) {
node.setId(null);
}
if (time2.matches("[0-9/]+")) {
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(2);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9.]+")) {
time2 = time2.replace(".", "-");
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(2);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time2.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time2);
node.setProcessName(mapProcessName.get(2));
- node.setSort(2);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
- result = "绗�"+j+"琛�"+"绗�"+2+"涓�"+"鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
+ result = "绗�" + j + "琛�" + "绗�" + 2 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
isErr = true;
}
}
- if (StringUtils.isEmpty(time3)) {
- result = "绗�"+j+"琛�"+"绗�"+3+"涓�"+"鑺傜偣鏃堕棿涓嶈兘涓虹┖";
- isErr = true;
- } else {
- if (node.getId()!=null){
+ if (StringUtils.isNotBlank(time3)) {
+ if (node.getId() != null) {
node.setId(null);
}
if (time3.matches("[0-9/]+")) {
time3 = time3.replace("/", "-");
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(3);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9.]+")) {
time3 = time3.replace(".", "-");
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(3);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time3.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time3);
node.setProcessName(mapProcessName.get(3));
- node.setSort(3);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
- result = "绗�"+j+"琛�"+"绗�"+3+"涓�"+"鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
+ result = "绗�" + j + "琛�" + "绗�" + 3 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
isErr = true;
}
}
- if (StringUtils.isEmpty(time4)) {
- result = "绗�"+j+"琛�"+"绗�"+4+"涓�"+"鑺傜偣鏃堕棿涓嶈兘涓虹┖";
- isErr = true;
- } else {
- if (node.getId()!=null){
+ if (StringUtils.isNotBlank(time4)) {
+ if (node.getId() != null) {
node.setId(null);
}
if (time4.matches("[0-9/]+")) {
time4 = time4.replace("/", "-");
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(4);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9.]+")) {
time4 = time4.replace(".", "-");
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(4);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time4.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time4);
node.setProcessName(mapProcessName.get(4));
- node.setSort(4);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
- result = "绗�"+j+"琛�"+"绗�"+4+"涓�"+"鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
+ result = "绗�" + j + "琛�" + "绗�" + 4 + "涓�" + "鑺傜偣鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
isErr = true;
}
}
- if (StringUtils.isEmpty(time5)) {
- result = "绗�"+j+"琛�"+"绗�"+5+"涓�"+"鑺傜偣鏃堕棿涓嶈兘涓虹┖";
- isErr = true;
- } else {
- if (node.getId()!=null){
+ if (StringUtils.isNotBlank(time5)) {
+ if (node.getId() != null) {
node.setId(null);
}
if (time5.matches("[0-9/]+")) {
time5 = time5.replace("/", "-");
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(5);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9.]+")) {
time5 = time5.replace(".", "-");
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(5);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else if (time5.matches("[0-9-]+")) {
node.setRequiredCompletionTime(time5);
node.setProcessName(mapProcessName.get(5));
- node.setSort(5);
+ node.setSort(sort + 1);
DjJdgzNetworkLevel3ListService.insert(node);
} else {
- result = "绗�"+j+"琛�"+"绗�"+5+"涓�"+"瑕佹眰瀹屾垚鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
+ result = "绗�" + j + "琛�" + "绗�" + 5 + "涓�" + "瑕佹眰瀹屾垚鏃堕棿鐨勬棩鏈熸牸寮忎笉瑙勮寖";
isErr = true;
}
}
- if(StringUtils.isNotBlank(generalRepairUnit)){
+
+ if (StringUtils.isNotBlank(typeStr)) {
+ data.setType(typeStr);
+ }
+ if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setGeneralRepairUnit(generalRepairUnit);
}
- if(StringUtils.isNotBlank(generalRepairUnitContact)){
+ if (StringUtils.isNotBlank(generalRepairUnitContact)) {
data.setGeneralRepairUnitContact(generalRepairUnitContact);
}
- if(StringUtils.isNotBlank(generalRepairUnitDirector)){
+ if (StringUtils.isNotBlank(generalRepairUnitDirector)) {
data.setGeneralRepairUnitDirector(generalRepairUnitDirector);
}
- if(StringUtils.isNotBlank(generalRepairUnit)){
+ if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setRepairUnit(repairUnit);
}
- if(StringUtils.isNotBlank(generalRepairUnit)){
+ if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setRepairUnitContact(repairUnitContact);
}
- if(StringUtils.isNotBlank(generalRepairUnit)){
+ if (StringUtils.isNotBlank(generalRepairUnit)) {
data.setRepairUnitDirector(repairUnitDirector);
}
@@ -354,13 +416,18 @@
}
} catch (Exception e) {
e.printStackTrace();
- result = "瀵煎叆"+row1+"琛屾暟鎹椂妫�娴嬪埌寮傚父锛屼腑鏂鍏ユ搷浣溿��";
+ result = "瀵煎叆" + row1 + "琛屾暟鎹椂妫�娴嬪埌寮傚父锛屼腑鏂鍏ユ搷浣溿��";
}
suc = sum - err;
return result;
}
+
+ public JComboBoxItem[] getListByExport(Long projectId, Long deptId, Long teamId) {
+ JComboBoxItem[] list = baseDao.getListByExport(projectId, deptId, teamId);
+ return list;
+ }
/* public void exportExcelTemplate(HttpServletResponse response, HttpServletRequest request) throws IOException {
String excelName="涓夌骇缃戠粶鍥炬壒閲忔ā鐗�";
String excelPath = path + "template/jx-model/" + excelName + ".xlsx"; //妯℃澘璺緞
--
Gitblit v1.9.1