diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index b73baae..8d90248 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index b73baae..8d90248 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6fae40b..191a044 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index b73baae..8d90248 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6fae40b..191a044 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c418756..4929039 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-common - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index b73baae..8d90248 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6fae40b..191a044 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c418756..4929039 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-common - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java index bd9398d..0ae3371 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java @@ -321,12 +321,12 @@ .filter(e-> (StrUtil.isBlank(e.getEquipmentName())&&StrUtil.isBlank(importDTO.getEquipmentName())) ||(StrUtil.isNotBlank(e.getEquipmentName())&&e.getEquipmentName().equals(importDTO.getEquipmentName()))) .filter(e-> (StrUtil.isBlank(e.getModel())&&StrUtil.isBlank(importDTO.getModel())) - ||(StrUtil.isNotBlank(e.getModel())&&e.getModel().equals(importDTO.getModel()))) + ||(StrUtil.isNotBlank(e.getModel())&& e.getModel().equalsIgnoreCase(importDTO.getModel()))) .filter(e-> (StrUtil.isBlank(e.getHelpInstruction())&&StrUtil.isBlank(importDTO.getHelpInstruction())) ||(StrUtil.isNotBlank(e.getHelpInstruction())&&e.getHelpInstruction().equals(importDTO.getHelpInstruction()))) .count()>0){ hasExist.add(i+1); - }else if(importList.stream().filter(e->e.getCheckDuplication().equals(importDTO.getCheckDuplication())).count()>1){ + }else if(importList.stream().filter(e->e.getCheckDuplication().equalsIgnoreCase(importDTO.getCheckDuplication())).count()>1){ tableDuplication.add(i+1); }else { unDuplicationResult.add(importDTO); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 6e048b5..fe60a44 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.github.oshi diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 1994620..43a3393 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 437eb18..6511c65 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-job - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index b73baae..8d90248 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.5.0 + 1.3.5.1 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index 6fae40b..191a044 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index c418756..4929039 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.5.0 + 1.3.5.1 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-model - 1.3.5.0 + 1.3.5.1 com.casic casic-metering-common - 1.3.5.0 + 1.3.5.1 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java index bd9398d..0ae3371 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentModelInfoServiceImpl.java @@ -321,12 +321,12 @@ .filter(e-> (StrUtil.isBlank(e.getEquipmentName())&&StrUtil.isBlank(importDTO.getEquipmentName())) ||(StrUtil.isNotBlank(e.getEquipmentName())&&e.getEquipmentName().equals(importDTO.getEquipmentName()))) .filter(e-> (StrUtil.isBlank(e.getModel())&&StrUtil.isBlank(importDTO.getModel())) - ||(StrUtil.isNotBlank(e.getModel())&&e.getModel().equals(importDTO.getModel()))) + ||(StrUtil.isNotBlank(e.getModel())&& e.getModel().equalsIgnoreCase(importDTO.getModel()))) .filter(e-> (StrUtil.isBlank(e.getHelpInstruction())&&StrUtil.isBlank(importDTO.getHelpInstruction())) ||(StrUtil.isNotBlank(e.getHelpInstruction())&&e.getHelpInstruction().equals(importDTO.getHelpInstruction()))) .count()>0){ hasExist.add(i+1); - }else if(importList.stream().filter(e->e.getCheckDuplication().equals(importDTO.getCheckDuplication())).count()>1){ + }else if(importList.stream().filter(e->e.getCheckDuplication().equalsIgnoreCase(importDTO.getCheckDuplication())).count()>1){ tableDuplication.add(i+1); }else { unDuplicationResult.add(importDTO); diff --git a/pom.xml b/pom.xml index f99a3aa..54ea830 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.5.0 + 1.3.5.1 casic-metering-eqpt-xichang pom