工位导入

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/excel/jx/WorkCellExtExcelService.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.excel.jx;
 
-import cn.estsh.i3plus.mes.api.iservice.busi.IExcelImportService;
-import cn.estsh.i3plus.mes.apiservice.serviceimpl.busi.CommonService;
+import cn.estsh.i3plus.ext.mes.api.base.IExcelImportExtService;
+import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base.CommonExtService;
+import cn.estsh.i3plus.ext.mes.pojo.model.ExcelImportErrorExtModel;
+import cn.estsh.i3plus.ext.mes.pojo.model.ExcelImportResultExtModel;
 import cn.estsh.i3plus.mes.apiservice.util.MesCommonUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.util.MesConstWords;
@@ -9,8 +11,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
-import cn.estsh.i3plus.pojo.mes.model.ExcelImportErrorModel;
-import cn.estsh.i3plus.pojo.mes.model.ExcelImportResultModel;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCellRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesWorkCenterRepository;
 import org.apache.poi.ss.usermodel.CellType;
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
  * @Modify:
  **/
 @Service
-public class WorkCellExtExcelService implements IExcelImportService {
+public class WorkCellExtExcelService implements IExcelImportExtService {
 
     @Autowired
     private MesWorkCenterRepository workCenterRepository;
@@ -45,7 +45,7 @@ public class WorkCellExtExcelService implements IExcelImportService {
     private MesWorkCellRepository workCellRepository;
 
     @Autowired
-    private CommonService commonService;
+    private CommonExtService commonExtService;
 
     /**
      * 工位导入
@@ -55,9 +55,9 @@ public class WorkCellExtExcelService implements IExcelImportService {
      * @return
      */
     @Override
-    public ExcelImportResultModel insertDataByExcel(Workbook workbook, String organizeCode, String userName) {
+    public ExcelImportResultExtModel insertDataByExcel(Workbook workbook, String organizeCode, String userName) {
         //读取表格
-        ExcelImportResultModel excelImportResultModel = this.sheetExtractMesWorkCell(workbook.getSheetAt(0), organizeCode, userName);
+        ExcelImportResultExtModel excelImportResultModel = this.sheetExtractMesWorkCell(workbook.getSheetAt(0), organizeCode, userName);
         //数据入库
         this.insertExcelMesWorkCell(excelImportResultModel);
         return excelImportResultModel;
@@ -70,7 +70,7 @@ public class WorkCellExtExcelService implements IExcelImportService {
      * @param userName
      * @return
      */
-    private ExcelImportResultModel sheetExtractMesWorkCell(Sheet sheetAt, String organizeCode, String userName) {
+    private ExcelImportResultExtModel sheetExtractMesWorkCell(Sheet sheetAt, String organizeCode, String userName) {
         //从0行开始读取
         int totalNumberOfRows = sheetAt.getLastRowNum() + 1;
 
@@ -85,7 +85,7 @@ public class WorkCellExtExcelService implements IExcelImportService {
         String errorRows = "";
 
         //错误行信息集合
-        List<ExcelImportErrorModel> excelImportErrorModels = new ArrayList<>();
+        List<ExcelImportErrorExtModel> excelImportErrorModels = new ArrayList<>();
 
         //用于EXCEL表中的工位代码唯一校验，key：workCenterCode&workCellCode，value：row
         Map<String,String> workCenterCodeAndWorkCellCodeMap = new HashMap<>();
@@ -269,7 +269,7 @@ public class WorkCellExtExcelService implements IExcelImportService {
                     successRowNum ++;
                 } else {
                     //封装错误行信息ExcelImportErrorModel
-                    excelImportErrorModels = commonService.getExcelImportErrorModels(excelImportErrorModels, rowNum, errorNum, cellNum, errorInfo);
+                    excelImportErrorModels = commonExtService.getExcelImportErrorModels(excelImportErrorModels, rowNum, errorNum, cellNum, errorInfo);
 
                     errorRows += rowNum + ";";
                     failRowNum ++;
@@ -278,10 +278,10 @@ public class WorkCellExtExcelService implements IExcelImportService {
         }
 
         //校验EXCEL数据
-        commonService.checkExcelData(failRowNum, successRowNum, errorRows);
+        commonExtService.checkExcelData(failRowNum, successRowNum, errorRows);
 
         //封装返回结果
-        ExcelImportResultModel excelImportResultModel = commonService.getExcelImportResultModel(failRowNum, successRowNum, excelImportErrorModels, errorRows);
+        ExcelImportResultExtModel excelImportResultModel = commonExtService.getExcelImportResultModel(failRowNum, successRowNum, excelImportErrorModels, errorRows);
         excelImportResultModel.setExcelList((failRowNum > 0) ? null : workCellList);
         return excelImportResultModel;
     }
@@ -290,7 +290,7 @@ public class WorkCellExtExcelService implements IExcelImportService {
      * 工位导入-数据入库
      * @param excelImportResultModel
      */
-    private void insertExcelMesWorkCell(ExcelImportResultModel excelImportResultModel) {
+    private void insertExcelMesWorkCell(ExcelImportResultExtModel excelImportResultModel) {
         //导入数据
         if (null != excelImportResultModel) {
             List<MesWorkCell> excelList = excelImportResultModel.getExcelList();