lyhzzz 2 meses atrás
pai
commit
24a7aa8edc

+ 2 - 4
src/main/java/com/fdkankan/fusion/service/impl/CaseNumServiceImpl.java

@@ -73,7 +73,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
 
 
     @Override
-    public void addBatch(Integer caseId, List<SceneNumParam> sceneNumParam) {
+    public synchronized void addBatch(Integer caseId, List<SceneNumParam> sceneNumParam) {
 
         List<String> addNumList = this.updateByNumList(caseId, sceneNumParam);
         if(addNumList == null || addNumList.size()<=0){
@@ -96,9 +96,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
 
         for (Integer type : map.keySet()) {
             HashSet<String> nulList = map.get(type);
-            List<String> numList = new ArrayList<>(nulList);
-            HashSet<String> setNum = new HashSet<>(numList);
-            for (String num : setNum) {
+            for (String num : nulList) {
                 if(!addNumList.contains(num)){
                     continue;
                 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -212,7 +212,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     }
 
     @Override
-    public CaseEntity addOrUpdate(CaseEntity caseEntity) {
+    public synchronized CaseEntity addOrUpdate(CaseEntity caseEntity) {
         if( StringUtils.isNotBlank(caseEntity.getCaseTitle())){
             this.saveOrUpdate(caseEntity);
         }

+ 4 - 4
src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -242,11 +242,11 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
         LambdaQueryWrapper<Model> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Model::getNum,num);
         wrapper.eq(Model::getType,type);
-        Model model = this.getOne(wrapper);
-        if(model == null){
-            model = new Model();
+        List<Model> models = this.list(wrapper);
+        if(models == null || models.isEmpty()){
+            return new Model();
         }
-        return model;
+        return models.get(0);
     }
 
     @Override