diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 14277d806..6c3e368f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -76,6 +76,7 @@ public class FileSplitItemsEOController extends JeroController getSplitItemsById(String id){ Map item = fileSplitItemsEOService.getInfoById(id); return Result.OK(item); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java deleted file mode 100644 index 8c7aa8910..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsEOController.java +++ /dev/null @@ -1,704 +0,0 @@ -package com.jero.modules.split.controller; - -import cn.afterturn.easypoi.excel.ExcelImportUtil; -import cn.afterturn.easypoi.excel.entity.ImportParams; -import cn.hutool.core.util.ZipUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.api.vo.Result; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.split.common.ConvertHtml2Excel; -import com.jero.modules.split.common.FileUnZip; -import com.jero.modules.split.common.ReadExcel; -import com.jero.modules.split.common.SplitTableInfo; -import com.jero.modules.split.dto.*; -import com.jero.modules.split.entity.SarFileSplitItemsEO; -import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; -import com.jero.modules.split.entity.SarFileSplitItemsValEO; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; -import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; -import com.jero.modules.split.page.SarFileSplitItemsValEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsEOService; -import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; -import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; -import com.jero.modules.split.service.ISarFileSplitItemsValEOService; -import com.jero.modules.split.util.POIReadExcelToHtml; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.poi.common.usermodel.HyperlinkType; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.hssf.util.HSSFColor; -import org.apache.poi.ss.usermodel.CreationHelper; -import org.apache.poi.ss.usermodel.Hyperlink; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.util.*; - -import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; - -@RestController -@RequestMapping("/split/fileSplitItems") -@Api(tags = "条款信息-备用") -public class SarFileSplitItemsEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOController.class); - - @Autowired - private ISarFileSplitItemsEOService sarFileSplitItemsEOService; - - @Autowired - private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; - - @Autowired - private ISarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; - - @Autowired - private ISarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService; - - @Autowired - private IOSSFileService ossFileService; - - @Value("${jero.path.upload}") - private String filePath; - - @Value("${jero.path.upload}") - private String uploadFilePath; - - @ApiOperation(value = "文档拆分条款信息-分页查询Y") - @GetMapping("/getSplitItemsByPage") -// @RequiresPermissions("lawss:sarFileSplitItems:page") - public Result> page(SarFileSplitItemsEOPage page) throws Exception { - page.setValidFlag("0"); - //page.setOrderBy("regexp_replace(replace('.'||ITEMS_NUM, '.', '.00000000'), '0+([^\\.]{8})', '\\1')"); - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - List rows = sarFileSplitItemsEOService.queryByPage(page); - if (rows != null && !rows.isEmpty()) { - for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { - SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); - paramPage.setItemId(sarFileSplitItemsEO.getId()); - List paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage); - sarFileSplitItemsEO.setParamsList(paramList); - } - - } - IPage pageList = new Page<>(); - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsEOService.queryByCount(page)); - return Result.OK(pageList); - } - - @ApiOperation(value = "文档拆分条款信息-查看所有条款详情") - @GetMapping("/getAllSplitItems") - public Result> getAllSplitItems(SarFileSplitItemsEOPage page){ - page.setValidFlag("0"); - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - List rows = sarFileSplitItemsEOService.queryByList2(page); - return Result.OK(rows); - } - -// @ApiOperation(value = "文档拆分条款信息-查询") -// @GetMapping("") -//// @RequiresPermissions("lawss:sarFileSplitItems:list") -// public Result> list(SarFileSplitItemsEOPage page) throws Exception { -// return Result.OK(sarFileSplitItemsEOService.queryByList(page)); -// } - -// @ApiOperation(value = "文档拆分条款信息-详情") -// @GetMapping("/{id}") -// @RequiresPermissions("lawss:sarFileSplitItems:get") -// public Result find(@PathVariable String id) throws Exception { -// return Result.OK(sarFileSplitItemsEOService.selectByPrimaryKey(id)); -// } - - @ApiOperation(value = "文档拆分条款信息-新增Y") - @PostMapping("/addSplitItems") - public Result create(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { - if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); - } - - int resultCount = 0; - if(StringUtils.isBlank(sarFileSplitItemsEO.getId())){ - resultCount = sarFileSplitItemsEOService.addItemContent(sarFileSplitItemsEO); - }else{ - resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); - } - if (resultCount > 0) { - return Result.OK("新增成功",sarFileSplitItemsEO); - } else { - return Result.error("新增失败"); - } - } - - @ApiOperation(value = "文档拆分条款信息-修改") - @PutMapping("/updateSplitItems") - public Result update(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { - if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); - } - - int resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); - if (resultCount > 0) { - return Result.OK("修改成功",sarFileSplitItemsEO); - } else { - return Result.error("修改失败"); - } - } - - @ApiOperation(value = "文档拆分条款信息-暂存") - @PutMapping("/saveSplitItems") - public Result save(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { - if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); - } - - int resultCount = 0; - if(StringUtils.isBlank(sarFileSplitItemsEO.getId())){ - resultCount = sarFileSplitItemsEOService.addItemContent(sarFileSplitItemsEO); - }else{ - resultCount = sarFileSplitItemsEOService.updateItemContent(sarFileSplitItemsEO); - } - - if (resultCount > 0) { - return Result.OK("暂存成功",sarFileSplitItemsEO); - } else { - return Result.error("暂存失败"); - } - } - -// @ApiOperation(value = "文档拆分条款信息-删除") -// @GetMapping("/{id}") -// @RequiresPermissions("lawss:sarFileSplitItems:delete") -// public Result delete(@PathVariable String id) throws Exception { -// sarFileSplitItemsEOService.deleteByPrimaryKey(id); -// logger.info("delete from SAR_FILE_SPLIT_ITEMS where id = {}", id); -// return Result.OK(); -// } - - @ApiOperation(value = "文档拆分条款信息-批量删除Y") - @PostMapping("/batchDeleteItems") - public Result batchDeleteItems(String ids) throws Exception { - if (StringUtils.isNotEmpty(ids)) { - int result = sarFileSplitItemsEOService.batchDeleteItems(ids); - if (result > 0) { - return Result.OK("删除成功",null); - } else { - return Result.error("删除失败"); - } - - } else { - return Result.error("请选择要删除的数据"); - } - } - - @ApiOperation(value = "文档拆分条款信息-批量删除条款要求") - @PostMapping("/batchDeleteItemsVal") - public Result batchDeleteItemsVal(@RequestBody SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { - if(CollectionUtils.isNotEmpty(sarFileSplitItemsEO.getItemValEOList())) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : sarFileSplitItemsEO.getItemValEOList()) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - sarFileSplitItemsEO.setItemValEOList(itemValEOListNew); - } - - int resultCount = sarFileSplitItemsEOService.updateItemContentAfterBathDel(sarFileSplitItemsEO); - if (resultCount > 0) { - return Result.OK("批量删除成功",sarFileSplitItemsEO); - } else { - return Result.error("批量删除失败"); - } - } - - - @ApiOperation(value = "文档拆分条款信息-移动条款要求到指定目录") - @PostMapping("/moveSplitItemsVal") - public Result moveSplitItemsVal(@RequestBody SarFileSplitItemsEOPage page) throws Exception { - if(CollectionUtils.isNotEmpty(page.getTargetItemValEOList())) { - List itemValEOListNew = new ArrayList<>(); - for (SarFileSplitItemsValEO itemsValEO : page.getTargetItemValEOList()) { - itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); - itemValEOListNew.add(itemsValEO); - } - page.setTargetItemValEOList(itemValEOListNew); - } - - Map resultMsgMap = sarFileSplitItemsEOService.moveSplitItemsVal(page); - if ("0".equals(resultMsgMap.get("code"))) { - return Result.OK("移动成功"); - } else { - return Result.error(resultMsgMap.get("msg")); - } - } - - @ApiOperation(value = "文档拆分条款信息-根据id查询") - @GetMapping("/getInfoById") -// @RequiresPermissions("lawss:sarFileSplitItems:get") - public Result getInfoById(String id) throws Exception { - SarFileSplitItemsEO sarFileSplitItemsEO = sarFileSplitItemsEOService.selectByPrimaryKey(id); - if (sarFileSplitItemsEO != null) { - SarFileSplitItemsParamsEOPage paramPage = new SarFileSplitItemsParamsEOPage(); - paramPage.setItemId(id); - List paramList = sarFileSplitItemsParamsEOService.queryByList(paramPage); - sarFileSplitItemsEO.setParamsList(paramList); - } - // 查询特殊参数要求信息 - return Result.OK(sarFileSplitItemsEO); - } - - @ApiOperation(value = "文档拆分条款信息-判断包含子节点Y") - @GetMapping("/judgeContaintChilds") - /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ - public Result> judgeContaintChilds(String ids) throws Exception { - Map result = sarFileSplitItemsEOService.judgeContaintChilds(ids); - return Result.OK(result); - } - - @ApiOperation(value = "文档拆分条款信息-导出zipY") - @GetMapping(value = "/exportSplitInfoZip") - public void exportSplitInfoZip(String idList, String infoId,String exportName, HttpServletResponse response, HttpServletRequest request) throws Exception { - OutputStream os = null; - OutputStream excelOS = null; - HSSFWorkbook workbook = new HSSFWorkbook(); - String fileOriName = "拆分条款信息"; - if (StringUtils.isNotEmpty(exportName)) { - fileOriName = exportName; - } - try{ - //创建临时文件夹 - String fileNowPath = uploadFilePath + "/tempZip/" + UUID.randomUUID().toString().replace("-","") + "/" + fileOriName; - File nowFile = new File(fileNowPath); - if (nowFile.exists()){ - nowFile.delete(); - } - nowFile.mkdirs(); - String fileName = fileOriName + ".xls"; - HSSFSheet sheetItems = workbook.createSheet("条款内容"); - String[] headers = {"条款号","条款名称","条款内容"}; - HSSFCellStyle cellStyle =workbook.createCellStyle(); - cellStyle.setWrapText(true); -// cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); - cellStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER); - HSSFCellStyle cellStyle1 =workbook.createCellStyle(); - cellStyle1.setAlignment(HSSFCellStyle.ALIGN_CENTER); - HSSFCellStyle cellStyleLink =workbook.createCellStyle(); - HSSFFont font = workbook.createFont(); - font.setColor(HSSFColor.LIGHT_BLUE.index); - cellStyleLink.setFont(font); - cellStyleLink.setWrapText(true); - List itemIdList = new ArrayList<>(); - SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); - if (StringUtils.isNotEmpty(idList)) { - String[] idArr = idList.split(","); - itemIdList = Arrays.asList(idArr); - page.setIdList(itemIdList); - } - //查询全部条款 - page.setInfoId(infoId); - page.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - List allItemsList = sarFileSplitItemsEOService.queryByOrdersForExport(page); - List allTableList = new ArrayList<>(); - List allImgList = new ArrayList<>(); - List allRelevFileList = new ArrayList<>(); - int countMaxFile = 1; - if (allItemsList != null && !allItemsList.isEmpty()) { - for (FileSplitItemsExportDto itemsExportDto : allItemsList) { - SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage(); - valEOPage.setItemId(itemsExportDto.getId()); - valEOPage.setOrderBy("DISPLAY_SEQ,ID"); - List getValList = sarFileSplitItemsValEOService.queryByList(valEOPage); - List valContentList = sarFileSplitItemsEOService.combineItemValInfo(getValList,allTableList,allImgList,page); - itemsExportDto.setItemValContent(valContentList); - } - } - // 在excel表中添加表头 - HSSFRow row = sheetItems.createRow(0); - sheetItems.setColumnWidth(0,10*256); - sheetItems.setColumnWidth(1,20*256); - sheetItems.setColumnWidth(2,100*256); - //导出目前只需要条款号、条款名称、条款内容 - -// sheetItems.setColumnWidth(3,20*256); -// sheetItems.setColumnWidth(4,20*256); -// sheetItems.setColumnWidth(5,20*256); -// sheetItems.setColumnWidth(6,20*256); -// sheetItems.setColumnWidth(7,20*256); -// sheetItems.setColumnWidth(8,20*256); -// sheetItems.setColumnWidth(9,40*256); - for (int i = 0; i < headers.length; i++) { - HSSFCell cell = row.createCell(i); - HSSFRichTextString text = new HSSFRichTextString(headers[i]); - cell.setCellValue(text); - cell.setCellStyle(cellStyle1); - } - //放文字内容 - int allRow = 0; - for(int rowNum = 0;rowNum < allItemsList.size(); rowNum++){ - FileSplitItemsExportDto exportDto = allItemsList.get(rowNum); - List valList = exportDto.getItemValContent(); - int countFile = 0; - if(valList != null && !valList.isEmpty()){ - int startRow = allRow + 1; - for (int valRow=0;valRow -1) { - content = content.substring(0,content.lastIndexOf("\n")); - } - } - if("TABLE".equals(valList.get(valRow).getValType())){ - /* 连接跳转*/ - CreationHelper createHelper = workbook.getCreationHelper(); - Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT); - String tableName = "#\'"+ content + "\'!A1"; - hyperlink1.setAddress(tableName); - cell2.setHyperlink(hyperlink1);// 链接 - row1.getCell(2).setCellStyle(cellStyleLink); - } else if ("IMG".equals(valList.get(valRow).getValType())) { - /* 连接跳转*/ - CreationHelper createHelper = workbook.getCreationHelper(); - Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE); - String imgName = content; - hyperlink1.setAddress(imgName); - cell2.setHyperlink(hyperlink1);// 链接 - row1.getCell(2).setCellStyle(cellStyleLink); - } - cell2.setCellValue(content); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); -// if (exportDto.getNewcarPutTime() != null) { -// String time= sdf.format(exportDto.getNewcarPutTime()); -// row1.createCell(3).setCellValue(time); -// row1.getCell(3).setCellStyle(cellStyle); -// } -// if (exportDto.getProductPutTime() != null) { -// String time= sdf.format(exportDto.getProductPutTime()); -// row1.createCell(4).setCellValue(time); -// row1.getCell(4).setCellStyle(cellStyle); -// } -// row1.createCell(5).setCellValue(exportDto.getFunctionTerritory()); -// row1.getCell(5).setCellStyle(cellStyle); -// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); -// row1.getCell(6).setCellStyle(cellStyle); -// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); -// row1.getCell(7).setCellStyle(cellStyle); -// row1.createCell(8).setCellValue(exportDto.getTechnologyTerritory()); -// row1.getCell(8).setCellStyle(cellStyle); -// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { -// List fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); -// if (fileList != null && !fileList.isEmpty()) { -// if (countMaxFile < fileList.size()) { -// countMaxFile = fileList.size(); -// } -// countFile = 0; -// for (AttFileEO attFileEO : fileList) { -// /* 连接跳转*/ -// String releFileName = attFileEO.getOldFileName(); -// CreationHelper createHelper = workbook.getCreationHelper(); -// Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.URL); -//// String addr = new String(releFileName.getBytes(),"UTF-8"); -// hyperlink1.setAddress(releFileName); -// row1.createCell(9+countFile).setHyperlink(hyperlink1); -// row1.createCell(9+countFile).setCellValue(releFileName); -// row1.getCell(9+countFile).setCellStyle(cellStyleLink); -// countFile++; -// } -// allRelevFileList.addAll(fileList); -// } -// } - } - if (allRow > startRow) { - sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,0,0)); - sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,1,1)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,3,3)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,4,4)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,5,5)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,6,6)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,7,7)); -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,8,8)); -// if (countFile > 0) { -// for (int i=0;i<=countFile;i++) { -// sheetItems.addMergedRegion(new CellRangeAddress(startRow,allRow,9+i,9+i)); -// } -// } - } - } else { - allRow++; - HSSFRow row1 = sheetItems.createRow(allRow); - row1.createCell(0).setCellValue(exportDto.getItemsNum()); - row1.getCell(0).setCellStyle(cellStyle); - row1.createCell(1).setCellValue(exportDto.getItemsName()); - row1.getCell(1).setCellStyle(cellStyle); - row1.createCell(2).setCellValue(""); - row1.getCell(2).setCellStyle(cellStyle); -// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); -// if (exportDto.getNewcarPutTime() != null) { -// String time= sdf.format(exportDto.getNewcarPutTime()); -// row1.createCell(3).setCellValue(time); -// row1.getCell(3).setCellStyle(cellStyle); -// } -// if (exportDto.getProductPutTime() != null) { -// String time= sdf.format(exportDto.getProductPutTime()); -// row1.createCell(4).setCellValue(time); -// row1.getCell(4).setCellStyle(cellStyle); -// } -// row1.createCell(5).setCellValue(exportDto.getFunctionTerritory()); -// row1.getCell(5).setCellStyle(cellStyle); -// row1.createCell(6).setCellValue(exportDto.getApplyArctic()); -// row1.getCell(6).setCellStyle(cellStyle); -// row1.createCell(7).setCellValue(exportDto.getReferenceStand()); -// row1.getCell(7).setCellStyle(cellStyle); -// row1.createCell(8).setCellValue(exportDto.getTechnologyTerritory()); -// row1.getCell(8).setCellStyle(cellStyle); -// if (StringUtils.isNotEmpty(exportDto.getRelevanceFile())) { -// List fileList = attFileEOService.getMultiFileInfos(exportDto.getRelevanceFile()); -// if (fileList != null && !fileList.isEmpty()) { -// countFile = 0; -// for (AttFileEO attFileEO : fileList) { -// /* 连接跳转*/ -// String releFileName = attFileEO.getOldFileName(); -// CreationHelper createHelper = workbook.getCreationHelper(); -// Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.URL); -//// String addr = new String(releFileName.getBytes(),"UTF-8"); -// hyperlink1.setAddress(releFileName); -// row1.createCell(9+countFile).setHyperlink(hyperlink1); -// row1.createCell(9+countFile).setCellValue(releFileName); -// row1.getCell(9+countFile).setCellStyle(cellStyleLink); -// countFile++; -// } -// allRelevFileList.addAll(fileList); -// } -// } - } - } - if (countMaxFile > 1) { - for (int i=1;i> rowtableList = tableExportDto.getTableEOList(); -// HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName()); - String tableName = tableExportDto.getTableName(); - String tableHtml = tableExportDto.getTableHtCon(); - if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("") < 0) { - if (tableHtml.indexOf("") < 0) { - tableHtml = tableHtml.replaceFirst("",""); - tableHtml = tableHtml.replaceFirst("",""); - } else { - tableHtml = tableHtml.replaceFirst("",""); - tableHtml = tableHtml.replaceFirst("",""); - } - } - String cnt = "\n"; - tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt); - workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName); -// for (int r=0;r colTableList = rowtableList.get(r); -// HSSFRow tRow = sheetTable.createRow(colTableList.get(0).getRowNum()-1); -// for(int c=0;c importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file, - @RequestParam(value = "menuId", required = false) String menuId, - @RequestParam(value = "infoId", required = false) String infoId) throws Exception { - //验证文件名是否合格 - /* 截取后缀名 */ - int pos = file.getOriginalFilename().lastIndexOf("."); - String str = file.getOriginalFilename().substring(pos+1).toLowerCase(); - String filenameorg = file.getOriginalFilename().substring(0,pos); - //判断上传文件必须是zip - if (!str.equals("zip")) { - return Result.error("请上传zip文件"); - } - String path = filePath + "/modal/"+filenameorg; - File saveDirectory = new File(path); - if(!saveDirectory.isDirectory()){ - saveDirectory.mkdir(); - } - FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +"/"+ file.getOriginalFilename())); - try{ - //解压缩 - String zipEntryName = FileUnZip.unZipFiles(path +"/"+ file.getOriginalFilename(),path); - // 数据相关处理, - // 1.获取其中的Excel, - List excelfilelist = FileUnZip.readExcelFile(zipEntryName); - if(excelfilelist.size()<1){ - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("压缩包内没有上传Excel数据"); - } else if (excelfilelist.size()>1) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("压缩包内有多个Excel数据源"); - } - File excelfile = excelfilelist.get(0); - // 导入参数设置,默认即可 - ImportParams params = new ImportParams(); - try { - String fields[] = {"条款号", "条款名称","条款内容","新车型实施日期", - "在产车实施日期","关联零部件","适用车型","引用标准","备注","关联文件"}; - params.setImportFields(fields); - List result = new ArrayList<>(); - // 解析excel,并返回校验信息 - result = ExcelImportUtil.importExcel(excelfile, SarFileSplitItemsImportDto.class, params); - Long getExcelInfo = System.currentTimeMillis(); - //excel读取到的数据 - List datas = result; - if(datas!=null &&!datas.isEmpty()){ - try { - //获取全部sheet页中表格 - XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile)); - XSSFSheet sheet=null; - List getSheetTableList = new ArrayList(); - for (int i = 1; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表 - sheet = workbook.getSheetAt(i); - SplitTableInfo splitTableInfo = new SplitTableInfo(); - splitTableInfo.setTableName(sheet.getSheetName()); - String tableHtml = POIReadExcelToHtml.readExcelToHtml(workbook,i,false); - splitTableInfo.setTableHtml(tableHtml); - getSheetTableList.add(splitTableInfo); - } - int i = 0 ; - List datasUpdate = new ArrayList<>(); - //2019.05.14 当读取exceL出现空行过多时,空行数为20以上时中断读取,将数据清洗为新的list - for(SarFileSplitItemsImportDto sarStandImportDto :datas){ - if(i>20){ - break; - } - //判断此行数据是否全部为空 - if(checkObjAllFieldsIsNull(sarStandImportDto)){ - i++; - //是则不读取 - continue; - } - i = 0; - datasUpdate.add(sarStandImportDto); - } - String unzipfilepath = zipEntryName; - Result message = sarFileSplitItemsEOService.importSplitItems(datasUpdate,menuId,unzipfilepath,infoId,getSheetTableList); - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return message; - } catch (Exception e) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error(e.getMessage()); - } - }else{ - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("没有可导入的数据,请检查!"); - } - } catch (NoSuchElementException e){ - FileUnZip.deleteDir(saveDirectory); - return Result.error("没有可导入的数据,请检查!"); - } catch (Exception e) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error( "读取失败,请严格按照模板文件导入数据"); - } - } catch (Exception e) { - //删除原上传文件 - FileUnZip.deleteDir(saveDirectory); - return Result.error("读取失败,请严格按照模板文件导入数据"); - } - - } - - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java deleted file mode 100644 index 94853a7ff..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsParamsEOController.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.jero.modules.split.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; -import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; - -@RestController -@RequestMapping("/split/sarFileSplitItemsParams") -@Api(tags = "文档拆分") -public class SarFileSplitItemsParamsEOController extends JeroController { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOController.class); - - @Autowired - private ISarFileSplitItemsParamsEOService sarFileSplitItemsParamsEOService; - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|分页查询") - @GetMapping("/page") - @RequiresPermissions("lawss:sarFileSplitItemsParams:page") - public Result> page(SarFileSplitItemsParamsEOPage page) throws Exception { - List rows = sarFileSplitItemsParamsEOService.queryByPage(page); - IPage pageList = null; - pageList.setRecords(rows); - pageList.setCurrent(page.getPage()); - pageList.setSize(page.getPageSize()); - pageList.setTotal(sarFileSplitItemsParamsEOService.queryByCount(page)); - return Result.OK(pageList); - } - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|查询") - @GetMapping("") - @RequiresPermissions("lawss:sarFileSplitItemsParams:list") - public Result> list(SarFileSplitItemsParamsEOPage page) throws Exception { - return Result.OK(sarFileSplitItemsParamsEOService.queryByList(page)); - } - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|详情") - @GetMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsParams:get") - public Result find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitItemsParamsEOService.selectByPrimaryKey(id)); - } - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|新增") - @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsParams:save") - public Result create(@RequestBody SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) throws Exception { - sarFileSplitItemsParamsEOService.insertSelective(sarFileSplitItemsParamsEO); - return Result.OK(sarFileSplitItemsParamsEO); - } - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|修改") - @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) - @RequiresPermissions("lawss:sarFileSplitItemsParams:update") - public Result update(@RequestBody SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) throws Exception { - sarFileSplitItemsParamsEOService.updateByPrimaryKeySelective(sarFileSplitItemsParamsEO); - return Result.OK(sarFileSplitItemsParamsEO); - } - - @ApiOperation(value = "|SarFileSplitItemsParamsEO|删除") - @DeleteMapping("/{id}") - @RequiresPermissions("lawss:sarFileSplitItemsParams:delete") - public Result delete(@PathVariable String id) throws Exception { - sarFileSplitItemsParamsEOService.deleteByPrimaryKey(id); - logger.info("delete from SAR_FILE_SPLIT_ITEMS_PARAMS where id = {}", id); - return Result.OK(); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java index b37fed3da..b77e935e1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitItemsValEOController.java @@ -4,12 +4,11 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.split.entity.SarFileSplitItemsValEO; import com.jero.modules.split.page.SarFileSplitItemsValEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsEOService; -import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +28,6 @@ public class SarFileSplitItemsValEOController extends JeroController> list(SarFileSplitItemsValEOPage page) throws Exception { page.setOrderBy("DISPLAY_SEQ,ID"); List getList = sarFileSplitItemsValEOService.queryByList(page); @@ -119,12 +112,12 @@ public class SarFileSplitItemsValEOController extends JeroController> getSplitItemsByMenu(String menuId, String infoId) throws Exception { - List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); - return Result.OK(getList); - } +// @ApiOperation(value = "文档拆分条目信息-根据目录查询") +// @GetMapping("/getSplitItemsByMenu") +//// @RequiresPermissions("lawss:sarFileSplitItems:page") +// public Result> getSplitItemsByMenu(String menuId, String infoId) throws Exception { +// List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); +// return Result.OK(getList); +// } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index c38082c71..f01bb73d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -2,9 +2,7 @@ package com.jero.modules.split.controller; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.split.entity.DrageMenuEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; -import com.jero.modules.split.mapper.SarFileSplitItemsEOMapper; import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; @@ -16,7 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.*; +import java.util.List; @RestController @RequestMapping("/split/sarFileSplitMenu") @@ -28,9 +26,6 @@ public class SarFileSplitMenuEOController extends JeroController find(@PathVariable String id) throws Exception { - return Result.OK(sarFileSplitMenuEOService.selectByPrimaryKey(id)); - } - @ApiOperation(value = "文档拆分条款目录-新增Y") @PostMapping("/addMenu") @RequiresPermissions("split:sarFileSplitMenu:add") @@ -87,65 +76,4 @@ public class SarFileSplitMenuEOController extends JeroController judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception { - return Result.OK(sarFileSplitMenuEOService.judgequeryMenuByPid(sarMenuEO)); - } - - @ApiOperation(value = "文档拆分条款目录-复制节点包括子节点") - @PostMapping("/copyMenu") - public Result copyMenu(@RequestBody SarFileSplitMenuEO sarMenuEO) throws Exception { - int result = sarFileSplitMenuEOService.copyMenu(sarMenuEO); - return Result.OK("复制成功",sarMenuEO); - } - - @ApiOperation(value = "文档拆分条款目录-复制节点不包括子节点") - @PostMapping("/copyMenuNotChildren") - public Result copyMenuNotChildren(@RequestBody Map itemsMap) throws Exception { - int result = sarFileSplitMenuEOService.copyMenuNotChildren(itemsMap); - return Result.OK("复制成功",itemsMap); - } - - @ApiOperation(value = "文档拆分条款目录-批量复制节点不包括子节点Y") - @GetMapping("/copyMenuNotChildrenall") - public Result>> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids, - @RequestParam(value = "menuids",required = false) String menuids, - @RequestParam(value = "infoIds",required = false) String infoIds) throws Exception { - /*int result = sarFileSplitMenuEOService.copyMenuNotChildren(sarFileSplitItemsEO); - return Result.OK("0","复制成功",sarFileSplitItemsEO);*/ - String idsl[] = ids.split(","); - List idlist =new ArrayList<>(); - idlist = Arrays.asList(idsl); - - String menuidss[] = menuids.split(","); - List menuidslist =new ArrayList<>(); - menuidslist = Arrays.asList(menuidss); - - String infoIdss[] = infoIds.split(","); - List infoIdslist =new ArrayList<>(); - infoIdslist = Arrays.asList(infoIdss); - List> itemsMapList = new ArrayList<>(); - for(int i=0;i itemsMap = new HashMap<>(); - itemsMap.put("id", idlist.get(i)); - itemsMap.put("menu_id", menuidslist.get(i)); - itemsMap.put("info_id", infoIdslist.get(i)); - int result = sarFileSplitMenuEOService.copyMenuNotChildren(itemsMap); - // 同时复制目录下的条款 - itemsMap = fileSplitItemsEOService.selectByPrimaryKey(idlist.get(i)); - itemsMapList.add(itemsMap); - } - - return Result.OK("复制成功",itemsMapList); - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java deleted file mode 100644 index d95626504..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/DrageMenuEO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.jero.modules.split.entity; - -/** - * 功能:MSG_BROWSE_INFO MsgBrowseInfoEOEntity
- * 作者:code generator
- * 日期: 2018-09-03
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public class DrageMenuEO{ - - private String menuId; - private String menuParentId; - private Long menuDisplay; - private String targetMenuId; - private String targetParentId; - private Long targetMenuDisplay; - private String infoId; - private String moveType; - - public String getMenuId() { - return menuId; - } - - public void setMenuId(String menuId) { - this.menuId = menuId; - } - - public String getMenuParentId() { - return menuParentId; - } - - public void setMenuParentId(String menuParentId) { - this.menuParentId = menuParentId; - } - - - - public String getTargetMenuId() { - return targetMenuId; - } - - public void setTargetMenuId(String targetMenuId) { - this.targetMenuId = targetMenuId; - } - - public String getTargetParentId() { - return targetParentId; - } - - public void setTargetParentId(String targetParentId) { - this.targetParentId = targetParentId; - } - - public Long getMenuDisplay() { - return menuDisplay; - } - - public void setMenuDisplay(Long menuDisplay) { - this.menuDisplay = menuDisplay; - } - - public Long getTargetMenuDisplay() { - return targetMenuDisplay; - } - - public void setTargetMenuDisplay(Long targetMenuDisplay) { - this.targetMenuDisplay = targetMenuDisplay; - } - - public String getInfoId() { - return infoId; - } - - public void setInfoId(String infoId) { - this.infoId = infoId; - } - - public String getMoveType() { - return moveType; - } - - public void setMoveType(String moveType) { - this.moveType = moveType; - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java index 64a98715c..a5f2ab504 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -22,17 +22,9 @@ public class SarFileSplitItemsEO implements Serializable { private String itemsNum; private String itemsName; private String itermsConditions; -// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") -// private Date newcarPutTime; -// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") -// private Date productPutTime; private String menuId; - private String functionTerritory; -// private String applyArctic; -// private String referenceStand; - private String informationCategory; -// private String relevanceFile; - private String technologyTerritory; + private String informationCategory; // 信息类别 + private String technologyTerritory; // 技术领域 private Integer validFlag; private String creationUser; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @@ -46,10 +38,6 @@ public class SarFileSplitItemsEO implements Serializable { // 前台删除的VAL表条目内容ID private String delItemIds; private String sMenuId; - //特殊参数要求 - private List paramsList; -// private String relevanceFileAttid; -// private String issForce; List itemsCondi; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java deleted file mode 100644 index 9a56cd213..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsFileEO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.jero.modules.split.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOEntity
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsFileEO implements Serializable { - private static final long serialVersionUID = 1L; - - private String id; - private String standId; - private String resId; - private String attId; - private String useModel; - private Integer validFlag; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date creationTime; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date modifyTime; - private Long pageCount; - private List idlist = new ArrayList<>(); - private String fileOldName; -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java deleted file mode 100644 index 39685357e..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsParamsEO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jero.modules.split.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOEntity
- * 作者:code generator
- * 日期: 2020-02-04
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsParamsEO implements Serializable { - private static final long serialVersionUID = 1L; - - private String id; - private String itemId; - private String description; - private String figure; - private Integer validFlag; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date creationTime; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date modifyTime; - private String infoId; -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java deleted file mode 100644 index 85d896766..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsResEO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.jero.modules.split.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOEntity
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsResEO implements Serializable { - private static final long serialVersionUID = 1L; - - private String id; - private String standId; - private String standFileClassify; - private String fileName; - private String fileSuffix; - private Integer validFlag; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date creationTime; - @org.springframework.format.annotation.DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date modifyTime; - - private List idlist = new ArrayList<>(); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java index 0b3c266c8..ec36b56fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java @@ -64,4 +64,5 @@ public interface FileSplitItemsEOMapper extends BaseMapper int deleteByMenuIds(@Param("idList") List idList); + int insertForeach(List list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java deleted file mode 100644 index feb630cf8..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsEOMapper.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.jero.modules.split.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.split.dto.FileSplitItemsExportDto; -import com.jero.modules.split.entity.SarFileSplitItemsEO; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEODao
- * 作者:code generator
- * 日期: 2020-01-03
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface SarFileSplitItemsEOMapper extends BaseMapper { - - int insertForeach(List list); - - int deleteByIds(SarFileSplitItemsEO sarFileSplitItemsEO); - - int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); - - int deleteByMenuIds(@Param("idList") List idList); - - int deleteByItemsIdList(@Param("idList") List idList); - - List queryItemsByMenuId(@Param("menuId") String menuId); - - List queryByItemsIds(@Param("idList") List idList); - - List queryByOrdersForExport(SarFileSplitItemsEOPage page); - - List queryByList2(SarFileSplitItemsEOPage page); - - - int insert(SarFileSplitItemsEO SarFileSplitItemsEO); - - int insertSelective(SarFileSplitItemsEO SarFileSplitItemsEO); - - int updateByPrimaryKey(SarFileSplitItemsEO SarFileSplitItemsEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsEO SarFileSplitItemsEO); - - SarFileSplitItemsEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsEOPage page); - - int queryByCount(SarFileSplitItemsEOPage page); - - List queryByPage(SarFileSplitItemsEOPage page); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java deleted file mode 100644 index b823f1eb4..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsFileEOMapper.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.jero.modules.split.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.split.entity.SarFileSplitItemsFileEO; -import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEODao
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface SarFileSplitItemsFileEOMapper extends BaseMapper { - - List selectFileByItemsIdAndId(SarFileSplitItemsFileEO sarStandFileEO); - - List selectFileMsgByAttId(String attId); - - List selectFileByAttId(String attId); - - int deleteByItemIds(@Param("idList") List idList); - - - int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - SarFileSplitItemsFileEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsFileEOPage page); - - int queryByCount(SarFileSplitItemsFileEOPage page); - - List queryByPage(SarFileSplitItemsFileEOPage page); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java deleted file mode 100644 index 38d7a5690..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsParamsMapper.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.jero.modules.split.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; -import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEODao
- * 作者:code generator
- * 日期: 2020-02-04
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface SarFileSplitItemsParamsMapper extends BaseMapper { - - int deleteByItemIds(@Param("idList") List idList); - - int deleteByInfoIds(@Param("idList") List idList); - - int insertForeach(List list); - - List queryItemsParamsByMenuId(@Param("idList") List idList); - - - int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - SarFileSplitItemsParamsEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsParamsEOPage page); - - int queryByCount(SarFileSplitItemsParamsEOPage page); - - List queryByPage(SarFileSplitItemsParamsEOPage page); - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java deleted file mode 100644 index 36433b9c9..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsResEOMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.jero.modules.split.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.split.entity.SarFileSplitItemsResEO; -import com.jero.modules.split.page.SarFileSplitItemsResEOPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEODao
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface SarFileSplitItemsResEOMapper extends BaseMapper { - - List selectByItemsIdAndId(SarFileSplitItemsResEO stand); - - int deleteByItemIds(@Param("idList") List idList); - - int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - SarFileSplitItemsResEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsResEOPage page); - - int queryByCount(SarFileSplitItemsResEOPage page); - - List queryByPage(SarFileSplitItemsResEOPage page); - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java deleted file mode 100644 index 88ef871ff..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsTableEOMapper.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.jero.modules.split.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEODao
- * 作者:code generator
- * 日期: 2020-01-17
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface SarFileSplitItemsTableEOMapper extends BaseMapper { - - int insertForeach(List list); - - List queryByRowNum(SarFileSplitItemsTableEOPage page); - - int deleteByitemValIds(@Param("idList") List idList); - - int deleteTableByMenuIds(@Param("idList") List idList); - - int deleteByitemIds(@Param("idList") List idList); - - List queryItemsTableByMenuId(@Param("idList") List idList); - - - int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - SarFileSplitItemsTableEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsTableEOPage page); - - int queryByCount(SarFileSplitItemsTableEOPage page); - - List queryByPage(SarFileSplitItemsTableEOPage page); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index 3f680fa11..f7a7a8ec6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -99,4 +99,23 @@ + + + + insert into sar_file_split_items + (id, info_id, items_num, items_name, menu_id, + creation_user, creation_time, modify_time, + modify_user, iterms_conditions) + values + ( + #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, + #{item.itemsName, jdbcType=VARCHAR}, + #{item.menuId, jdbcType=VARCHAR}, + #{item.creationUser, jdbcType=VARCHAR}, + #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, + #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} + ) + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml deleted file mode 100644 index 91cb84d42..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsEOMapper.xml +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sar_file_split_items_0329.id, sar_file_split_items_0329.info_id, sar_file_split_items_0329.items_num, items_name, iterms_conditions, newcar_put_time, product_put_time, menu_id, function_territory, apply_arctic, reference_stand, information_category, relevance_file, sar_file_split_items_0329.technology_territory, sar_file_split_items_0329.valid_flag, sar_file_split_items_0329.creation_user, sar_file_split_items_0329.creation_time, sar_file_split_items_0329.modify_time, sar_file_split_items_0329.modify_user,sar_file_split_items_0329.iss_force - - - - - where 1=1 - - - and sar_file_split_items_0329.id ${idOperator} #{id} - - - and sar_file_split_items_0329.info_id ${infoIdOperator} #{infoId} - - - and sar_file_split_items_0329.items_num ${itemsNumOperator} #{itemsNum} - - - and sar_file_split_items_0329.items_name ${itemsNameOperator} #{itemsName} - - - and sar_file_split_items_0329.iterms_conditions ${itermsConditionsOperator} #{itermsConditions} - - - and sar_file_split_items_0329.newcar_put_time ${newcarPutTimeOperator} #{newcarPutTime} - - - and sar_file_split_items_0329.newcar_put_time >= #{newcarPutTime1} - - - and sar_file_split_items_0329.newcar_put_time <= #{newcarPutTime2} - - - and sar_file_split_items_0329.product_put_time ${productPutTimeOperator} #{productPutTime} - - - and sar_file_split_items_0329.product_put_time >= #{productPutTime1} - - - and sar_file_split_items_0329.product_put_time <= #{productPutTime2} - - - and menu_id = #{sMenuId} - - - and function_territory ${functionTerritoryOperator} #{functionTerritory} - - - and apply_arctic ${applyArcticOperator} #{applyArctic} - - - and reference_stand ${referenceStandOperator} #{referenceStand} - - - and information_category ${informationCategoryOperator} #{informationCategory} - - - and relevance_file ${relevanceFileOperator} #{relevanceFile} - - - and sar_file_split_items_0329.technology_territory ${technologyTerritoryOperator} #{technologyTerritory} - - - and sar_file_split_items_0329.valid_flag ${validFlagOperator} #{validFlag} - - - and sar_file_split_items_0329.creation_user ${creationUserOperator} #{creationUser} - - - and sar_file_split_items_0329.creation_time ${creationTimeOperator} #{creationTime} - - - and sar_file_split_items_0329.creation_time >= #{creationTime1} - - - and sar_file_split_items_0329.creation_time <= #{creationTime2} - - - and sar_file_split_items_0329.modify_time ${modifyTimeOperator} #{modifyTime} - - - and sar_file_split_items_0329.modify_time >= #{modifyTime1} - - - and sar_file_split_items_0329.modify_time <= #{modifyTime2} - - - and sar_file_split_items_0329.modify_user ${modifyUserOperator} #{modifyUser} - - - - - - - - insert into sar_file_split_items_0329() - values (#{id, jdbcType=VARCHAR}, #{infoId, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itermsConditions, jdbcType=CLOB}, #{newcarPutTime, jdbcType=TIMESTAMP}, #{productPutTime, jdbcType=TIMESTAMP}, #{menuId, jdbcType=VARCHAR}, #{functionTerritory, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{referenceStand, jdbcType=VARCHAR}, #{informationCategory, jdbcType=VARCHAR}, #{relevanceFile, jdbcType=VARCHAR}, #{technologyTerritory, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) - - - - - - insert into sar_file_split_items_0329 - - id, - info_id, - items_num, - items_name, - iterms_conditions, - newcar_put_time, - product_put_time, - menu_id, - function_territory, - apply_arctic, - reference_stand, - information_category, - relevance_file, - technology_territory, - valid_flag, - creation_user, - creation_time, - modify_time, - modify_user, - iss_force, - - - #{id, jdbcType=VARCHAR}, - #{infoId, jdbcType=VARCHAR}, - #{itemsNum, jdbcType=VARCHAR}, - #{itemsName, jdbcType=VARCHAR}, - #{itermsConditions, jdbcType=CLOB}, - #{newcarPutTime, jdbcType=TIMESTAMP}, - #{productPutTime, jdbcType=TIMESTAMP}, - #{menuId, jdbcType=VARCHAR}, - #{functionTerritory, jdbcType=VARCHAR}, - #{applyArctic, jdbcType=VARCHAR}, - #{referenceStand, jdbcType=VARCHAR}, - #{informationCategory, jdbcType=VARCHAR}, - #{relevanceFile, jdbcType=VARCHAR}, - #{technologyTerritory, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{creationUser, jdbcType=VARCHAR}, - #{creationTime, jdbcType=TIMESTAMP}, - #{modifyTime, jdbcType=TIMESTAMP}, - #{modifyUser, jdbcType=VARCHAR}, - #{issForce, jdbcType=INTEGER}, - - - - - - update sar_file_split_items_0329 - set info_id = #{infoId}, - items_num = #{itemsNum}, - items_name = #{itemsName}, - iterms_conditions = #{itermsConditions}, - newcar_put_time = #{newcarPutTime}, - product_put_time = #{productPutTime}, - menu_id = #{menuId}, - function_territory = #{functionTerritory}, - apply_arctic = #{applyArctic}, - reference_stand = #{referenceStand}, - information_category = #{informationCategory}, - relevance_file = #{relevanceFile}, - technology_territory = #{technologyTerritory}, - valid_flag = #{validFlag}, - creation_user = #{creationUser}, - creation_time = #{creationTime}, - modify_time = #{modifyTime}, - modify_user = #{modifyUser} - where id = #{id} - - - - - update sar_file_split_items_0329 - - - info_id = #{infoId}, - - - items_num = #{itemsNum}, - - - items_name = #{itemsName}, - - - iterms_conditions = #{itermsConditions}, - - - newcar_put_time = #{newcarPutTime}, - - - newcar_put_time = null, - - - product_put_time = #{productPutTime}, - - - product_put_time = null, - - - menu_id = #{menuId}, - - - function_territory = #{functionTerritory}, - - - apply_arctic = #{applyArctic}, - - - reference_stand = #{referenceStand}, - - - information_category = #{informationCategory}, - - - relevance_file = #{relevanceFile}, - - - technology_territory = #{technologyTerritory}, - - - valid_flag = #{validFlag}, - - - creation_user = #{creationUser}, - - - creation_time = #{creationTime}, - - - modify_time = #{modifyTime}, - - - modify_user = #{modifyUser}, - - - iss_force = #{issForce}, - - - where id = #{id} - - - - - - - - delete from sar_file_split_items_0329 - where id = #{value} - - - - - - - - - - - - - - - - - - insert into sar_file_split_items - (id, info_id, items_num, items_name, menu_id, function_territory, - information_category, technology_territory, - creation_user, creation_time, modify_time, - modify_user, iterms_conditions) - values - ( - #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, - #{item.itemsName, jdbcType=VARCHAR}, - #{item.menuId, jdbcType=VARCHAR}, #{item.functionTerritory, jdbcType=VARCHAR}, - #{item.informationCategory, jdbcType=VARCHAR}, #{item.technologyTerritory, jdbcType=VARCHAR}, - #{item.creationUser, jdbcType=VARCHAR}, - #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, - #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB} - ) - - - - - delete from sar_file_split_items_0329 - where info_id in - - #{item} - - - - - delete from sar_file_split_items_0329 - where id in - - #{item} - - - - - delete from sar_file_split_items_0329 - where menu_id in - - #{item} - - - - - - - - - - delete from sar_file_split_items_0329 - where id in - - #{item} - - - - - - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml deleted file mode 100644 index 85db52caa..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsFileEOMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - id, stand_id, res_id, att_id, use_model, valid_flag, creation_time, modify_time, page_count - - - - - where 1=1 - - - and id ${idOperator} #{id} - - - and stand_id ${standIdOperator} #{standId} - - - and res_id ${resIdOperator} #{resId} - - - and att_id ${attIdOperator} #{attId} - - - and use_model ${useModelOperator} #{useModel} - - - and valid_flag ${validFlagOperator} #{validFlag} - - - and creation_time ${creationTimeOperator} #{creationTime} - - - and creation_time >= #{creationTime1} - - - and creation_time <= #{creationTime2} - - - and modify_time ${modifyTimeOperator} #{modifyTime} - - - and modify_time >= #{modifyTime1} - - - and modify_time <= #{modifyTime2} - - - and page_count ${pageCountOperator} #{pageCount} - - - - - - - - insert into SAR_FILE_SPLIT_ITEMS_FILE() - values (#{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{resId, jdbcType=VARCHAR}, #{attId, jdbcType=VARCHAR}, #{useModel, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{pageCount, jdbcType=VARCHAR}) - - - - - - insert into SAR_FILE_SPLIT_ITEMS_FILE - - id, - stand_id, - res_id, - att_id, - use_model, - valid_flag, - creation_time, - modify_time, - page_count, - - - #{id, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{resId, jdbcType=VARCHAR}, - #{attId, jdbcType=VARCHAR}, - #{useModel, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{creationTime, jdbcType=TIMESTAMP}, - #{modifyTime, jdbcType=TIMESTAMP}, - #{pageCount, jdbcType=VARCHAR}, - - - - - - update SAR_FILE_SPLIT_ITEMS_FILE - set stand_id = #{standId}, - res_id = #{resId}, - att_id = #{attId}, - use_model = #{useModel}, - valid_flag = #{validFlag}, - creation_time = #{creationTime}, - modify_time = #{modifyTime}, - page_count = #{pageCount} - where id = #{id} - - - - - update SAR_FILE_SPLIT_ITEMS_FILE - - - stand_id = #{standId}, - - - res_id = #{resId}, - - - att_id = #{attId}, - - - use_model = #{useModel}, - - - valid_flag = #{validFlag}, - - - creation_time = #{creationTime}, - - - modify_time = #{modifyTime}, - - - page_count = #{pageCount}, - - - where id = #{id} - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_FILE - where id = #{value} - - - - - - - - - - - - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_FILE - where stand_id in - - #{item} - - - - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml deleted file mode 100644 index ed7e0af27..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsParamsMapper.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - id, item_id, description, figure, valid_flag, creation_time, modify_time, info_id - - - - - where 1=1 - - - and id ${idOperator} #{id} - - - and item_id ${itemIdOperator} #{itemId} - - - and description ${descriptionOperator} #{description} - - - and figure ${figureOperator} #{figure} - - - and valid_flag ${validFlagOperator} #{validFlag} - - - and creation_time ${creationTimeOperator} #{creationTime} - - - and creation_time >= #{creationTime1} - - - and creation_time <= #{creationTime2} - - - and modify_time ${modifyTimeOperator} #{modifyTime} - - - and modify_time >= #{modifyTime1} - - - and modify_time <= #{modifyTime2} - - - and info_id ${infoIdOperator} #{infoId} - - - - - - - - insert into SAR_FILE_SPLIT_ITEMS_PARAMS() - values (#{id, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{figure, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{infoId, jdbcType=VARCHAR}) - - - - - - insert into SAR_FILE_SPLIT_ITEMS_PARAMS - - id, - item_id, - description, - figure, - valid_flag, - creation_time, - modify_time, - info_id, - - - #{id, jdbcType=VARCHAR}, - #{itemId, jdbcType=VARCHAR}, - #{description, jdbcType=VARCHAR}, - #{figure, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{creationTime, jdbcType=TIMESTAMP}, - #{modifyTime, jdbcType=TIMESTAMP}, - #{infoId, jdbcType=VARCHAR}, - - - - - - update SAR_FILE_SPLIT_ITEMS_PARAMS - set item_id = #{itemId}, - description = #{description}, - figure = #{figure}, - valid_flag = #{validFlag}, - creation_time = #{creationTime}, - modify_time = #{modifyTime}, - info_id = #{infoId} - where id = #{id} - - - - - update SAR_FILE_SPLIT_ITEMS_PARAMS - - - item_id = #{itemId}, - - - description = #{description}, - - - figure = #{figure}, - - - valid_flag = #{validFlag}, - - - creation_time = #{creationTime}, - - - modify_time = #{modifyTime}, - - - info_id = #{infoId}, - - - where id = #{id} - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_PARAMS - where id = #{value} - - - - - - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_PARAMS - where item_id in - - #{item} - - - - - begin - - insert into SAR_FILE_SPLIT_ITEMS_PARAMS() - values (#{item.id, jdbcType=VARCHAR}, #{item.itemId, jdbcType=VARCHAR}, #{item.description, jdbcType=VARCHAR}, #{item.figure, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.infoId, jdbcType=VARCHAR}) - - ;end; - - - - delete from SAR_FILE_SPLIT_ITEMS_PARAMS - where info_id in - - #{item} - - - - - - - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml deleted file mode 100644 index 6ba71e597..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsResEOMapper.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - id, stand_id, stand_file_classify, file_name, file_suffix, valid_flag, creation_time, modify_time - - - - - where 1=1 - - - and id ${idOperator} #{id} - - - and stand_id ${standIdOperator} #{standId} - - - and stand_file_classify ${standFileClassifyOperator} #{standFileClassify} - - - and file_name ${fileNameOperator} #{fileName} - - - and file_suffix ${fileSuffixOperator} #{fileSuffix} - - - and valid_flag ${validFlagOperator} #{validFlag} - - - and creation_time ${creationTimeOperator} #{creationTime} - - - and creation_time >= #{creationTime1} - - - and creation_time <= #{creationTime2} - - - and modify_time ${modifyTimeOperator} #{modifyTime} - - - and modify_time >= #{modifyTime1} - - - and modify_time <= #{modifyTime2} - - - - - - - - insert into SAR_FILE_SPLIT_ITEMS_RES() - values (#{id, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{standFileClassify, jdbcType=VARCHAR}, #{fileName, jdbcType=VARCHAR}, #{fileSuffix, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}) - - - - - - insert into SAR_FILE_SPLIT_ITEMS_RES - - id, - stand_id, - stand_file_classify, - file_name, - file_suffix, - valid_flag, - creation_time, - modify_time, - - - #{id, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{standFileClassify, jdbcType=VARCHAR}, - #{fileName, jdbcType=VARCHAR}, - #{fileSuffix, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{creationTime, jdbcType=TIMESTAMP}, - #{modifyTime, jdbcType=TIMESTAMP}, - - - - - - update SAR_FILE_SPLIT_ITEMS_RES - set stand_id = #{standId}, - stand_file_classify = #{standFileClassify}, - file_name = #{fileName}, - file_suffix = #{fileSuffix}, - valid_flag = #{validFlag}, - creation_time = #{creationTime}, - modify_time = #{modifyTime} - where id = #{id} - - - - - update SAR_FILE_SPLIT_ITEMS_RES - - - stand_id = #{standId}, - - - stand_file_classify = #{standFileClassify}, - - - file_name = #{fileName}, - - - file_suffix = #{fileSuffix}, - - - valid_flag = #{validFlag}, - - - creation_time = #{creationTime}, - - - modify_time = #{modifyTime}, - - - where id = #{id} - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_RES - where id = #{value} - - - - - - - - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_RES - where stand_id in - - #{item} - - - - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml deleted file mode 100644 index 6c4248727..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsTableEOMapper.xml +++ /dev/null @@ -1,260 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, items_val_id, items_id, row_num, col_num, content, valid_flag, creation_time, modify_time, modify_user - - - - - where 1=1 - - - and id ${idOperator} #{id} - - - and items_val_id ${itemsValIdOperator} #{itemsValId} - - - and items_id ${itemsIdOperator} #{itemsId} - - - and row_num ${rowNumOperator} #{rowNum} - - - and col_num ${colNumOperator} #{colNum} - - - and content ${contentOperator} #{content} - - - and valid_flag ${validFlagOperator} #{validFlag} - - - and creation_time ${creationTimeOperator} #{creationTime} - - - and creation_time >= #{creationTime1} - - - and creation_time <= #{creationTime2} - - - and modify_time ${modifyTimeOperator} #{modifyTime} - - - and modify_time >= #{modifyTime1} - - - and modify_time <= #{modifyTime2} - - - and modify_user ${modifyUserOperator} #{modifyUser} - - - - - - - - insert into SAR_FILE_SPLIT_ITEMS_TABLE() - values (#{id, jdbcType=VARCHAR}, #{itemsValId, jdbcType=VARCHAR}, #{itemsId, jdbcType=VARCHAR}, #{rowNum, jdbcType=INTEGER}, #{colNum, jdbcType=INTEGER}, #{content, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}) - - - - - - insert into SAR_FILE_SPLIT_ITEMS_TABLE - - id, - items_val_id, - items_id, - row_num, - col_num, - content, - valid_flag, - creation_time, - modify_time, - modify_user, - - - #{id, jdbcType=VARCHAR}, - #{itemsValId, jdbcType=VARCHAR}, - #{itemsId, jdbcType=VARCHAR}, - #{rowNum, jdbcType=INTEGER}, - #{colNum, jdbcType=INTEGER}, - #{content, jdbcType=VARCHAR}, - #{validFlag, jdbcType=INTEGER}, - #{creationTime, jdbcType=TIMESTAMP}, - #{modifyTime, jdbcType=TIMESTAMP}, - #{modifyUser, jdbcType=VARCHAR}, - - - - - - update SAR_FILE_SPLIT_ITEMS_TABLE - set items_val_id = #{itemsValId}, - items_id = #{itemsId}, - row_num = #{rowNum}, - col_num = #{colNum}, - content = #{content}, - valid_flag = #{validFlag}, - creation_time = #{creationTime}, - modify_time = #{modifyTime}, - modify_user = #{modifyUser} - where id = #{id} - - - - - update SAR_FILE_SPLIT_ITEMS_TABLE - - - items_val_id = #{itemsValId}, - - - items_id = #{itemsId}, - - - row_num = #{rowNum}, - - - col_num = #{colNum}, - - - content = #{content}, - - - valid_flag = #{validFlag}, - - - creation_time = #{creationTime}, - - - modify_time = #{modifyTime}, - - - modify_user = #{modifyUser}, - - - where id = #{id} - - - - - - - - delete from SAR_FILE_SPLIT_ITEMS_TABLE - where id = #{value} - - - - - - - - - - - - - begin - - insert into SAR_FILE_SPLIT_ITEMS_TABLE() - values (#{item.id, jdbcType=VARCHAR}, #{item.itemsValId, jdbcType=VARCHAR}, - #{item.itemsId, jdbcType=VARCHAR}, #{item.rowNum, jdbcType=INTEGER}, #{item.colNum, jdbcType=INTEGER}, - #{item.content, jdbcType=VARCHAR}, #{item.validFlag, jdbcType=INTEGER}, #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP}, #{item.modifyUser, jdbcType=VARCHAR}) - - ;end; - - - - - - delete from SAR_FILE_SPLIT_ITEMS_TABLE - where ITEMS_VAL_ID in - - #{item} - - - - - delete from SAR_FILE_SPLIT_ITEMS_TABLE - where EXISTS ( - select 1 from SAR_FILE_SPLIT_ITEMS - where SAR_FILE_SPLIT_ITEMS_TABLE.ITEMS_ID=SAR_FILE_SPLIT_ITEMS.id - and SAR_FILE_SPLIT_ITEMS.MENU_ID in - - #{item} - - ) - - - - delete from SAR_FILE_SPLIT_ITEMS_TABLE - where ITEMS_ID in - - #{item} - - - - - - - diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java deleted file mode 100644 index f49260aff..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsFileEOPage.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.modules.split.page; - -import com.jero.modules.split.common.BasePage; -import lombok.Data; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOPage
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsFileEOPage extends BasePage { - - private String id; - private String idOperator = "="; - private String standId; - private String standIdOperator = "="; - private String resId; - private String resIdOperator = "="; - private String attId; - private String attIdOperator = "="; - private String useModel; - private String useModelOperator = "="; - private String validFlag; - private String validFlagOperator = "="; - private String creationTime; - private String creationTime1; - private String creationTime2; - private String creationTimeOperator = "="; - private String modifyTime; - private String modifyTime1; - private String modifyTime2; - private String modifyTimeOperator = "="; - private String pageCount; - private String pageCountOperator = "="; -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java deleted file mode 100644 index 46c3e6d3c..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsParamsEOPage.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jero.modules.split.page; - -import com.jero.modules.split.common.BasePage; -import lombok.Data; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOPage
- * 作者:code generator
- * 日期: 2020-02-04
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsParamsEOPage extends BasePage { - - private String id; - private String idOperator = "="; - private String itemId; - private String itemIdOperator = "="; - private String description; - private String descriptionOperator = "="; - private String figure; - private String figureOperator = "="; - private String validFlag; - private String validFlagOperator = "="; - private String creationTime; - private String creationTime1; - private String creationTime2; - private String creationTimeOperator = "="; - private String modifyTime; - private String modifyTime1; - private String modifyTime2; - private String modifyTimeOperator = "="; - private String infoId; - private String infoIdOperator = "="; -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java deleted file mode 100644 index aba5809e3..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsResEOPage.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jero.modules.split.page; - -import com.jero.modules.split.common.BasePage; -import lombok.Data; - -/** - * 功能:SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOPage
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Data -public class SarFileSplitItemsResEOPage extends BasePage { - - private String id; - private String idOperator = "="; - private String standId; - private String standIdOperator = "="; - private String standFileClassify; - private String standFileClassifyOperator = "="; - private String fileName; - private String fileNameOperator = "="; - private String fileSuffix; - private String fileSuffixOperator = "="; - private String validFlag; - private String validFlagOperator = "="; - private String creationTime; - private String creationTime1; - private String creationTime2; - private String creationTimeOperator = "="; - private String modifyTime; - private String modifyTime1; - private String modifyTime2; - private String modifyTimeOperator = "="; - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index 9e48744dc..70dee7290 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -79,4 +79,6 @@ public interface IFileSplitItemsEOService extends IService int deleteByMenuIds(List idList); String getFieldForExport(); + + int insertForeach(List messageList); // 拆分已入库文件专用 } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java deleted file mode 100644 index 06ed7c50f..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsEOService.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.jero.modules.split.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.common.api.vo.Result; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.split.common.SplitTableInfo; -import com.jero.modules.split.dto.*; -import com.jero.modules.split.entity.SarFileSplitItemsEO; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; -import com.jero.modules.split.entity.SarFileSplitItemsValEO; -import com.jero.modules.split.entity.SarFileSplitMenuTreeNode; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOService
- * 作者:code generator
- * 日期: 2020-01-03
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface ISarFileSplitItemsEOService extends IService { - - int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO); - - int addItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; - - int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; - - int updateItemContentAfterBathDel(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; - - Map moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception ; - -// void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception; - - - int insert(SarFileSplitItemsEO SarFileSplitItemsEO); - - int insertSelective(SarFileSplitItemsEO SarFileSplitItemsEO); - - int updateByPrimaryKey(SarFileSplitItemsEO SarFileSplitItemsEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsEO SarFileSplitItemsEO); - - SarFileSplitItemsEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsEOPage page); - - int queryByCount(SarFileSplitItemsEOPage page); - - List queryByPage(SarFileSplitItemsEOPage page); - -// public String insertSarStandFile(String standId, List list, String standFileClassify,String newFiles) throws Exception ; - -// public Map> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO); - -// public String getNotDelFile(String fileAttIds,List getNotDeleteResId,List getNotDeleteFileId); - - public String insertItemTable(List getValList,String itemId); - - /** - * @Author yangxuenan - * @Description 添加特殊参数要求内容 - * Date 2020/2/4 15:56 - * @Param [sarFileSplitItemsEO] - * @return void - **/ - public void addParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO); - - /** - * @Author yangxuenan - * @Description 修改特殊参数要求内容 - * Date 2020/2/4 15:56 - * @Param [sarFileSplitItemsEO] - * @return void - **/ - public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO); - - public List queryByItemsIds(List idList); - - public int batchDeleteItems(String ids); - - public Map judgeContaintChilds(String ids) throws Exception ; - - public List queryByOrdersForExport(SarFileSplitItemsEOPage page); - - public List combineItemValInfo(List getValList, List allTableList, List allImgList, SarFileSplitItemsEOPage page) throws Exception; - - public List> combineTableList(SarFileSplitItemsValEO itemsValEO) throws Exception; - - public void downLoadImgList(List allImgList,String fileNowPath) throws IOException ; - - public void downLoadFileList(List allRelevFileList, String fileNowPath) throws IOException ; - - public void copyFile1(String srcPath, String destPath) throws IOException ; - - public List queryByList2(SarFileSplitItemsEOPage page); - - public Result importSplitItems(List list, String menuId, String filepath, String infoId, List getSheetTableList); - - public List buildTree(List addItemsEOList, Long treeListDisplay, String menuId); - - public Map validateImportDatas(List datas, String filepath) throws Exception ; - - public void createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String menuId,String infoId); - - - int insertForeach(List messageList); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java deleted file mode 100644 index b84f1c4a0..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsFileEOService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.jero.modules.split.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.split.entity.SarFileSplitItemsFileEO; -import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOService
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface ISarFileSplitItemsFileEOService extends IService { - List selectFileByAttId(String attId); - - int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO); - - SarFileSplitItemsFileEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsFileEOPage page); - - int queryByCount(SarFileSplitItemsFileEOPage page); - - List queryByPage(SarFileSplitItemsFileEOPage page); - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java deleted file mode 100644 index 8329495ab..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsParamsEOService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.split.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; -import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOService
- * 作者:code generator
- * 日期: 2020-02-04
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface ISarFileSplitItemsParamsEOService extends IService { - int deleteByItemIds(List idList); - - int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO); - - SarFileSplitItemsParamsEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsParamsEOPage page); - - int queryByCount(SarFileSplitItemsParamsEOPage page); - - List queryByPage(SarFileSplitItemsParamsEOPage page); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java deleted file mode 100644 index 3c863c1bb..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsResEOService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.modules.split.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.split.entity.SarFileSplitItemsResEO; -import com.jero.modules.split.page.SarFileSplitItemsResEOPage; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOService
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -public interface ISarFileSplitItemsResEOService extends IService { - - int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO); - - SarFileSplitItemsResEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsResEOPage page); - - int queryByCount(SarFileSplitItemsResEOPage page); - - List queryByPage(SarFileSplitItemsResEOPage page); -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java deleted file mode 100644 index 23118f7d4..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsTableEOService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jero.modules.split.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOService
- * 作者:code generator
- * 日期: 2020-01-17
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsTableEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public interface ISarFileSplitItemsTableEOService extends IService { - - List queryByRowNum(SarFileSplitItemsTableEOPage page); - - int deleteByitemIds(List idList); - - - int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO); - - SarFileSplitItemsTableEO selectByPrimaryKey(String value); - - int deleteByPrimaryKey(String value); - - List queryByList(SarFileSplitItemsTableEOPage page); - - int queryByCount(SarFileSplitItemsTableEOPage page); - - List queryByPage(SarFileSplitItemsTableEOPage page); - - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java index 00690914c..09fce81bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitItemsValEOService.java @@ -17,11 +17,6 @@ import java.util.List; */ public interface ISarFileSplitItemsValEOService extends IService { - int deleteValByitemIds(List idList); - - List getSplitItemsByMenu(String menuId,String infoId); - - int insert(SarFileSplitItemsValEO sarFileSplitItemsValEO); int insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java index 899d1c3e5..fac750ad5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitMenuEOService.java @@ -1,13 +1,10 @@ package com.jero.modules.split.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.split.entity.DrageMenuEO; -import com.jero.modules.split.entity.SarFileSplitItemsEO; import com.jero.modules.split.entity.SarFileSplitMenuEO; import com.jero.modules.split.page.SarFileSplitMenuEOPage; import java.util.List; -import java.util.Map; /** @@ -20,24 +17,13 @@ import java.util.Map; */ public interface ISarFileSplitMenuEOService extends IService { - int dragMenu(DrageMenuEO drageMenuEO); // 通过ID查询该结点及结点下所有的节点排序的最大值 int getMaxDisplayByid(String menuID) ; int addMenu(SarFileSplitMenuEO sarFileSplitMenuEO); - boolean judgequeryMenuByPid(SarFileSplitMenuEO sarMenuEO) throws Exception ; - void deleteMenu(String id); - int copyMenu (SarFileSplitMenuEO sarMenuEO) ; - - int copyMenuNotChildren(Map sarFileSplitItemsEO) ; - - String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO); - - - int insert(SarFileSplitMenuEO sarFileSplitMenuEO); int insertSelective(SarFileSplitMenuEO sarFileSplitMenuEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 548df2663..48248686e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -10,7 +10,7 @@ import com.jero.modules.split.entity.*; import com.jero.modules.split.enums.SplitFilePragraTypeEnum; import com.jero.modules.split.enums.SplitFileTypeTypeEnum; import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; -import com.jero.modules.split.service.ISarFileSplitItemsEOService; +import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.split.util.FileSplitUtils; import com.jero.modules.split.util.ReadWordTable; @@ -53,7 +53,7 @@ public class FileSpiltService { @Autowired private SarFileSplitMenuEOMapper sarFileSplitMenuEOMapper; @Autowired - private ISarFileSplitItemsEOService iSarFileSplitItemsEOService; + private IFileSplitItemsEOService iSarFileSplitItemsEOService; @Autowired private ISarFileSplitItemsValEOService iSarFileSplitItemsValEOService; @Autowired diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index f807665e6..8dec28efa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -1728,29 +1728,25 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl= firstColumn && column <= lastColumn) { Row fRow = sheet.getRow(firstRow); Cell fCell = fRow.getCell(firstColumn); - return getCellValue(fCell); + if (HSSFCell.CELL_TYPE_NUMERIC == fCell.getCellType() && HSSFDateUtil.isCellDateFormatted(fCell)) { + // 获取日期类型的单元格的值 + Date d = fCell.getDateCellValue(); + // 进行格式转换 + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + String cellValue = df.format(d); + return cellValue; + } else { + return getCellValue(fCell); + } } } } @@ -2147,9 +2152,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString()); - if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ - String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); - entry.setValue(value); - } - } +// if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { +// List> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString()); +// if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ +// String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); +// entry.setValue(value); +// } +// } } } // 拼接文件名 @@ -3563,4 +3569,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl messageList) { + return dao.insertForeach(messageList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java deleted file mode 100644 index 04e9c8377..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsEOServiceImpl.java +++ /dev/null @@ -1,1470 +0,0 @@ -package com.jero.modules.split.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; -import com.jero.modules.oss.entity.OSSFile; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.modules.split.common.FileUnZip; -import com.jero.modules.split.common.SplitTableInfo; -import com.jero.modules.split.dto.*; -import com.jero.modules.split.entity.*; -import com.jero.modules.split.mapper.*; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; -import com.jero.modules.split.page.SarFileSplitItemsValEOPage; -import com.jero.modules.split.page.SarFileSplitMenuEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsEOService; -import com.jero.modules.split.service.ISarFileSplitItemsValEOService; -import com.jero.modules.split.service.ISarFileSplitMenuEOService; -import com.jero.modules.system.mapper.SysDictMapper; -import com.jero.modules.system.util.StringUtils; -import com.jero.modules.system.util.UserUtils; -import org.apache.commons.collections.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.*; -import java.util.stream.Collectors; - -import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOService
- * 作者:code generator
- * 日期: 2020-01-03
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class SarFileSplitItemsEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsEOService { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOServiceImpl.class); - - @Autowired - private SarFileSplitItemsEOMapper dao; - - @Autowired - private SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper; - - @Autowired - private SarFileSplitItemsTableEOMapper sarFileSplitItemsTableEOMapper; - - @Autowired - private SarFileSplitItemsParamsMapper sarFileSplitItemsParamsMapper; - - @Autowired - private SarFileSplitMenuEOMapper sarFileSplitMenuEOMapper; - - @Autowired - private SarFileSplitItemsResEOMapper sarFileSplitItemsResEOMapper; - - @Autowired - private SarFileSplitItemsFileEOMapper sarFileSplitItemsFileEOMapper; - - @Autowired - private IOSSFileService ossFileService; - -// @Autowired -// private CreateMQService convertMq; - -// @Autowired -// private OtConvertEODao otConvertEODao; - - @Autowired - private SysDictMapper sysDictMapper; - - @Autowired - private ISarFileSplitMenuEOService sarFileSplitMenuEOService; - - @Autowired - private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; - - @Value("${jero.path.upload}") - private String uploadFilePath; - - public int deleteByItemsIds(SarFileSplitItemsEO sarFileSplitItemsEO){ - return dao.deleteByItemsIds(sarFileSplitItemsEO); - } - - public int addItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ - List getValList = sarFileSplitItemsEO.getItemValEOList(); - String itemConditions = ""; - String userId = UserUtils.getUserId(); - String itemId = UUID.randomUUID().toString().replace("-", ""); - sarFileSplitItemsEO.setId(itemId); - int resultCount = 0; - //添加特殊参数要求信息 - addParamsContent(sarFileSplitItemsEO); - //添加条款要求内容 - if (getValList != null && !getValList.isEmpty()) { - //向val表更新数据 - int ind = 1; - List addValList = new ArrayList<>(); - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent = "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent = ""; - valContent = valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent = valEO.getItemContent(); - } - itemConditions += valContent; - // val表信息 - valEO.setId(UUID.randomUUID().toString().replace("-", "")); - valEO.setItemId(itemId); -// valEO.setDisplaySeq(ind); - valEO.setValidFlag(0); - valEO.setCreationTime(new Date()); - valEO.setModifyTime(new Date()); - valEO.setCreationUser(userId); - valEO.setModifyUser(userId); - addValList.add(valEO); -// sarFileSplitItemsValEODao.insertSelective(valEO); - - ind++; - } - if (addValList != null && !addValList.isEmpty()) { - sarFileSplitItemsValEOMapper.insertForeach(addValList); - } - sarFileSplitItemsEO.setItermsConditions(itemConditions); -// saveFileInfo(sarFileSplitItemsEO); - } - sarFileSplitItemsEO.setCreationTime(new Date()); - sarFileSplitItemsEO.setCreationUser(userId); - sarFileSplitItemsEO.setModifyTime(new Date()); - sarFileSplitItemsEO.setModifyUser(userId); - sarFileSplitItemsEO.setValidFlag(0); - resultCount = dao.insertSelective(sarFileSplitItemsEO); - return resultCount; - } - - public int updateItemContent(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ - List getValList = sarFileSplitItemsEO.getItemValEOList(); - String itemConditions = ""; - String userId = UserUtils.getUserId(); - int resultCount = 0; - //修改特殊参数要求信息 - updateParamsContent(sarFileSplitItemsEO); - //修改条款要求内容 - if (getValList != null && !getValList.isEmpty()) { - String delIds = sarFileSplitItemsEO.getDelItemIds(); - List itemValIds = new ArrayList<>(); - //删除VAL表前台删掉的条目信息 - if (StringUtils.isNotEmpty(delIds)) { - String[] delArr = delIds.split(","); - SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); - delEO.setIdList(delArr); - if (delArr != null && delArr.length > 0) { - sarFileSplitItemsValEOMapper.deleteByIds(delEO); - //删除table表数据 - itemValIds = new ArrayList<>(Arrays.asList(delArr)); - } - } - //向val表更新数据 - int ind = 1; - List addValList = new ArrayList<>(); - List updateValList = new ArrayList<>(); - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent = "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent = ""; - valContent = valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent = valEO.getItemContent(); - } - itemConditions += valContent; - // val表信息 - if (StringUtils.isNotEmpty(valEO.getId())) { -// valEO.setDisplaySeq(ind); - valEO.setModifyTime(new Date()); - valEO.setModifyUser(userId); - updateValList.add(valEO); - itemValIds.add(valEO.getId()); -// sarFileSplitItemsValEODao.updateByPrimaryKeySelective(valEO); - } else { - valEO.setId(UUID.randomUUID().toString().replace("-", "")); -// valEO.setDisplaySeq(ind); - valEO.setValidFlag(0); - valEO.setCreationTime(new Date()); - valEO.setModifyTime(new Date()); - valEO.setCreationUser(userId); - valEO.setModifyUser(userId); - addValList.add(valEO); -// sarFileSplitItemsValEODao.insertSelective(valEO); - } - ind++; - } - if (addValList != null && !addValList.isEmpty()) { - sarFileSplitItemsValEOMapper.insertForeach(addValList); - } - if (updateValList != null && !updateValList.isEmpty()) { - sarFileSplitItemsValEOMapper.updateForeach(updateValList); - } -// sarFileSplitItemsTableEODao.deleteByitemValIds(itemValIds); - sarFileSplitItemsEO.setItermsConditions(itemConditions); -// saveFileInfo(sarFileSplitItemsEO); - resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - } else { -// SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO(); -// itemsEO.setId(sarFileSplitItemsEO.getId()); - sarFileSplitItemsEO.setItermsConditions(""); -// saveFileInfo(sarFileSplitItemsEO); - resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - // 删除val表全部信息 - sarFileSplitItemsValEOMapper.deleteByitemId(sarFileSplitItemsEO.getId()); - } - return resultCount; - } - - public int updateItemContentAfterBathDel(SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception{ - List getValList = sarFileSplitItemsEO.getItemValEOList(); - - String itemConditions = ""; - String userId = UserUtils.getUserId(); - int resultCount = 0; - //修改条款要求内容 - if (getValList != null && !getValList.isEmpty()) { - String delIds = sarFileSplitItemsEO.getDelItemIds(); - List itemValIds = new ArrayList<>(); - //删除VAL表前台删掉的条目信息 - if (StringUtils.isNotEmpty(delIds)) { - String[] delArr = delIds.split(","); - SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); - delEO.setIdList(delArr); - if (delArr != null && delArr.length > 0) { - sarFileSplitItemsValEOMapper.deleteByIds(delEO); - } - - //过滤掉要删除的条目 - for(int i=0; i delValEOs = getValList.stream().filter(e->e.getId().equals(delValEOId)).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(delValEOs)) { - getValList.removeAll(delValEOs); - } - } - } - //向val表更新数据 - int ind = 1; - List addValList = new ArrayList<>(); - List updateValList = new ArrayList<>(); - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent = "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent = ""; - valContent = valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent = valEO.getItemContent(); - } - itemConditions += valContent; - } - -// sarFileSplitItemsTableEODao.deleteByitemValIds(itemValIds); - sarFileSplitItemsEO.setItermsConditions(itemConditions); -// saveFileInfo(sarFileSplitItemsEO); - resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - } else { -// SarFileSplitItemsEO itemsEO = new SarFileSplitItemsEO(); -// itemsEO.setId(sarFileSplitItemsEO.getId()); - sarFileSplitItemsEO.setItermsConditions(""); -// saveFileInfo(sarFileSplitItemsEO); - resultCount = dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - // 删除val表全部信息 - sarFileSplitItemsValEOMapper.deleteByitemId(sarFileSplitItemsEO.getId()); - } - return resultCount; - } - - public Map moveSplitItemsVal(SarFileSplitItemsEOPage page) throws Exception { - Map resultMsgMap = new HashMap<>(); - //1. 根据targetMenuId查询要移动的目录下是否有条款 - SarFileSplitItemsEOPage targetPage = new SarFileSplitItemsEOPage(); - targetPage.setMenuId(page.getTargetMenuId()); - targetPage.setInfoId(page.getInfoId()); - targetPage.setValidFlag("0"); - targetPage.setOrderBy("SAR_FILE_SPLIT_MENU.display_seq asc"); - List targetItemsList = dao.queryByList2(targetPage); // 查询结果包含子节点下条款 - if (CollectionUtils.isEmpty(targetItemsList)) { - resultMsgMap.put("code", "1"); - resultMsgMap.put("msg", "选择的目录下没有条款"); - return resultMsgMap; - } - - List getTargetValList = page.getTargetItemValEOList(); - //2. 修改被移动条款信息 - //查询被移动条款详情 - SarFileSplitItemsEO sarFileSplitItemsEO = dao.selectByPrimaryKey(page.getId()); - if (sarFileSplitItemsEO != null) { - SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); - sarFileSplitItemsValEOPage.setItemId(page.getId()); - sarFileSplitItemsValEOPage.setOrderBy("DISPLAY_SEQ,ID"); - List getValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); - String itemConditions = ""; - //修改被移动条款要求内容 - if (getValList != null && !getValList.isEmpty()) { - //删除VAL表被移动的条目信息 - if (CollectionUtils.isNotEmpty(getTargetValList)) { - List itemValIds = getTargetValList.stream().filter(e -> StringUtils.isNotBlank(e.getId())).map(SarFileSplitItemsValEO::getId).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(itemValIds)) { - String[] delArr = StringUtils.listToString(itemValIds).split(","); - SarFileSplitItemsValEO delEO = new SarFileSplitItemsValEO(); - delEO.setIdList(delArr); - if (delArr != null && delArr.length > 0) { - sarFileSplitItemsValEOMapper.deleteByIds(delEO); - } - - //过滤掉要删除的条目 - for (int i = 0; i < delArr.length; i++) { - String delValEOId = delArr[i]; - List delValEOs = getValList.stream().filter(e -> e.getId().equals(delValEOId)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(delValEOs)) { - getValList.removeAll(delValEOs); - } - } - } - } - - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent = "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent = ""; - valContent = valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent = valEO.getItemContent(); - } - itemConditions += valContent; - } - - sarFileSplitItemsEO.setItermsConditions(itemConditions); - dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - } - } - - //3. 修改目标条款信息 - //获取目标条款详情 - SarFileSplitItemsEO targetItemsEO = targetItemsList.get(0); // 当目录下有多个条款时,默认修改第一条 - - SarFileSplitItemsValEOPage sarFileSplitItemsValEOPage = new SarFileSplitItemsValEOPage(); - sarFileSplitItemsValEOPage.setItemId(targetItemsEO.getId()); - sarFileSplitItemsValEOPage.setOrderBy("DISPLAY_SEQ,ID"); - List getValList = sarFileSplitItemsValEOService.queryByList(sarFileSplitItemsValEOPage); - String itemConditions = ""; - String userId = UserUtils.getUserId(); - int resultCount = 0; - int ind = 1; - //向指定条款的val表添加数据,添加至最后 - if(CollectionUtils.isNotEmpty(getValList)) { - ind = getValList.get(getValList.size() - 1).getDisplaySeq() + 1; - } - for (SarFileSplitItemsValEO valEO : getTargetValList) { - if(StringUtils.isBlank(valEO.getId())){ - valEO.setId(UUID.randomUUID().toString().replace("-", "")); - valEO.setItemId(targetItemsEO.getId()); - valEO.setDisplaySeq(ind); - valEO.setValidFlag(0); - valEO.setCreationTime(new Date()); - valEO.setModifyTime(new Date()); - valEO.setCreationUser(userId); - valEO.setModifyUser(userId); - }else{ - valEO.setItemId(targetItemsEO.getId()); - valEO.setDisplaySeq(ind); - valEO.setModifyTime(new Date()); - valEO.setModifyUser(userId); - } - ind++; - } - getValList.addAll(getTargetValList); - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent = "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent = ""; - valContent = valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent = valEO.getItemContent(); - } - itemConditions += valContent; - } - - sarFileSplitItemsValEOMapper.insertForeach(getTargetValList); - - targetItemsEO.setItermsConditions(itemConditions); - resultCount = dao.updateByPrimaryKeySelective(targetItemsEO); - if(resultCount > 0){ - resultMsgMap.put("code", "0"); - resultMsgMap.put("msg", "移动成功"); - return resultMsgMap; - }else{ - resultMsgMap.put("code", "1"); - resultMsgMap.put("msg", "移动失败"); - return resultMsgMap; - } - } - - -// public void saveFileInfo (SarFileSplitItemsEO sarFileSplitItemsEO) throws Exception { -// //判断文件是否是新添加的 -// Map> resultMap = getNotDeleteMsgFile(sarFileSplitItemsEO); -// List getNotDeleteResId = resultMap.get("notDelResIds"); -// List getNotDeleteFileId = resultMap.get("notDelFileIds"); -// //删除文件资源表数据 -// SarFileSplitItemsResEO sarLawsResEO = new SarFileSplitItemsResEO(); -// sarLawsResEO.setStandId(sarFileSplitItemsEO.getId()); -// if(getNotDeleteResId != null && !getNotDeleteResId.isEmpty()){ -// sarLawsResEO.setIdlist(getNotDeleteResId); -// } else { -// sarLawsResEO.setIdlist(null); -// } -// List listRes = sarFileSplitItemsResEOMapper.selectByItemsIdAndId(sarLawsResEO); -// if (listRes != null) { -// if (!listRes.isEmpty()) { -// for (int r = 0; r < listRes.size(); r++) { -// sarFileSplitItemsResEOMapper.deleteByPrimaryKey(listRes.get(r).getId()); -// } -// } -// } -// //删除文件详情表数据 -// SarFileSplitItemsFileEO sarLawsFileEO = new SarFileSplitItemsFileEO(); -// sarLawsFileEO.setStandId(sarFileSplitItemsEO.getId()); -// if(getNotDeleteFileId != null && !getNotDeleteFileId.isEmpty()){ -// sarLawsFileEO.setIdlist(getNotDeleteFileId); -// }else { -// sarLawsFileEO.setIdlist(null); -// } -// List listFile = sarFileSplitItemsFileEOMapper.selectFileByItemsIdAndId(sarLawsFileEO); -// if (listFile != null) { -// if (!listFile.isEmpty()) { -// for (int f = 0; f < listFile.size(); f++) { -// sarFileSplitItemsFileEOMapper.deleteByPrimaryKey(listFile.get(f).getId()); -// //删除文件信息表数据 -//// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); -// //删除转换表ot_convert数据 -//// otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); -// } -// } -// } -// //添加新的文件表信息 -// if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) { -// List fileList = ossFileService.getFileInfos(sarFileSplitItemsEO.getRelevanceFile()); -// String reslist = insertSarStandFile(sarFileSplitItemsEO.getId(), fileList, StandFileClassifyEnum.RELEVANCE_FILE.getValue(),sarFileSplitItemsEO.getRelevanceFileAttid()); -// } -// } - - @Override - public int insert(SarFileSplitItemsEO sarFileSplitItemsEO) { - return dao.insert(sarFileSplitItemsEO); - } - - @Override - public int insertSelective(SarFileSplitItemsEO sarFileSplitItemsEO) { - return dao.insertSelective(sarFileSplitItemsEO); - } - - @Override - public int updateByPrimaryKey(SarFileSplitItemsEO sarFileSplitItemsEO) { - return dao.updateByPrimaryKey(sarFileSplitItemsEO); - } - - @Override - public int updateByPrimaryKeySelective(SarFileSplitItemsEO sarFileSplitItemsEO) { - return dao.updateByPrimaryKeySelective(sarFileSplitItemsEO); - } - - @Override - public SarFileSplitItemsEO selectByPrimaryKey(String value) { - return dao.selectByPrimaryKey(value); - } - - @Override - public int deleteByPrimaryKey(String value) { - return dao.deleteByPrimaryKey(value); - } - - @Override - public List queryByList(SarFileSplitItemsEOPage page) { - return dao.queryByList(page); - } - - @Override - public int queryByCount(SarFileSplitItemsEOPage page) { - return dao.queryByCount(page); - } - - @Override - public List queryByPage(SarFileSplitItemsEOPage page) { - return dao.queryByPage(page); - } - -// public String insertSarStandFile(String standId, List list, String standFileClassify, String newFiles) throws Exception { -// String residlist = ""; -// String newFileArr[] = newFiles.split(","); -// List newAttList = Arrays.asList(newFileArr); -// if (list != null) { -// SarFileSplitItemsResEO sarStandResEO = new SarFileSplitItemsResEO(); -// SarFileSplitItemsFileEO sarStandFileEO = new SarFileSplitItemsFileEO(); -// for (OSSFile fileInfo : list) { -// if(newAttList != null && newAttList.contains(fileInfo.getId())){ -// //标准文件资源表存数据库 -// sarStandResEO.setStandId(standId); //标准ID -// sarStandResEO.setStandFileClassify(standFileClassify); //文件分类 -// sarStandResEO.setFileName(fileInfo.getFileName()); //文件名称@@@@@@@需要确定取name 还是 oldname -// -// String fileSuffix = fileInfo.getFileName().substring(fileInfo.getFileName().lastIndexOf(".")+1); -// sarStandResEO.setFileSuffix(fileSuffix); //文件类型 -// sarStandResEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarStandResEO.setCreationTime(new Date()); -// sarStandResEO.setModifyTime(new Date()); -// sarStandResEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); -// int i = sarFileSplitItemsResEOMapper.insertSelective(sarStandResEO); -// residlist += sarStandResEO.getId() + ","; -// //标准文件详情表存数据库 -// sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarStandFileEO.setCreationTime(new Date()); -// sarStandFileEO.setModifyTime(new Date()); -// sarStandFileEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); -// sarStandFileEO.setStandId(standId); //标准ID -// sarStandFileEO.setResId(sarStandResEO.getId()); //资源ID -// sarStandFileEO.setAttId(fileInfo.getId()); //文件ID -// sarStandFileEO.setUseModel(UseModuleEnum.SOURCE_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 -// sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); -// -// //文档转换 -// if ("pdf".equals(fileSuffix) || "PDF".equals(fileSuffix)) { -// sarStandFileEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarStandFileEO.setUseModel(UseModuleEnum.WEB_FILE.getValue()); //文件使用模式 //文件名称@@@@@@@需要修改 -// sarFileSplitItemsFileEOMapper.insertSelective(sarStandFileEO); -// } else { -// String filePath = fileInfo.getUrl(); -//// ConvertMqEO convert = new ConvertMqEO(); -//// convert.setLawsId(standId); -//// convert.setResId(sarStandResEO.getId()); -//// convert.setAttId(fileInfo.getId()); -//// convert.setFilePath(filePath); -//// convert.setAddOrUp("0"); -//// convert.setFileSuffix(fileInfo.getFileSuffix()); -//// convert.setConvertType(SarTypeEnum.SPLIT.getValue()); -//// convertMq.sendMQ(convert); -// } -// } else { -// List getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(fileInfo.getId()); -// if(getFile != null && !getFile.isEmpty()){ -// residlist += getFile.get(0).getResId() + ","; -// } -// } -// -// } -// } -// return residlist; -// } - -// public Map> getNotDeleteMsgFile(SarFileSplitItemsEO sarFileSplitItemsEO){ -// Map> resultMap = new HashMap<>(); -// List getNotDeleteResId = new ArrayList<>(); -// List getNotDeleteFileId = new ArrayList<>(); -// String newStandFile = ""; -// //向文件表添加关联文件数据 -// String newrelevanceFile = ""; -// if (StringUtils.isNotEmpty(sarFileSplitItemsEO.getRelevanceFile())) { -// newrelevanceFile = getNotDelFile(sarFileSplitItemsEO.getRelevanceFile(),getNotDeleteResId,getNotDeleteFileId); -// } -// sarFileSplitItemsEO.setRelevanceFileAttid(newrelevanceFile); -// resultMap.put("notDelResIds",getNotDeleteResId); -// resultMap.put("notDelFileIds",getNotDeleteFileId); -// return resultMap; -// } -// -// public String getNotDelFile(String fileAttIds,List getNotDeleteResId,List getNotDeleteFileId){ -// String splitFile[] = fileAttIds.split(","); -// String newFiles = ""; -// for(int i=0;i getFile = sarFileSplitItemsFileEOMapper.selectFileMsgByAttId(splitFile[i]); -// if(getFile != null && !getFile.isEmpty()){ -// for(SarFileSplitItemsFileEO sarStandFileEO : getFile){ -// getNotDeleteResId.add(sarStandFileEO.getResId()); -// getNotDeleteFileId.add(sarStandFileEO.getId()); -// } -// List getWebFile = sarFileSplitItemsFileEOMapper.selectFileByAttId(splitFile[i]); -// if(getWebFile != null && !getWebFile.isEmpty()){ -// getNotDeleteFileId.add(getWebFile.get(0).getId()); -// } -// -// } else { -// newFiles += splitFile[i] + ","; -// } -// } -// return newFiles; -// } - - public String insertItemTable(List getValList,String itemId){ - String itemContent = ""; - if (getValList != null && !getValList.isEmpty()) { - List alltableList = new ArrayList<>(); - for(SarFileSplitItemsValEO val : getValList){ - List> listShow = val.getTableListShow(); - if ("TABLE".equals(val.getType()) && listShow != null && !listShow.isEmpty()) { - for (List tableList : listShow) { - itemContent += ""; - for (SarFileSplitItemsTableEO tableEO : tableList) { - itemContent += ""; - tableEO.setId(UUID.randomUUID().toString().replace("-", "")); - tableEO.setItemsValId(val.getId()); - tableEO.setItemsId(itemId); - tableEO.setValidFlag(0); - tableEO.setCreationTime(new Date()); - tableEO.setModifyTime(new Date()); - tableEO.setModifyUser("yxn"); - alltableList.add(tableEO); - } - itemContent += ""; - } - } - } - if (alltableList != null && !alltableList.isEmpty()) { - sarFileSplitItemsTableEOMapper.insertForeach(alltableList); - } - } - itemContent += "
" + tableEO.getContent() + "
"; - return itemContent; - } - - /** - * @Author yangxuenan - * @Description 添加特殊参数要求内容 - * Date 2020/2/4 15:56 - * @Param [sarFileSplitItemsEO] - * @return void - **/ - public void addParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){ - List paramList = sarFileSplitItemsEO.getParamsList(); - if(paramList != null && !paramList.isEmpty()){ - for(SarFileSplitItemsParamsEO paramsEO : paramList){ - paramsEO.setId(UUID.randomUUID().toString().replace("-", "")); - paramsEO.setItemId(sarFileSplitItemsEO.getId()); - paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId()); - paramsEO.setValidFlag(0); - paramsEO.setCreationTime(new Date()); - paramsEO.setModifyTime(new Date()); - } - sarFileSplitItemsParamsMapper.insertForeach(paramList); - } - } - - /** - * @Author yangxuenan - * @Description 修改特殊参数要求内容 - * Date 2020/2/4 15:56 - * @Param [sarFileSplitItemsEO] - * @return void - **/ - public void updateParamsContent(SarFileSplitItemsEO sarFileSplitItemsEO){ - List itemList = new ArrayList<>(); - itemList.add(sarFileSplitItemsEO.getId()); - sarFileSplitItemsParamsMapper.deleteByItemIds(itemList); - List paramList = sarFileSplitItemsEO.getParamsList(); - if(paramList != null && !paramList.isEmpty()){ - for(SarFileSplitItemsParamsEO paramsEO : paramList){ - paramsEO.setId(UUID.randomUUID().toString().replace("-", "")); - paramsEO.setItemId(sarFileSplitItemsEO.getId()); - paramsEO.setInfoId(sarFileSplitItemsEO.getInfoId()); - paramsEO.setValidFlag(0); - paramsEO.setCreationTime(new Date()); - paramsEO.setModifyTime(new Date()); - } - sarFileSplitItemsParamsMapper.insertForeach(paramList); - } - } - - public List queryByItemsIds(List idList){ - return dao.queryByItemsIds(idList); - } - - public int batchDeleteItems(String ids){ - String[] itemIds = ids.split(","); - List idList = Arrays.asList(itemIds); - // 查到对应menu - List getMenuList = dao.queryByItemsIds(idList); - List getAllItemList = new ArrayList<>(); - List getAllMenuList = new ArrayList<>(); - List menuIdList = new ArrayList<>(); - List allItemIdList = new ArrayList<>(); - int result = 0; - if (getMenuList != null && !getMenuList.isEmpty()) { - for(SarFileSplitItemsEO splitItemsEO : getMenuList){ - menuIdList.add(splitItemsEO.getMenuId()); - SarFileSplitMenuEO menuEO = new SarFileSplitMenuEO(); - menuEO.setId(splitItemsEO.getMenuId()); - //查询当前目录的所有子目录,不包括当前目录 - List menuList = sarFileSplitMenuEOMapper.queryByPidExcpetSelf(menuEO); - getAllMenuList.addAll(menuList); - //查询子目录下的所有条款,包括当前目录 - List rows = dao.queryItemsByMenuId(splitItemsEO.getMenuId()); - getAllItemList.addAll(rows); - } - if (getAllItemList != null && !getAllItemList.isEmpty()) { - //目录下没有子节点时, - if ((getAllMenuList == null || getAllMenuList.isEmpty()) && getAllItemList.size() > 1) { - // 删除val表数据 - sarFileSplitItemsValEOMapper.deleteValByitemIds(idList); - //删除table数据 - sarFileSplitItemsTableEOMapper.deleteByitemIds(idList); - //删除特殊参数要求params表数据 - sarFileSplitItemsParamsMapper.deleteByItemIds(idList); - result = dao.deleteByItemsIdList(idList); - return result; - } - for (SarFileSplitItemsEO itemsEO : getAllItemList) { - if (allItemIdList != null && !allItemIdList.contains(itemsEO.getId())) { - allItemIdList.add(itemsEO.getId()); - } else if (allItemIdList == null || allItemIdList.size() < 1) { - allItemIdList.add(itemsEO.getId()); - } - } - if (getAllMenuList != null && !getAllMenuList.isEmpty()) { - for(SarFileSplitMenuEO sarFileSplitMenuEO : getAllMenuList){ - if(!menuIdList.contains(sarFileSplitMenuEO.getId())){ - menuIdList.add(sarFileSplitMenuEO.getId()); - } - } - } - // 删除menu表数据 - sarFileSplitMenuEOMapper.deleteByIdList(menuIdList); - // 删除val表数据 - sarFileSplitItemsValEOMapper.deleteValByitemIds(allItemIdList); - //删除table数据 - sarFileSplitItemsTableEOMapper.deleteByitemIds(allItemIdList); - //删除特殊参数要求params表数据 - sarFileSplitItemsParamsMapper.deleteByItemIds(allItemIdList); - //删除res表数据 -// sarFileSplitItemsResEODao.deleteByItemIds(allItemIdList); - //删除file表数据 -// sarFileSplitItemsFileEODao.deleteByItemIds(allItemIdList); - result = dao.deleteByItemsIdList(allItemIdList); - }else { - //要删除的条款menuId均不存在,判定为垃圾数据 - - // 删除val表数据 - sarFileSplitItemsValEOMapper.deleteValByitemIds(idList); - //删除table数据 - sarFileSplitItemsTableEOMapper.deleteByitemIds(idList); - //删除特殊参数要求params表数据 - sarFileSplitItemsParamsMapper.deleteByItemIds(idList); - result = dao.deleteByItemsIdList(idList); - } - } - return result; - } - - public Map judgeContaintChilds(String ids) throws Exception { - String[] itemIds = ids.split(","); - Map result = new HashMap<>(); - List idList = Arrays.asList(itemIds); - // 查到对应menu - List getMenuList = dao.queryByItemsIds(idList); - if (getMenuList != null && !getMenuList.isEmpty()) { - for (SarFileSplitItemsEO splitItemsEO : getMenuList) { - SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); - sarMenuEO.setId(splitItemsEO.getMenuId()); - List list = sarFileSplitMenuEOMapper.queryByPidExcpetSelf(sarMenuEO); - if(list != null && !list.isEmpty()){ -// String menuNameStr = list.stream().map(m-> m.getName() + " " + m.getItemName()).collect(Collectors.joining(";")); - String menuNameStr = list.stream().map(SarFileSplitMenuEO :: getName).collect(Collectors.joining(";")); - result.put("flag",false); - result.put("content", menuNameStr); - return result; - } - } - } - result.put("flag",true); - return result; - } - - public List queryByOrdersForExport(SarFileSplitItemsEOPage page){ - return dao.queryByOrdersForExport(page); - } - - public List combineItemValInfo(List getValList, List allTableList, List allImgList, SarFileSplitItemsEOPage page) throws Exception{ - int tableIndex = page.getTableIndex(); - int imgIndex = page.getImgIndex(); - List valContent = new ArrayList<>(); - if (getValList != null && !getValList.isEmpty()) { - String preType = ""; - for(SarFileSplitItemsValEO itemsValEO : getValList){ - String type = itemsValEO.getType(); - FileSplitValExportDto lastOne = new FileSplitValExportDto(); - lastOne.setValType(type); - if(preType.equals(type) && "TEXT".equals(type)) { - lastOne = valContent.get(valContent.size() - 1); - lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); - valContent.set(valContent.size() - 1, lastOne); - } else if ("TEXT".equals(type)) { - lastOne.setValContent(lastOne.getValContent()+itemsValEO.getItemContent() + "\n"); - valContent.add(lastOne); - } else if ("TABLE".equals(type)) { - String tableName = String.valueOf(tableIndex); - lastOne.setValContent("tableSheet" + tableName); - //查询table信息 - SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); - tablePage.setItemsValId(itemsValEO.getId()); - valContent.add(lastOne); -// List> tableList = combineTableList(itemsValEO); - FileSpiltValTableExportDto tableExportDto = new FileSpiltValTableExportDto(); - tableExportDto.setTableName("tableSheet" + tableName); -// tableExportDto.setTableEOList(tableList); - tableExportDto.setTableHtCon(itemsValEO.getItemContent()); - allTableList.add(tableExportDto); - tableIndex++; - page.setTableIndex(tableIndex); - } else if ("IMG".equals(type)) { - String imgContent = itemsValEO.getItemContent(); - String imgUUIndex = "img" + String.valueOf(imgIndex); - if (StringUtils.isNotEmpty(imgContent)){ - int pathIndex = imgContent.indexOf("src='uploadPath"); - if (pathIndex > -1 && imgContent.length()>(pathIndex+16)) { - String imgPath = imgContent.substring(pathIndex+16,imgContent.length()-2); - String imgName = imgUUIndex + "-" +imgPath.substring(imgPath.lastIndexOf("/")+1,imgPath.length()); - lastOne.setValContent(imgUUIndex+".png"); - valContent.add(lastOne); - FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto(); - fileSplitValImgExportDto.setImgName(imgUUIndex+".png"); - if (StringUtils.isNotEmpty(itemsValEO.getImgName())) { - fileSplitValImgExportDto.setImgPath(itemsValEO.getImgName()); - } else { - fileSplitValImgExportDto.setImgPath(imgPath); - } - allImgList.add(fileSplitValImgExportDto); - imgIndex++; - page.setImgIndex(imgIndex); - } - } - } - preType = itemsValEO.getType(); - } - } - return valContent; - } - - public List> combineTableList(SarFileSplitItemsValEO itemsValEO) throws Exception{ - List> tableListShow = new ArrayList<>(); - SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); - tablePage.setItemsValId(itemsValEO.getId()); - List tableList = sarFileSplitItemsTableEOMapper.queryByList(tablePage); - List tableListRow = sarFileSplitItemsTableEOMapper.queryByRowNum(tablePage); - if (tableListRow != null && !tableListRow.isEmpty()) { - for (int i=1; i <= tableListRow.size();i++) { - List rowList = new ArrayList<>(); - for (int j=0; j < tableList.size();j++) { - if (tableList.get(j).getRowNum() == i) { - rowList.add(tableList.get(j)); - } - } - tableListShow.add(rowList); - } - } - return tableListShow; - } - - public void downLoadImgList(List allImgList,String fileNowPath) throws IOException { - for(FileSplitValImgExportDto imgExportDto : allImgList){ - String oldPath = uploadFilePath+ "/" + imgExportDto.getImgPath(); - String newPath = fileNowPath + "/" + imgExportDto.getImgName(); - File oldFile = new File(oldPath); - if (oldFile.exists()){ - copyFile1(oldPath, newPath); - } - } - - } - - public void downLoadFileList(List allRelevFileList, String fileNowPath) throws IOException { - for(OSSFile fileExportDto : allRelevFileList){ - String oldPath = fileExportDto.getUrl(); - String newPath = fileNowPath + "/" + fileExportDto.getFileName(); - File oldFile = new File(oldPath); - if (oldFile.exists()){ - copyFile1(oldPath, newPath); - } - } - - } - - public void copyFile1(String srcPath, String destPath) throws IOException { - BufferedInputStream bis = new BufferedInputStream(Files.newInputStream(Paths.get(srcPath))); - BufferedOutputStream bos = - new BufferedOutputStream(Files.newOutputStream(Paths.get(destPath), - StandardOpenOption.CREATE, - StandardOpenOption.TRUNCATE_EXISTING, - StandardOpenOption.WRITE)); - // 打开输入流 -// FileInputStream fis = new FileInputStream(srcPath); - // 打开输出流 -// FileOutputStream fos = new FileOutputStream(destPath); - // 读取和写入信息 - byte[] bytes = new byte[1024 * 1024]; - int len; - while ((len = bis.read(bytes)) > 0) { - bos.write(bytes, 0, len); - } - // 关闭流 先开后关 后开先关 - bos.close(); // 后开先关 - bis.close(); // 先开后关 - - } - - public List queryByList2(SarFileSplitItemsEOPage page){ - return dao.queryByList2(page); - } - - public Result importSplitItems(List list, String menuId, String filepath, String infoId, List getSheetTableList){ - //此处需要做各种验证,数据库操作 - try { - //验证导入数据是否符合规则 - Map map = validateImportDatas(list,filepath); - boolean isOk = (boolean) map.get("result"); - if (!isOk) { - //验证没有通过 - String message = (String) map.get("message"); - return Result.error(message); - } - //将导入数据循环合并整理后 新增至相应表 - list = (List) map.get("resultList"); - int countSuccess = 0; - // 最终添加的数据 - List addItemsEOList = new ArrayList<>(); - int itemNum = 0; - for (SarFileSplitItemsImportDto importDto : list) { - //判断此行数据是否全部为空,是则不读取 - if(checkObjAllFieldsIsNull(importDto)){ - continue; - } - SarFileSplitItemsEO sarFileSplitItemsEO = new SarFileSplitItemsEO(); - BeanUtils.copyProperties(importDto, sarFileSplitItemsEO); - sarFileSplitItemsEO.setId(UUID.randomUUID().toString().replace("-", "")); - sarFileSplitItemsEO.setInfoId(infoId); - List addItemValList = new ArrayList<>(); - if (addItemsEOList != null && !addItemsEOList.isEmpty()) { - SarFileSplitItemsEO oldItems = addItemsEOList.get(addItemsEOList.size()-1); - if (itemNum > 0 && sarFileSplitItemsEO.getItemsNum().equals(oldItems.getItemsNum()) - && sarFileSplitItemsEO.getItemsName().equals(oldItems.getItemsName())) { - addItemValList = oldItems.getItemValEOList(); - String itemContent = oldItems.getItermsConditions()+sarFileSplitItemsEO.getItermsConditions(); - oldItems.setItermsConditions(itemContent); - String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); - if (valArr != null && valArr.length > 0) { - for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); - if (nowfilelist != null && !nowfilelist.isEmpty()) { - OSSFile ossFile = new OSSFile(); - ossFile.setFileName(nowfilelist.get(0).getName()); - ossFile.setUrl(nowfilelist.get(0).getPath()); - boolean insertResult = ossFileService.save(ossFile); - if(insertResult){ - isText = false; - String path = "uploadPath" + nowfilelist.get(0).getPath(); - String imgCon = ""; - valEO.setType("IMG"); - valEO.setItemContent(imgCon); - } - } - if (isText) { - valEO.setType("TEXT"); - valEO.setItemContent(valArr[i]); - } - addItemValList.add(valEO); - } - } - oldItems.setItemValEOList(addItemValList); - }else { - String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); - if (valArr != null && valArr.length > 0) { - for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); - if (nowfilelist != null && !nowfilelist.isEmpty()) { - OSSFile ossFile = new OSSFile(); - ossFile.setFileName(nowfilelist.get(0).getName()); - ossFile.setUrl(nowfilelist.get(0).getPath()); - boolean insertResult = ossFileService.save(ossFile); - if(insertResult){ - isText = false; - String path = "uploadPath" + nowfilelist.get(0).getPath(); - String imgCon = ""; - valEO.setType("IMG"); - valEO.setItemContent(imgCon); - } - } - if (isText) { - valEO.setType("TEXT"); - valEO.setItemContent(valArr[i]); - } - addItemValList.add(valEO); - } - } - sarFileSplitItemsEO.setItemValEOList(addItemValList); - addItemsEOList.add(sarFileSplitItemsEO); - } - } else { - String[] valArr = sarFileSplitItemsEO.getItermsConditions().split("\n"); - if (valArr != null && valArr.length > 0) { - for (int i=0;i nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]); - if (nowfilelist != null && !nowfilelist.isEmpty()) { - OSSFile ossFile = new OSSFile(); - ossFile.setFileName(nowfilelist.get(0).getName()); - ossFile.setUrl(nowfilelist.get(0).getPath()); - boolean insertResult = ossFileService.save(ossFile); - if(insertResult){ - isText = false; - String path = "uploadPath" + nowfilelist.get(0).getPath(); - String imgCon = ""; - valEO.setType("IMG"); - valEO.setItemContent(imgCon); - } - } - if (isText) { - valEO.setType("TEXT"); - valEO.setItemContent(valArr[i]); - } - addItemValList.add(valEO); - } - } - sarFileSplitItemsEO.setItemValEOList(addItemValList); - addItemsEOList.add(sarFileSplitItemsEO); - } - itemNum++; - } - //TODO 创建树结构 - Long treeListDisplay = 1L; - //获取导入数据一级节点级数 - int levelNum = 0; - SarFileSplitMenuEO targetMenuEO = sarFileSplitMenuEOMapper.selectByPrimaryKey(menuId); - if(targetMenuEO != null){ - //判断导入节点是否有子节点 - int childrenCount = sarFileSplitMenuEOMapper.getChildrenCountByParentId(menuId); - if(childrenCount > 1){ - //获取导入节点的下一级最后一个子节点的序号 - treeListDisplay = Long.valueOf(sarFileSplitMenuEOMapper.getMaxDisplayByidNextLevel(menuId)); - }else{ - //当导入节点没有子节点时,获取当前节点的序号 - treeListDisplay = targetMenuEO.getDisplaySeq(); - } - -// if(!"总目录".equals(targetMenuEO.getName())){ -// String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化:数字和点必须交替 -// if(!targetMenuEO.getName().matches(regex)){ -// throw new AdcDaBaseException("所选目录命名不规范"); -// } -// String[] str = targetMenuEO.getName().split("."); -// if(str.length == 0){ -// levelNum = 2; -// }else { -// levelNum = str.length + 1; -// } -// }else{ -// levelNum = 1; -// } - } - - //获取导入数据的所有一级节点 - int finalLevelNum = levelNum; - /*List itemNumList = new ArrayList<>(); - for(SarFileSplitItemsEO sarFileSplitItemsEO : addItemsEOList){ - String[] str = sarFileSplitItemsEO.getItemsNum().split("."); - if(str.length == finalLevelNum){ - itemNumList.add(sarFileSplitItemsEO); - } - }*/ - List itemNumList = addItemsEOList.stream() - .filter(e->e.getItemsNum().split("\\.").length == finalLevelNum || e.getItemsNum().contains("附录")) - .collect(Collectors.toList()); - //构造目录树 - HashMap menuAndItemMap = new HashMap<>(); -// if(CollectionUtils.isNotEmpty(itemNumList)) { - List itemsEOList = new ArrayList<>(addItemsEOList); - List treeList = buildTree(itemsEOList, treeListDisplay, menuId); - String userId = UserUtils.getUserId(); - for (SarFileSplitMenuTreeNode treeNode : treeList) { - //创建菜单 - SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); - sarFileSplitMenuEO.setId(treeNode.getId()); - sarFileSplitMenuEO.setInfoId(infoId); - sarFileSplitMenuEO.setName(treeNode.getName()); - sarFileSplitMenuEO.setItemName(treeNode.getItemName()); - sarFileSplitMenuEO.setPId(treeNode.getParentId()); - sarFileSplitMenuEO.setDisplaySeq(treeNode.getOrderNum()); - sarFileSplitMenuEO.setCreationUser(userId); - sarFileSplitMenuEO.setModifyUser(userId); - sarFileSplitMenuEO.setValidFlag(0); - sarFileSplitMenuEO.setCreationTime(new Date()); - sarFileSplitMenuEO.setModifyTime(new Date()); - sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO); - menuAndItemMap.put(treeNode.getItemId(), treeNode.getId()); - } -// }else{ -// throw new AdcDaBaseException("导入目录命名不规范"); -// } - //添加条款 - for (SarFileSplitItemsEO itemsEO : addItemsEOList) { - if(menuAndItemMap.get(itemsEO.getId()) != null) { - createItemsInfo(itemsEO, menuAndItemMap.get(itemsEO.getId()), infoId); - } - countSuccess++; - } - //导入之后的节点(包括子节点),序号加一 - SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); - page.setInfoId(targetMenuEO.getInfoId()); - page.setValidFlag("0"); - page.setOrderBy("display_seq asc"); - List getList = sarFileSplitMenuEOMapper.queryByList(page); - if (getList != null && !getList.isEmpty()) { - //除去导入节点 - for(SarFileSplitMenuEO menu : getList){ - if(menuAndItemMap.containsValue(menu.getId())){ - continue; - } - if(targetMenuEO.getId().equals(menu.getId())){ - continue; - } - Long oldSeq = menu.getDisplaySeq(); - if (oldSeq > treeListDisplay) { - menu.setDisplaySeq(oldSeq + countSuccess); - sarFileSplitMenuEOMapper.updateByPrimaryKeySelective(menu); - } - } - } - String msg = "成功导入" + countSuccess + "条"; - return Result.OK( msg,null); - } catch (Exception e) { - logger.error(e.getMessage(),e); - return Result.error("导入失败"); - } - } - - public List buildTree(List addItemsEOList, Long treeListDisplay, String menuId){ - //排序 - Collections.sort(addItemsEOList, new Comparator() { - @Override - public int compare(SarFileSplitItemsEO o1, SarFileSplitItemsEO o2) { - return o1.getItemsNum().compareTo(o2.getItemsNum()); - } - }); - - List treeNodeList = new ArrayList<>(); - String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化:数字和点必须交替 - for (SarFileSplitItemsEO itemEO : addItemsEOList) { - String itemNum = itemEO.getItemsNum(); - if(itemNum.matches(regex) || itemNum.contains("附录")) { - SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); - treeNode.setId(UUID.randomUUID().toString().replace("-", "")); - treeNode.setName(itemNum); - if(itemNum.matches(regex)) { - //父级是 总目录时,不做处理 - if(itemNum.contains(".")) { - String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); - treeNode.setParentName(parentName); - List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(p)) { - //其他节点 - treeNode.setParentId(p.get(0).getId()); - }else{ - //一级节点 - treeNode.setParentId(menuId); - } - }else{ - treeNode.setParentId(menuId); - } - }else{ - treeNode.setParentId(menuId); - } - ++treeListDisplay; - treeNode.setOrderNum(treeListDisplay); - treeNode.setItemName(itemEO.getItemsName()); - treeNode.setItemId(itemEO.getId()); - treeNodeList.add(treeNode); - } - } - //其他节点 - /*for (SarFileSplitItemsEO itemEO : addItemsEOList) { - String itemNum = itemEO.getItemsNum(); - if (itemNum.matches(regex)) { - SarFileSplitMenuTreeNode treeNode = new SarFileSplitMenuTreeNode(); - String parentName = itemNum.substring(0, itemNum.lastIndexOf(".")); - List p = treeNodeList.stream().filter(e -> e.getName().equals(parentName)).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(p)) { - treeNode.setParentId(p.get(0).getId()); - } - treeNode.setId(UUID.randomUUID().toString().replace("-", "")); - treeNode.setName(itemNum); - treeNode.setParentName(parentName); - //判断格式 - if (itemNum.lastIndexOf(".") + 1 < itemNum.length()) { -// treeNode.setOrderNum(Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length()))); - treeNode.setOrderNum(p.get(0).getOrderNum() + Long.valueOf(itemNum.substring(itemNum.lastIndexOf(".") + 1, itemNum.length()))); - } - - treeNode.setItemName(itemEO.getItemsName()); - treeNode.setItemId(itemEO.getId()); - treeNodeList.add(treeNode); - } - }*/ - - return treeNodeList; - } - - public Map validateImportDatas(List datas, String filepath) throws Exception { - //存放数据验证结果信息 - List stringMessage = new ArrayList<>(); - int i = 1; //记录行号 - int num = 0; //记录是第几条数据 - //循环验证数据 - for (SarFileSplitItemsImportDto dto : datas) { - i++; - int countError = 0; //记录失败数据数量 - String errorMsg = "第" + i + "行:"; -// dto.setRelevanceFileName(dto.getRelevanceFile()); - if (num > 0 && StringUtils.isEmpty(dto.getItemsNum()) && StringUtils.isEmpty(dto.getItemsName())) { - String nowItemContent = dto.getItermsConditions(); - BeanUtils.copyProperties(datas.get(num-1), dto); - dto.setItermsConditions(nowItemContent); -// dto.setRelevanceFile(dto.getRelevanceFileName()); - } - if (StringUtils.isEmpty(dto.getItemsNum())) { - errorMsg += "条款号不能为空;"; - countError++; - } else { - if (dto.getItemsNum().length()>100) { - errorMsg += "条款号不能超过100个字符;"; - countError++; - } - } - if (StringUtils.isEmpty(dto.getItemsName())) { - errorMsg += "条款名称不能为空;"; - countError++; - } else { - if (dto.getItemsName().length()>100) { - errorMsg += "条款名称不能超过100个字符;"; - countError++; - } - } -// String saveApplyCode = ""; -// if (StringUtils.isNotEmpty(dto.getApplyArctic())) { -// dto.setApplyArctic(dto.getApplyArctic().replace(",", ",")); -// String applys[] = dto.getApplyArctic().split(","); -// if(applys.length>20){ -// errorMsg += "适用车型选项不能超过20个;"; -// countError++; -// } else if (dto.getApplyArctic().length() > 500) { -// errorMsg += "适用车型不能超过500个字符;"; -// countError++; -// } else { -// Set set = new HashSet(); -// for (int a = 0; a < applys.length; a++) { -// String getDic = sysDictMapper.queryDictKeyByText("PRODUCTTYPE", applys[a]);; -// if (getDic != null) { -// saveApplyCode += getDic + ","; -// } else { -// errorMsg += "适用车型" + applys[a] + "不存在;"; -// countError++; -// break; -// } -// set.add(applys[a]); -// if (a==applys.length-1 && applys.length != set.size()){ -// errorMsg += "适用车型存在重复数据;"; -// countError++; -// } -// } -// if (!saveApplyCode.equals("")){ -// dto.setApplyArctic(saveApplyCode.substring(0,saveApplyCode.length()-1)); -// } -// } -// } - //关联文件 支持PDF、doc、docx文件, -// if (StringUtils.isNotEmpty(dto.getRelevanceFile())) { -// dto.setRelevanceFile(dto.getRelevanceFile().replace(",", ",")); -// String[] filelist = dto.getRelevanceFile().split(","); -// String fileidlist = ""; -// if (filelist != null && filelist.length > 8) { -// errorMsg += "关联文件不能超过8个"; -// countError++; -// } else { -// for (int ind = 0; ind < filelist.length; ind++) { -// String filename = filelist[ind]; -// String resultMes = ExcelUtil.validatePattern(filename); -// if (StringUtils.isNotEmpty(resultMes)) { -// errorMsg += "关联文件" + resultMes; -// countError++; -// continue; -// } -// List nowfilelist = FileUnZip.readFileByFilename(filepath, filename); -// if (nowfilelist.size() <= 0) { -// errorMsg += "压缩包中没有关联文件" + filename + "文件;"; -// countError++; -// } else { -// // 判断文件大小是否超过200M -// if (nowfilelist.get(0).length() > 200 * 1024 * 1024) { -// errorMsg += filename + "文件大小超过200M;"; -// countError++; -// continue; -// } -// OSSFile ossFile = new OSSFile(); -// String id = UUID.randomUUID().toString().replace("-", ""); -// ossFile.setId(id); -// ossFile.setFileName(nowfilelist.get(0).getName()); -// ossFile.setUrl(nowfilelist.get(0).getPath()); -// boolean insertResult = ossFileService.save(ossFile); -// if(insertResult){ -// fileidlist += id + ","; -// } -// } -// } -// if (fileidlist != "") { -// dto.setRelevanceFile(fileidlist.substring(0, fileidlist.length() - 1)); -// } -// } -// } - if (countError > 0) { - stringMessage.add(errorMsg); - } - num++; - } - Map map = new HashMap(); - if (stringMessage.isEmpty()) { - map.put("result", true); - map.put("resultList", datas); - map.put("message", ""); - } else { - map.put("result", false); - String html = ""; - for (String message : stringMessage) { - html += message + "
"; - } - map.put("message", html); - } - return map; - } - - public void createItemsInfo(SarFileSplitItemsEO sarFileSplitItemsEO,String menuId,String infoId){ - String userId = UserUtils.getUserId(); - //创建菜单 -// SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); -// sarFileSplitMenuEO.setInfoId(infoId); -// sarFileSplitMenuEO.setName(sarFileSplitItemsEO.getItemsNum()); -// sarFileSplitMenuEO.setItemName(sarFileSplitItemsEO.getItemsName()); -// sarFileSplitMenuEO.setPId(parentId); -// sarFileSplitMenuEO.setDisplaySeq(countNum+1L); -// sarFileSplitMenuEO.setCreationUser(userId); -// sarFileSplitMenuEO.setModifyUser(userId); -// String menuId = sarFileSplitMenuEOService.addMenuForImport(sarFileSplitMenuEO); - //添加items表数据 -// String itemsId = UUID.randomUUID().toString().replace("-", ""); -// sarFileSplitItemsEO.setId(itemsId); - sarFileSplitItemsEO.setMenuId(menuId); - sarFileSplitItemsEO.setValidFlag(0); - sarFileSplitItemsEO.setCreationTime(new Date()); - sarFileSplitItemsEO.setModifyTime(new Date()); - sarFileSplitItemsEO.setCreationUser(userId); - - //添加val表数据 - List getValList = sarFileSplitItemsEO.getItemValEOList(); - String itemConditions = ""; - int ind = 1; - if (getValList != null && !getValList.isEmpty()) { - for (SarFileSplitItemsValEO valEO : getValList) { - // 当前段内容 - String valContent = ""; - if ("TEXT".equals(valEO.getType())) { - valContent += "

" + valEO.getItemContent() + "

"; - } else if ("IMG".equals(valEO.getType())) { -// valContent += ""; - valContent += valEO.getItemContent(); - } else if ("TABLE".equals(valEO.getType())) { - valContent += valEO.getItemContent(); - } - itemConditions += valContent; - // val表信息 - valEO.setId(UUID.randomUUID().toString().replace("-", "")); -// valEO.setItemId(itemsId); - valEO.setItemId(sarFileSplitItemsEO.getId()); - valEO.setDisplaySeq(ind); - valEO.setValidFlag(0); - valEO.setCreationTime(new Date()); - valEO.setModifyTime(new Date()); - valEO.setCreationUser(userId); - valEO.setModifyUser(userId); - ind++; - } - sarFileSplitItemsValEOMapper.insertForeach(getValList); - sarFileSplitItemsEO.setItermsConditions(itemConditions); - } - dao.insertSelective(sarFileSplitItemsEO); - } - - @Override - public int insertForeach(List messageList) { - return dao.insertForeach(messageList); - } - - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java deleted file mode 100644 index 65fd35837..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsFileEOServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jero.modules.split.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.split.entity.SarFileSplitItemsFileEO; -import com.jero.modules.split.mapper.SarFileSplitItemsFileEOMapper; -import com.jero.modules.split.page.SarFileSplitItemsFileEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsFileEOService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_FILE SarFileSplitItemsFileEOService
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsFileEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class SarFileSplitItemsFileEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsFileEOService { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsFileEOServiceImpl.class); - - @Autowired - private SarFileSplitItemsFileEOMapper dao; - - public List selectFileByAttId(String attId){ - return dao.selectFileByAttId(attId); - } - - @Override - public int insert(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { - return dao.insert(sarFileSplitItemsFileEO); - } - - @Override - public int insertSelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { - return dao.insertSelective(sarFileSplitItemsFileEO); - } - - @Override - public int updateByPrimaryKey(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { - return dao.updateByPrimaryKey(sarFileSplitItemsFileEO); - } - - @Override - public int updateByPrimaryKeySelective(SarFileSplitItemsFileEO sarFileSplitItemsFileEO) { - return dao.updateByPrimaryKeySelective(sarFileSplitItemsFileEO); - } - - @Override - public SarFileSplitItemsFileEO selectByPrimaryKey(String value) { - return dao.selectByPrimaryKey(value); - } - - @Override - public int deleteByPrimaryKey(String value) { - return dao.deleteByPrimaryKey(value); - } - - @Override - public List queryByList(SarFileSplitItemsFileEOPage page) { - return dao.queryByList(page); - } - - @Override - public int queryByCount(SarFileSplitItemsFileEOPage page) { - return dao.queryByCount(page); - } - - @Override - public List queryByPage(SarFileSplitItemsFileEOPage page) { - return dao.queryByPage(page); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java deleted file mode 100644 index f41a137df..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsParamsEOServiceImpl.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jero.modules.split.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.split.entity.SarFileSplitItemsParamsEO; -import com.jero.modules.split.mapper.SarFileSplitItemsParamsMapper; -import com.jero.modules.split.page.SarFileSplitItemsParamsEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsParamsEOService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_PARAMS SarFileSplitItemsParamsEOService
- * 作者:code generator
- * 日期: 2020-02-04
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsParamsEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class SarFileSplitItemsParamsEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsParamsEOService { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsParamsEOServiceImpl.class); - - @Autowired - private SarFileSplitItemsParamsMapper dao; - - public int deleteByItemIds(List idList){ - return dao.deleteByItemIds(idList); - } - - @Override - public int insert(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { - return dao.insert(sarFileSplitItemsParamsEO); - } - - @Override - public int insertSelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { - return dao.insertSelective(sarFileSplitItemsParamsEO); - } - - @Override - public int updateByPrimaryKey(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { - return dao.updateByPrimaryKey(sarFileSplitItemsParamsEO); - } - - @Override - public int updateByPrimaryKeySelective(SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO) { - return dao.updateByPrimaryKeySelective(sarFileSplitItemsParamsEO); - } - - @Override - public SarFileSplitItemsParamsEO selectByPrimaryKey(String value) { - return dao.selectByPrimaryKey(value); - } - - @Override - public int deleteByPrimaryKey(String value) { - return dao.deleteByPrimaryKey(value); - } - - @Override - public List queryByList(SarFileSplitItemsParamsEOPage page) { - return dao.queryByList(page); - } - - @Override - public int queryByCount(SarFileSplitItemsParamsEOPage page) { - return dao.queryByCount(page); - } - - @Override - public List queryByPage(SarFileSplitItemsParamsEOPage page) { - return dao.queryByPage(page); - } - -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java deleted file mode 100644 index ba1ce653a..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsResEOServiceImpl.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.jero.modules.split.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.split.entity.SarFileSplitItemsResEO; -import com.jero.modules.split.mapper.SarFileSplitItemsResEOMapper; -import com.jero.modules.split.page.SarFileSplitItemsResEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsResEOService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_RES SarFileSplitItemsResEOService
- * 作者:code generator
- * 日期: 2020-03-30
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsResEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class SarFileSplitItemsResEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsResEOService { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsResEOServiceImpl.class); - - @Autowired - private SarFileSplitItemsResEOMapper dao; - - - @Override - public int insert(SarFileSplitItemsResEO sarFileSplitItemsResEO) { - return dao.insert(sarFileSplitItemsResEO); - } - - @Override - public int insertSelective(SarFileSplitItemsResEO sarFileSplitItemsResEO) { - return dao.insertSelective(sarFileSplitItemsResEO); - } - - @Override - public int updateByPrimaryKey(SarFileSplitItemsResEO sarFileSplitItemsResEO) { - return dao.updateByPrimaryKey(sarFileSplitItemsResEO); - } - - @Override - public int updateByPrimaryKeySelective(SarFileSplitItemsResEO sarFileSplitItemsResEO) { - return dao.updateByPrimaryKeySelective(sarFileSplitItemsResEO); - } - - @Override - public SarFileSplitItemsResEO selectByPrimaryKey(String value) { - return dao.selectByPrimaryKey(value); - } - - @Override - public int deleteByPrimaryKey(String value) { - return dao.deleteByPrimaryKey(value); - } - - @Override - public List queryByList(SarFileSplitItemsResEOPage page) { - return dao.queryByList(page); - } - - @Override - public int queryByCount(SarFileSplitItemsResEOPage page) { - return dao.queryByCount(page); - } - - @Override - public List queryByPage(SarFileSplitItemsResEOPage page) { - return dao.queryByPage(page); - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java deleted file mode 100644 index 6f1f22ca2..000000000 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsTableEOServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.jero.modules.split.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; -import com.jero.modules.split.mapper.SarFileSplitItemsTableEOMapper; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; -import com.jero.modules.split.service.ISarFileSplitItemsTableEOService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - - -/** - * - *
- * 功能:SAR_FILE_SPLIT_ITEMS_TABLE SarFileSplitItemsTableEOService
- * 作者:code generator
- * 日期: 2020-01-17
- * 版权所有:版权归北京卡达克数据技术中心所有。
- */ -@Service("sarFileSplitItemsTableEOService") -@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) -public class SarFileSplitItemsTableEOServiceImpl extends ServiceImpl implements ISarFileSplitItemsTableEOService { - - private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsTableEOServiceImpl.class); - - @Autowired - private SarFileSplitItemsTableEOMapper dao; - - public List queryByRowNum(SarFileSplitItemsTableEOPage page){ - return dao.queryByRowNum(page); - } - - public int deleteByitemIds(List idList){ - return dao.deleteByitemIds(idList); - } - - @Override - public int insert(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { - return dao.insert(sarFileSplitItemsTableEO); - } - - @Override - public int insertSelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { - return dao.insertSelective(sarFileSplitItemsTableEO); - } - - @Override - public int updateByPrimaryKey(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { - return dao.updateByPrimaryKey(sarFileSplitItemsTableEO); - } - - @Override - public int updateByPrimaryKeySelective(SarFileSplitItemsTableEO sarFileSplitItemsTableEO) { - return dao.updateByPrimaryKeySelective(sarFileSplitItemsTableEO); - } - - @Override - public SarFileSplitItemsTableEO selectByPrimaryKey(String value) { - return dao.selectByPrimaryKey(value); - } - - @Override - public int deleteByPrimaryKey(String value) { - return dao.deleteByPrimaryKey(value); - } - - @Override - public List queryByList(SarFileSplitItemsTableEOPage page) { - return dao.queryByList(page); - } - - @Override - public int queryByCount(SarFileSplitItemsTableEOPage page) { - return dao.queryByCount(page); - } - - @Override - public List queryByPage(SarFileSplitItemsTableEOPage page) { - return dao.queryByPage(page); - } -} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java index 601da46c6..87e8331e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -1,16 +1,10 @@ package com.jero.modules.split.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.modules.split.entity.SarFileSplitItemsEO; -import com.jero.modules.split.entity.SarFileSplitItemsTableEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; -import com.jero.modules.split.mapper.SarFileSplitItemsEOMapper; -import com.jero.modules.split.mapper.SarFileSplitItemsTableEOMapper; import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; -import com.jero.modules.split.page.SarFileSplitItemsTableEOPage; import com.jero.modules.split.page.SarFileSplitItemsValEOPage; import com.jero.modules.split.service.ISarFileSplitItemsValEOService; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +12,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; @@ -39,59 +32,6 @@ public class SarFileSplitItemsValEOServiceImpl extends ServiceImpl idList){ - return dao.deleteValByitemIds(idList); - } - - public List getSplitItemsByMenu(String menuId,String infoId){ - List rows = sarFileSplitItemsEOMapper.queryItemsByMenuId(menuId);; - List getList = new ArrayList<>(); - if (rows != null && !rows.isEmpty()) { - for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { - SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage(); - valpage.setItemId(sarFileSplitItemsEO.getId()); - valpage.setOrderBy("DISPLAY_SEQ,ID"); - List getListVal = dao.queryByList(valpage); - if (getList != null && !getList.isEmpty()) { - for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { - String imgPath = sarFileSplitItemsValEO.getItemContent(); - if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { - String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); - sarFileSplitItemsValEO.setImgName(imgName); - } else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { - SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); - tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); - List tableList = sarFileSplitItemsTableEOMapper.queryByList(tablePage); - List tableListRow = sarFileSplitItemsTableEOMapper.queryByRowNum(tablePage); - sarFileSplitItemsValEO.setTableList(tableList); - if (tableListRow != null && !tableListRow.isEmpty()) { - List> getTableList = new ArrayList<>(); - for (int i=1; i <= tableListRow.size();i++) { - List rowList = new ArrayList<>(); - for (int j=0; j < tableList.size();j++) { - if (tableList.get(j).getRowNum() == i) { - rowList.add(tableList.get(j)); - } - } - getTableList.add(rowList); - } - sarFileSplitItemsValEO.setTableListShow(getTableList); - } - } - } - } - getList.addAll(getListVal); - } - } - return getList; - } - @Override public int insert(SarFileSplitItemsValEO sarFileSplitItemsValEO) { return dao.insert(sarFileSplitItemsValEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java index 4dda3bf27..b252a40fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java @@ -1,15 +1,12 @@ package com.jero.modules.split.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.system.vo.LoginUser; -import com.jero.modules.split.entity.*; -import com.jero.modules.split.mapper.*; -import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.entity.SarFileSplitMenuEO; +import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper; +import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper; import com.jero.modules.split.page.SarFileSplitMenuEOPage; import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService; -import com.jero.modules.system.util.UserUtils; -import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,172 +34,12 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpldrageMenuEO.getTargetMenuDisplay()) { - // 修改被影响的其他节点的排序,修改时间,修改人 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()+1); - sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); - result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay()-1; - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); - } - sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()+1); - } else { - // 修改被影响的其他节点的排序,修改时间,修改人 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); - sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()); - result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = drageMenuEO.getTargetMenuDisplay()-childrenCount+1- drageMenuEO.getMenuDisplay(); - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); - } - sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount+1); - } - } else if (drageMenuEO.getMoveType().equals("prev")) { - sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); - if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { - // 修改被影响的其他节点的排序,修改时间,修改人 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getTargetMenuDisplay()); - sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); - result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = drageMenuEO.getMenuDisplay()-drageMenuEO.getTargetMenuDisplay(); - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); - } - sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()); - } else { - // 修改被影响的其他节点的排序,修改时间,修改人 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setDisplaySeqStart(drageMenuEO.getMenuDisplay()+childrenCount-1); - sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getTargetMenuDisplay()-1); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = drageMenuEO.getTargetMenuDisplay()- childrenCount - drageMenuEO.getMenuDisplay(); - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); - } - - sarFileSplitMenuEO.setDisplaySeq(drageMenuEO.getTargetMenuDisplay()-childrenCount); - } - - } else { - sarFileSplitMenuEO.setPId(drageMenuEO.getTargetParentId()); - if (drageMenuEO.getMenuDisplay()>drageMenuEO.getTargetMenuDisplay()) { - // 修改被影响的其他节点的排序,修改时间,修改人 往上移动 - // 查询目标最大的排序 - long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); - // 查询移动节点包括子节点一共有多少个 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setDisplaySeqStart(targetDisplay+1); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - sarFileSplitMenuEO.setDisplaySeqEnd(drageMenuEO.getMenuDisplay()); - result += dao.updateDisplaySeqAdd(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = drageMenuEO.getMenuDisplay()-targetDisplay-1; - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDCut(childrenUpdateEO); - } - sarFileSplitMenuEO.setDisplaySeq(targetDisplay+1); - } else { - // 修改被影响的其他节点的排序,修改时间,修改人 往下移动 - // 如果该节点下有字节点,寻找该节点包括所有子节点的最大排序 - // 查询目标最大的排序 - long targetDisplay = getMaxDisplayByid(drageMenuEO.getTargetMenuId()); - long menuMaxDisplay = getMaxDisplayByid(drageMenuEO.getMenuId()); - // 查询移动节点包括子节点一共有多少个 - long childrenCount = dao.getChildrenCountByParentId(drageMenuEO.getMenuId()); - sarFileSplitMenuEO.setDisplaySeqStart(menuMaxDisplay); - sarFileSplitMenuEO.setChildrenCount(childrenCount); - sarFileSplitMenuEO.setDisplaySeqEnd(targetDisplay); - result += dao.updateDisplaySeqCut(sarFileSplitMenuEO); - // 如果子节点个数多,都需修改 - if (childrenCount>1) { - // 计算移动节点前后排序差 - long betwttenNum = targetDisplay-childrenCount+1 - drageMenuEO.getMenuDisplay(); - SarFileSplitMenuEO childrenUpdateEO = new SarFileSplitMenuEO(); - childrenUpdateEO.setId(drageMenuEO.getMenuId()); - childrenUpdateEO.setChildrenCount(betwttenNum); - childrenUpdateEO.setModifyTime(new Date()); - childrenUpdateEO.setModifyUser(loginUser.getId()); - result += dao.updateChildrenDisplaySeqByIDAdd(childrenUpdateEO); - } - sarFileSplitMenuEO.setDisplaySeq(targetDisplay-childrenCount+1); - // 修改字节的的排序 - } - } - // 修改当前节点,父亲Id,排序,修改时间,修改人 - result += dao.updateByPrimaryKeySelective(sarFileSplitMenuEO); - return result; - } - // 通过ID查询该结点及结点下所有的节点排序的最大值 public int getMaxDisplayByid(String menuID) { return dao.getMaxDisplayByid(menuID); @@ -241,26 +78,6 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl list = dao.queryByPidExcpetSelf(sarMenuEO); - if(list.size()<=0){ - //再查节点下是否有标准,法规,企业标准记录 - SarFileSplitItemsEOPage itemEO = new SarFileSplitItemsEOPage(); - itemEO.setMenuId(sarMenuEO.getId()); - itemEO.setValidFlag("0"); - List listresult = sarFileSplitItemsEOMapper.queryByList(itemEO); - if(listresult !=null && listresult.size()>0){ - result=true; - } - } - else{ - result=true; - } - return result; - } - public void deleteMenu(String id){ List menuIds = new ArrayList<>(); SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); @@ -276,218 +93,9 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl(); - List oldItemIdList = new ArrayList<>(); - Map itemValIdMap = new HashMap<>(); - Map menuIdMap = new HashMap<>(); - // 根据目录ID查询相关信息 - sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); - // 查询该节点下所有的 子节点 并修改排序 - List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); - int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); - SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); - sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); - sarFileSplitMenuEO.setDisplaySeqEnd(10000L); - sarFileSplitMenuEO.setChildrenCount(Long.valueOf(sarFileSplitMenuEOList.size())); - sarFileSplitMenuEO.setModifyUser(UserUtils.getUserId()); - sarFileSplitMenuEO.setModifyTime(new Date()); - sarFileSplitMenuEO.setInfoId(sarMenuEO.getInfoId()); - dao.updateDisplaySeqAdd(sarFileSplitMenuEO); - for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { - menuIdMap.put(sarFileSplitMenuEOfor.getId(),UUID.randomUUID().toString().replace("-", "")); - } - for (SarFileSplitMenuEO sarFileSplitMenuEOfor : sarFileSplitMenuEOList) { - sarFileSplitMenuEOfor.setId(menuIdMap.get(sarFileSplitMenuEOfor.getId()).toString()); - if (menuIdMap.containsKey(sarFileSplitMenuEOfor.getPId())){ - sarFileSplitMenuEOfor.setPId(menuIdMap.get(sarFileSplitMenuEOfor.getPId()).toString()); - } - sarFileSplitMenuEOfor.setDisplaySeq(sarFileSplitMenuEOfor.getDisplaySeq() + sarFileSplitMenuEOList.size()); - sarFileSplitMenuEOfor.setCreationTime(new Date()); - sarFileSplitMenuEOfor.setModifyTime(new Date()); - sarFileSplitMenuEOfor.setCreationUser(UserUtils.getUserId()); - sarFileSplitMenuEOfor.setModifyUser(UserUtils.getUserId()); - } - // SAR_FILE_ITEMS_MENU 添加数据, - result = dao.insertForeach(sarFileSplitMenuEOList); - // SAR_FILE_ITEMS 添加数据, - List sarFileSplitItemsEOList = sarFileSplitItemsEOMapper.queryItemsByMenuId(sarMenuEO.getId()); - for (SarFileSplitItemsEO sarFileSplitItemsEO : sarFileSplitItemsEOList) { - String newItemId = UUID.randomUUID().toString().replace("-", ""); - oldItemIdList.add(sarFileSplitItemsEO.getId()); - itemIdMap.put(sarFileSplitItemsEO.getId(), newItemId); - sarFileSplitItemsEO.setId(newItemId); - sarFileSplitItemsEO.setMenuId(menuIdMap.get(sarFileSplitItemsEO.getMenuId()).toString()); - sarFileSplitItemsEO.setCreationTime(new Date()); - sarFileSplitItemsEO.setModifyTime(new Date()); - sarFileSplitItemsEO.setCreationUser(UserUtils.getUserId()); - sarFileSplitItemsEO.setModifyUser(UserUtils.getUserId()); - } - if(sarFileSplitItemsEOList.size()>0){ - result += sarFileSplitItemsEOMapper.insertForeach(sarFileSplitItemsEOList); - } - - // SAR_FILE_ITEMS_VAL 添加数据, - if(oldItemIdList.size()>0){ - List sarFileSplitItemsValEOList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList); - for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { - String newItemValId = UUID.randomUUID().toString().replace("-", ""); - itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); - sarFileSplitItemsValEO.setId(newItemValId); - sarFileSplitItemsValEO.setItemId(itemIdMap.get(sarFileSplitItemsValEO.getItemId()).toString()); - sarFileSplitItemsValEO.setCreationTime(new Date()); - sarFileSplitItemsValEO.setModifyTime(new Date()); - sarFileSplitItemsValEO.setCreationUser(UserUtils.getUserId()); - sarFileSplitItemsValEO.setModifyUser(UserUtils.getUserId()); - } - if (sarFileSplitItemsValEOList.size()>0) { - result += sarFileSplitItemsValEOMapper.insertForeach(sarFileSplitItemsValEOList); - } - // SAR_FILE_ITEMS_PARAMS 添加数据, - List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsMapper.queryItemsParamsByMenuId(oldItemIdList); - for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { - sarFileSplitItemsParamsEO.setId(UUID.randomUUID().toString().replace("-", "")); - sarFileSplitItemsParamsEO.setItemId(itemIdMap.get(sarFileSplitItemsParamsEO.getItemId()).toString()); - sarFileSplitItemsParamsEO.setCreationTime(new Date()); - sarFileSplitItemsParamsEO.setModifyTime(new Date()); - } - if (sarFileSplitItemsParamsEOList.size()>0){ - result += sarFileSplitItemsParamsMapper.insertForeach(sarFileSplitItemsParamsEOList); - } - } - - - // SAR_FILE_ITEMS_TABLE 添加数据, -// List sarFileSplitItemsTableEOList = sarFileSplitItemsTableEODao.queryItemsTableByMenuId(oldItemIdList); -// for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) { -// sarFileSplitItemsTableEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarFileSplitItemsTableEO.setItemsId(itemIdMap.get(sarFileSplitItemsTableEO.getItemsId()).toString()); -// sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString()); -// sarFileSplitItemsTableEO.setCreationTime(new Date()); -// sarFileSplitItemsTableEO.setModifyTime(new Date()); -// sarFileSplitItemsTableEO.setModifyUser(UserUtils.getUserId()); -// } -// if (sarFileSplitItemsTableEOList.size()>0){ -// result += sarFileSplitItemsTableEODao.insertForeach(sarFileSplitItemsTableEOList); -// } - return result; - } - - public int copyMenuNotChildren(Map itemsMap) { - int result =0; - List oldItemIdList = new ArrayList<>(); - Map itemValIdMap = new HashMap<>(); - String itemId = itemsMap.get("id").toString(); - oldItemIdList.add(itemId); - - itemsMap = fileSplitItemsEOService.selectByPrimaryKey(itemId); - - // 查询该节点下所有的 子节点 并修改排序 - SarFileSplitMenuEO sarMenuEO = new SarFileSplitMenuEO(); - sarMenuEO.setId(itemsMap.get("menu_id").toString()); -// List sarFileSplitMenuEOList = dao.queryAllChildrenByid(sarMenuEO); -// sarMenuEO = dao.selectByPrimaryKey(sarMenuEO.getId()); -// int maxDisplay = dao.getMaxDisplayByid(sarMenuEO.getId()); -// SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO(); -// sarFileSplitMenuEO.setDisplaySeqStart(Long.valueOf(maxDisplay + 1)); -// sarFileSplitMenuEO.setDisplaySeqEnd(10000L); -// sarFileSplitMenuEO.setChildrenCount(1L); -// sarFileSplitMenuEO.setModifyUser(UserUtils.getUserId()); -// sarFileSplitMenuEO.setModifyTime(new Date()); -// sarFileSplitMenuEO.setInfoId(itemsMap.get("info_id").toString()); -// dao.updateDisplaySeqAdd(sarFileSplitMenuEO); - - // SAR_FILE_ITEMS_MENU 添加数据, -// sarMenuEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarMenuEO.setDisplaySeq(Long.valueOf(maxDisplay + 1)); -// sarMenuEO.setCreationTime(new Date()); -// sarMenuEO.setModifyTime(new Date()); -// sarMenuEO.setCreationUser(UserUtils.getUserId()); -// sarMenuEO.setModifyUser(UserUtils.getUserId()); -// result = dao.insertSelective(sarMenuEO); - - // SAR_FILE_ITEMS 添加数据, - String newItemId = UUID.randomUUID().toString().replace("-", ""); - itemsMap.put("menu_id", sarMenuEO.getId()); - itemsMap.remove("id"); - itemsMap.remove("creation_user"); - itemsMap.remove("creation_time"); - itemsMap.remove("modify_user"); - itemsMap.remove("modify_time"); - itemsMap.remove("sys_org_code"); - itemsMap = fileSplitItemsEOService.filterMap(itemsMap); - result += fileSplitItemsEOService.insertInfo(itemsMap, newItemId,"add"); - - // SAR_FILE_ITEMS_VAL 添加数据, - List sarFileSplitItemsValEOList = sarFileSplitItemsValEOMapper.queryItemsValByMenuId(oldItemIdList); - for (SarFileSplitItemsValEO sarFileSplitItemsValEO : sarFileSplitItemsValEOList) { - String newItemValId = UUID.randomUUID().toString().replace("-", ""); - itemValIdMap.put(sarFileSplitItemsValEO.getId(), newItemValId); - sarFileSplitItemsValEO.setId(newItemValId); - sarFileSplitItemsValEO.setItemId(newItemId); - sarFileSplitItemsValEO.setCreationTime(new Date()); - sarFileSplitItemsValEO.setModifyTime(new Date()); - sarFileSplitItemsValEO.setCreationUser(UserUtils.getUserId()); - sarFileSplitItemsValEO.setModifyUser(UserUtils.getUserId()); - } - if (sarFileSplitItemsValEOList.size()>0) { - result += sarFileSplitItemsValEOMapper.insertForeach(sarFileSplitItemsValEOList); - } - // SAR_FILE_ITEMS_PARAMS 添加数据, -// List sarFileSplitItemsParamsEOList = sarFileSplitItemsParamsMapper.queryItemsParamsByMenuId(oldItemIdList); -// for (SarFileSplitItemsParamsEO sarFileSplitItemsParamsEO : sarFileSplitItemsParamsEOList) { -// sarFileSplitItemsParamsEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarFileSplitItemsParamsEO.setItemId(newItemId); -// sarFileSplitItemsParamsEO.setCreationTime(new Date()); -// sarFileSplitItemsParamsEO.setModifyTime(new Date()); -// } -// if (sarFileSplitItemsParamsEOList.size()>0){ -// result += sarFileSplitItemsParamsMapper.insertForeach(sarFileSplitItemsParamsEOList); -// } - // SAR_FILE_ITEMS_TABLE 添加数据, -// List sarFileSplitItemsTableEOList = sarFileSplitItemsTableEOMapper.queryItemsTableByMenuId(oldItemIdList); -// for (SarFileSplitItemsTableEO sarFileSplitItemsTableEO : sarFileSplitItemsTableEOList) { -// sarFileSplitItemsTableEO.setId(UUID.randomUUID().toString().replace("-", "")); -// sarFileSplitItemsTableEO.setItemsId(newItemId); -// sarFileSplitItemsTableEO.setItemsValId(itemValIdMap.get(sarFileSplitItemsTableEO.getItemsValId()).toString()); -// sarFileSplitItemsTableEO.setCreationTime(new Date()); -// sarFileSplitItemsTableEO.setModifyTime(new Date()); -// sarFileSplitItemsTableEO.setModifyUser(UserUtils.getUserId()); -// } -// if (sarFileSplitItemsTableEOList.size()>0){ -// result += sarFileSplitItemsTableEOMapper.insertForeach(sarFileSplitItemsTableEOList); -// } - return result; - } - - public String addMenuForImport(SarFileSplitMenuEO sarFileSplitMenuEO){ - sarFileSplitMenuEO.setId(UUID.randomUUID().toString().replace("-", "")); - sarFileSplitMenuEO.setValidFlag(0); - sarFileSplitMenuEO.setCreationTime(new Date()); - sarFileSplitMenuEO.setModifyTime(new Date()); - int count = dao.insertSelective(sarFileSplitMenuEO); - // 之后的所有节点序号增加 - SarFileSplitMenuEOPage page = new SarFileSplitMenuEOPage(); - page.setPId(sarFileSplitMenuEO.getPId()); - List getList = dao.queryByList(page); - if (getList != null && !getList.isEmpty()) { - for(SarFileSplitMenuEO menu : getList){ - Long olgSeq = menu.getDisplaySeq(); - if (olgSeq >= sarFileSplitMenuEO.getDisplaySeq()) { - menu.setDisplaySeq(olgSeq + 1); - dao.updateByPrimaryKeySelective(menu); - } - } - } - return sarFileSplitMenuEO.getId(); - } - @Override public int insert(SarFileSplitMenuEO sarFileSplitMenuEO) { return dao.insert(sarFileSplitMenuEO);