lyfO_o
2022-11-18 1c375d6dcd0c41bc3c206585a2712ec066bf5992
src/main/java/com/nanometer/smartlab/service/SysControllerServiceImpl.java
@@ -38,8 +38,6 @@
   SysControllerDao sysControllerDao;
   @Resource(name = "sysLaboratoryContainerDao")
   SysLaboratoryContainerDao sysLaboratoryContainerDao;
   @Resource(name = "sysControllerService")
   SysControllerService sysControllerService;
   @Resource(name = "baseMetaService")
   BaseMetaService baseMetaService;
   @Override
@@ -62,7 +60,7 @@
         throw new BusinessException(ExceptionEnumCode.DB_ERR,
               MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
      }
   }
   @Override
@@ -114,7 +112,7 @@
    @Override
    public void uploadFile(FileUploadEvent event) throws  Exception{
      List<SysController> sysControllers=sysControllerService.getAllControllerList();
      List<SysController> sysControllers=this.getAllControllerList();
      List<BaseMeta> typeList=baseMetaService.getBaseMetaList("controller_type");
      //主控名字和条码
      HashSet<String> controllerInfo = new HashSet<>();
@@ -173,6 +171,11 @@
               }
               valuesList.add(cellInfo);
            }
            if (valuesList.size() != 3){
               break;
            }
            //重名判断
            String controlName = valuesList.get(0);
            if (controllerInfo.contains(controlName)){
@@ -196,7 +199,7 @@
            sysController.setControllerCode(controlCode);
            sysController.setControllerName(controlName);
            sysController.setType(typeMap.get(controlType));
            sysControllerService.insertSysController(sysController);
            this.insertSysController(sysController);
            controllerInfo.add(controlName);
            controllerInfo.add(controlCode);
         }