|
|
@ -72,8 +72,14 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); |
|
|
|
Long startTime = parentTaskDetail.getBeginTime(); |
|
|
|
if (ObjectUtil.isNotNull(subTaskSheet)) { |
|
|
|
String str = ExcelUtil.getCellValue(subTaskSheet.getRow(1).getCell(4)); |
|
|
|
String str = ""; |
|
|
|
if(ObjectUtil.isNotNull(subTaskSheet.getRow(1))){ |
|
|
|
str = ExcelUtil.getCellValue(subTaskSheet.getRow(1).getCell(4)); |
|
|
|
} |
|
|
|
for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { |
|
|
|
if(ObjectUtil.isNull(subTaskSheet.getRow(a))){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1)); |
|
|
|
String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2)); |
|
|
|
String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3)); |
|
|
@ -170,6 +176,9 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
XSSFSheet subTaskSheet = xssfWorkbook.getSheet(sheetName); |
|
|
|
if (ObjectUtil.isNotNull(subTaskSheet)) { |
|
|
|
for (int a = 2; a < subTaskSheet.getLastRowNum(); a++) { |
|
|
|
if(ObjectUtil.isNull(subTaskSheet.getRow(a))){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
String nameCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(1)); |
|
|
|
String beginCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(2)); |
|
|
|
String endCell = ExcelUtil.getCellValue(subTaskSheet.getRow(a).getCell(3)); |
|
|
@ -271,6 +280,9 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
String pluginName = null; |
|
|
|
List<ProPluginSignin> proPluginSigninList = new ArrayList<>(); |
|
|
|
for (int i = 2; i < fuzzyStart; i++) { |
|
|
|
if(ObjectUtil.isNull(signSheet.getRow(i))){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
if (StrUtil.isNotEmpty(ExcelUtil.getCellValue(signSheet.getRow(i).getCell(1)))) { |
|
|
|
taskName = ExcelUtil.getCellValue(signSheet.getRow(i).getCell(1)); |
|
|
|
} |
|
|
@ -320,42 +332,44 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
} |
|
|
|
//读取模糊查询的信息
|
|
|
|
XSSFRow fuzzy = signSheet.getRow(fuzzyStart); |
|
|
|
for (int i = 0; i < fuzzy.getLastCellNum(); i++) { |
|
|
|
String fieldCell = ExcelUtil.getCellValue(fuzzy.getCell(i)); |
|
|
|
//获取字段的id
|
|
|
|
Long signFieldId = null; |
|
|
|
if (StrUtil.isNotEmpty(fieldCell)) { |
|
|
|
SigninFieldExample signinFieldExample = new SigninFieldExample(); |
|
|
|
signinFieldExample.createCriteria().andDescriptionEqualTo(fieldCell); |
|
|
|
List<SigninField> fieldList = signinFieldDao.selectByExample(signinFieldExample); |
|
|
|
if (CollectionUtil.isNotEmpty(fieldList)) { |
|
|
|
signFieldId = fieldList.get(0).getId(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
break; |
|
|
|
} |
|
|
|
//添加内容
|
|
|
|
if (ObjectUtil.isNotNull(signFieldId)) { |
|
|
|
//修改关联表,将是否模糊搜索改成“是”
|
|
|
|
for (ProPluginSignin pluginSignin : proPluginSigninList) { |
|
|
|
if (signFieldId.longValue() == pluginSignin.getSigninFieldId().longValue()) { |
|
|
|
pluginSignin.setIsFuzzy((byte) 1); |
|
|
|
proPluginSigninDao.updateByPrimaryKeySelective(pluginSignin); |
|
|
|
break; |
|
|
|
if(ObjectUtil.isNotNull(fuzzy)) { |
|
|
|
for (int i = 0; i < fuzzy.getLastCellNum(); i++) { |
|
|
|
String fieldCell = ExcelUtil.getCellValue(fuzzy.getCell(i)); |
|
|
|
//获取字段的id
|
|
|
|
Long signFieldId = null; |
|
|
|
if (StrUtil.isNotEmpty(fieldCell)) { |
|
|
|
SigninFieldExample signinFieldExample = new SigninFieldExample(); |
|
|
|
signinFieldExample.createCriteria().andDescriptionEqualTo(fieldCell); |
|
|
|
List<SigninField> fieldList = signinFieldDao.selectByExample(signinFieldExample); |
|
|
|
if (CollectionUtil.isNotEmpty(fieldList)) { |
|
|
|
signFieldId = fieldList.get(0).getId(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
break; |
|
|
|
} |
|
|
|
//添加模糊查询内容
|
|
|
|
for (int j = fuzzyStart + 1; j < signSheet.getLastRowNum(); j++) { |
|
|
|
String description = ExcelUtil.getCellValue(signSheet.getRow(j).getCell(i)); |
|
|
|
if (StrUtil.isNotEmpty(description)) { |
|
|
|
ProPluginSigninFuzzy signinFuzzy = new ProPluginSigninFuzzy(); |
|
|
|
signinFuzzy.setId(snowflake.nextId()); |
|
|
|
signinFuzzy.setProjectId(projectId); |
|
|
|
signinFuzzy.setSigninFieldId(signFieldId); |
|
|
|
signinFuzzy.setDescription(description); |
|
|
|
pluginSigninFuzzyDao.insertSelective(signinFuzzy); |
|
|
|
} else { |
|
|
|
break; |
|
|
|
//添加内容
|
|
|
|
if (ObjectUtil.isNotNull(signFieldId)) { |
|
|
|
//修改关联表,将是否模糊搜索改成“是”
|
|
|
|
for (ProPluginSignin pluginSignin : proPluginSigninList) { |
|
|
|
if (signFieldId.longValue() == pluginSignin.getSigninFieldId().longValue()) { |
|
|
|
pluginSignin.setIsFuzzy((byte) 1); |
|
|
|
proPluginSigninDao.updateByPrimaryKeySelective(pluginSignin); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
//添加模糊查询内容
|
|
|
|
for (int j = fuzzyStart + 1; j < signSheet.getLastRowNum(); j++) { |
|
|
|
String description = ExcelUtil.getCellValue(signSheet.getRow(j).getCell(i)); |
|
|
|
if (StrUtil.isNotEmpty(description)) { |
|
|
|
ProPluginSigninFuzzy signinFuzzy = new ProPluginSigninFuzzy(); |
|
|
|
signinFuzzy.setId(snowflake.nextId()); |
|
|
|
signinFuzzy.setProjectId(projectId); |
|
|
|
signinFuzzy.setSigninFieldId(signFieldId); |
|
|
|
signinFuzzy.setDescription(description); |
|
|
|
pluginSigninFuzzyDao.insertSelective(signinFuzzy); |
|
|
|
} else { |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
@ -413,6 +427,9 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
XSSFSheet pluginConfigSheet = xssfWorkbook.getSheet("插件配置"); |
|
|
|
if (ObjectUtil.isNotNull(pluginConfigSheet)) { |
|
|
|
for (int i = 2; i <= pluginConfigSheet.getLastRowNum(); i++) { |
|
|
|
if(ObjectUtil.isNull(pluginConfigSheet.getRow(i))){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
String taskName = ExcelUtil.getCellValue(pluginConfigSheet.getRow(i).getCell(1)); |
|
|
|
String webPath = ExcelUtil.getCellValue(pluginConfigSheet.getRow(i).getCell(2)); |
|
|
|
String pluginName = ExcelUtil.getCellValue(pluginConfigSheet.getRow(i).getCell(3)); |
|
|
@ -478,12 +495,16 @@ public class WbsSubSheetService implements IWbsSubSheetService { |
|
|
|
XSSFSheet robotSheet = xssfWorkbook.getSheet("智能助手"); |
|
|
|
if(ObjectUtil.isNotNull(robotSheet)){ |
|
|
|
for (int i = 1; i <= robotSheet.getLastRowNum(); i++) { |
|
|
|
XSSFRow row = robotSheet.getRow(i); |
|
|
|
if (ObjectUtil.isNull(row)){ |
|
|
|
continue; |
|
|
|
} |
|
|
|
//机器人与项目关联信息的id
|
|
|
|
Long projectRobotId = null; |
|
|
|
String robotName = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(0)); |
|
|
|
String webHookPath = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(1)); |
|
|
|
String messageType = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(2)); |
|
|
|
String robotType = ExcelUtil.getCellValue(robotSheet.getRow(i).getCell(3)); |
|
|
|
String robotName = ExcelUtil.getCellValue(row.getCell(0)); |
|
|
|
String webHookPath = ExcelUtil.getCellValue(row.getCell(1)); |
|
|
|
String messageType = ExcelUtil.getCellValue(row.getCell(2)); |
|
|
|
String robotType = ExcelUtil.getCellValue(row.getCell(3)); |
|
|
|
if(StrUtil.isNotEmpty(webHookPath)){ |
|
|
|
//添加机器人并关联项目
|
|
|
|
SysRobotExample sysRobotExample = new SysRobotExample(); |
|
|
|