From e54ea3d03cb6e69da833a1953816973c3ec71677 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 28 Mar 2022 18:42:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/ModuleEnum.java | 1 + .../jero/common/constant/enums/TableEnum.java | 1 + .../impl/OnlCgformFieldServiceImpl.java | 2 + .../service/impl/SysCategoryServiceImpl.java | 15 + .../jero/modules/system/util/TreeUtils.java | 23 + .../controller/LanguageSwitchController.java | 14 + .../service/ILanguageSwitchService.java | 8 + .../impl/LanguageSwitchServiceImpl.java | 78 ++- .../FileSplitItemsEOController.java | 105 ++++ .../SarFileSplitItemsEOController.java | 4 +- .../SarFileSplitItemsValEOController.java | 2 +- .../SarFileSplitMenuEOController.java | 36 +- .../split/mapper/FileSplitItemsEOMapper.java | 58 ++ .../mapper/SarFileSplitMenuEOMapper.java | 4 +- .../mapper/xml/FileSplitItemsEOMapper.xml | 67 +++ .../mapper/xml/SarFileSplitItemsEOMapper.xml | 13 +- .../mapper/xml/SarFileSplitMenuEOMapper.xml | 26 +- .../service/IFileSplitItemsEOService.java | 32 + .../service/ISarFileSplitMenuEOService.java | 3 +- .../impl/FileSplitItemsEOServiceImpl.java | 558 ++++++++++++++++++ .../impl/SarFileSplitMenuEOServiceImpl.java | 51 +- 21 files changed, 1029 insertions(+), 72 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 28ab3f208..2efb26af8 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -9,6 +9,7 @@ public enum ModuleEnum { DOCUMENT_LIBRARY("文档管理","1"), OCR_RECORD("OCR识别转换记录表","2"), FILE_SPLIT("文档拆分","3"), + FILE_SPLIT_ITEMS("文档拆分条款","4"), ONL_CGFORM_COLLECTION("我的收藏","5"), ONL_CGFORM_SUBSCRIBE("我的订阅","6"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java index b969bd5d2..896e55f4a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java @@ -9,6 +9,7 @@ public enum TableEnum { BUSS_DOCUMENT_LIBRARY("buss_document_library"), OCR_RECORD("ocr_record"), FILE_SPLIT("sar_file_split_info"), + FILE_SPLIT_ITEMS("sar_file_split_items"), TAG("onl_cgform_tag"), TAG_AREA("onl_cgform_area"), ONL_CGFORM_COLLECTION("onl_cgform_collection"), diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index a9df69024..186c2a5db 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -820,6 +820,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl getSysCategoryTreeByCut(String cut) { + try { + List list = super.baseMapper.selectList(new QueryWrapper<>()); + List tree = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(list)){ + tree = TreeUtils.getSysCategoryTreeByCut(list, cut); + } + return tree; + }catch (Exception ex){ + log.error("查询树形结构失败： " + ex.getMessage()); + throw new JeroBootException("查询树形结构失败！"); + } + } + @Override public void updateDictDelFlag(int delFlag, String id) { baseMapper.updateDictDelFlag(delFlag,id); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index e33da9e2c..1102b9124 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -1,5 +1,6 @@ package com.jero.modules.system.util; +import com.jero.common.constant.enums.CutEnum; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; import org.springframework.stereotype.Component; @@ -37,6 +38,28 @@ public class TreeUtils { return sysCategoryTreeVOList; } + public static List getSysCategoryTreeByCut(List sysCategoryList, String cut) { + List sysCategoryTreeVOList = new LinkedList(); + for (SysCategory sysCategory : sysCategoryList) { + if (TREE_ROOT_CODE.equals(sysCategory.getPid())) { + SysCategoryTreeVO sysCategoryTreeVO = new SysCategoryTreeVO(); + sysCategoryTreeVO.setId(sysCategory.getId()); + sysCategoryTreeVO.setKey(sysCategory.getId()); + sysCategoryTreeVO.setValue(sysCategory.getId()); + sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); + if(CutEnum.CN.getValue().equals(cut)) { + sysCategoryTreeVO.setTitle(sysCategory.getName()); + } else if (CutEnum.EN.getValue().equals(cut)) { + sysCategoryTreeVO.setTitle(sysCategory.getEnName()); + } + sysCategoryTreeVO.setParentId(sysCategory.getPid()); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVOList.add(sysCategoryTreeVO); + } + } + return sysCategoryTreeVOList; + } + private static List getSysCategoryTreeChild(String id, List sysCategoryList) { List childrenList = new LinkedList(); for (SysCategory sysCategory : sysCategoryList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/controller/LanguageSwitchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/controller/LanguageSwitchController.java index 015676e10..56e7e0487 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/controller/LanguageSwitchController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/controller/LanguageSwitchController.java @@ -55,4 +55,18 @@ public class LanguageSwitchController { List> list = languageSwitchService.queryCondition(flag, cut); return Result.OK(list); } + /** + * 表单中英文切换 + * + * @return + */ + @AutoLog(value = "表单中英文切换") + @ApiOperation(value="表单中英文切换", notes="表单中英文切换") + @GetMapping(value = "/getForm") + public Result>> getForm(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = languageSwitchService.getForm(flag, cut); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/ILanguageSwitchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/ILanguageSwitchService.java index 2d131f498..95d711ec0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/ILanguageSwitchService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/ILanguageSwitchService.java @@ -25,4 +25,12 @@ public interface ILanguageSwitchService { * @return */ List> queryCondition(String flag, String cut); + + /** + * 表单中英文切换 + * @param flag + * @param cut + * @return + */ + List> getForm(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/impl/LanguageSwitchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/impl/LanguageSwitchServiceImpl.java index 649390609..d55733475 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/impl/LanguageSwitchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lanswitch/service/impl/LanguageSwitchServiceImpl.java @@ -1,12 +1,15 @@ package com.jero.modules.lanswitch.service.impl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.lanswitch.service.ILanguageSwitchService; import com.jero.modules.ocr.util.LineHumpUtil; -import org.apache.commons.lang.StringUtils; +import com.jero.modules.system.entity.SysCategoryTreeVO; +import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,6 +29,9 @@ public class LanguageSwitchServiceImpl implements ILanguageSwitchService { @Autowired private OnlCgformFieldServiceImpl onlCgformFieldService; + @Autowired + private SysCategoryServiceImpl sysCategoryService; + /** * 列表表头中英文切换 * @@ -54,10 +60,10 @@ public class LanguageSwitchServiceImpl implements ILanguageSwitchService { } String dbFieldName = onlCgformField.getDbFieldName(); - if (StringUtils.isNotBlank(onlCgformField.getDictField())) { - map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)+ "_dictText");//配置了数据字典的字段，需要特殊处理 - }else{ - map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));//字段 + if (ModuleEnum.FILE_SPLIT_ITEMS.getValue().equals(flag)) { + map.put("db_field_name", dbFieldName); + } else { + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); } if(CutEnum.CN.getValue().equals(cut)){ @@ -82,12 +88,72 @@ public class LanguageSwitchServiceImpl implements ILanguageSwitchService { //过滤出搜索条件() fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } + //树形数据字典 + List sysCategoryTree = sysCategoryService.getSysCategoryTreeByCut(cut); // 查询所有 并以树结构返回 + List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); + + if (FieldTypeEnum.TREE.getValue().equals(onlCgformField.getFieldShowType())) { + List sysCategoryTreeVOList = sysCategoryTree.stream() + .filter(e -> onlCgformField.getDictId().equals(e.getDictId())) + .collect(Collectors.toList()); + map.put("tree", sysCategoryTreeVOList); // 树形结构字段 设置树形结构字段值 + } else { + map.put("tree", new ArrayList<>()); // 其他类型字段 该key为空 + } + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 - map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 + if (ModuleEnum.FILE_SPLIT_ITEMS.getValue().equals(flag)) { + map.put("db_field_name", onlCgformField.getDbFieldName());//字段 + } else { + map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 + } + + if (CutEnum.CN.getValue().equals(cut)) { + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + } else { + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } + + @Override + public List> getForm(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤出搜索条件() + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); + } + //树形数据字典 + List sysCategoryTree = sysCategoryService.getSysCategoryTreeByCut(cut); // 查询所有 并以树结构返回 + + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if (FieldTypeEnum.TREE.getValue().equals(onlCgformField.getFieldShowType())) { + List sysCategoryTreeVOList = sysCategoryTree.stream() + .filter(e -> onlCgformField.getDictId().equals(e.getDictId())) + .collect(Collectors.toList()); + map.put("tree", sysCategoryTreeVOList); // 树形结构字段 设置树形结构字段值 + } else { + map.put("tree", new ArrayList<>()); // 其他类型字段 该key为空 + } + + map.put("area", null);//展示区域。没用到 + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填 + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + if (ModuleEnum.FILE_SPLIT_ITEMS.getValue().equals(flag)) { + map.put("db_field_name", onlCgformField.getDbFieldName());//字段 + } else { + map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 + } + map.put("db_length", onlCgformField.getDbLength());//字段长度 if (CutEnum.CN.getValue().equals(cut)) { map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 } else { 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 new file mode 100644 index 000000000..aa292b3bd --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -0,0 +1,105 @@ +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.SarFileSplitItemsEO; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.service.IFileSplitItemsEOService; +import com.jero.modules.split.service.impl.FileSplitItemsEOServiceImpl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 17:59 2022/3/27 + */ +@RestController +@RequestMapping("/split/sarFileSplitItems") +@Api(tags = "文档拆分条款信息") +public class FileSplitItemsEOController extends JeroController { + @Autowired + private FileSplitItemsEOServiceImpl fileSplitItemsEOService; + + + @ApiOperation(value = "分页查询") + @PostMapping("/getSplitItemsByPage") + public Result page(@RequestBody Map parameter) throws Exception { + IPage infoPage = fileSplitItemsEOService.getInfoPage(parameter); + return Result.OK(infoPage); + } + + @ApiOperation(value = "新增") + @PostMapping("/addSplitItems") + public Result addSplitItems(@RequestBody Map parameter) { + List itemValEOList = (List) parameter.get("itemValEOList"); + if(CollectionUtils.isNotEmpty(itemValEOList)) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : itemValEOList) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + parameter.put("itemValEOList",itemValEOListNew); + } + int resultCount = fileSplitItemsEOService.addItemContent(parameter); + if (resultCount > 0) { + return Result.OK("新增成功", parameter); + } else { + return Result.error("新增失败"); + } + } + + @ApiOperation(value = "编辑") + @PostMapping("/updateSplitItems") + public Result updateSplitItems(@RequestBody Map parameter) { + List itemValEOList = (List) parameter.get("itemValEOList"); + if(CollectionUtils.isNotEmpty(itemValEOList)) { + List itemValEOListNew = new ArrayList<>(); + for (SarFileSplitItemsValEO itemsValEO : itemValEOList) { + itemsValEO.setItemContent(StringEscapeUtils.unescapeHtml4(itemsValEO.getItemContent())); + itemValEOListNew.add(itemsValEO); + } + parameter.put("itemValEOList",itemValEOListNew); + } + int resultCount = fileSplitItemsEOService.updateItemContent(parameter); + if (resultCount > 0) { + return Result.OK("修改成功",parameter); + } else { + return Result.error("修改失败"); + } + } + + @ApiOperation(value = "批量删除") + @PostMapping("/batchDeleteItems") + public Result batchDeleteItems(String ids) { + if (StringUtils.isNotEmpty(ids)) { + int result = fileSplitItemsEOService.batchDeleteItems(ids); + if (result > 0) { + return Result.OK("删除成功",null); + } else { + return Result.error("删除失败"); + } + } else { + return Result.error("请选择要删除的数据"); + } + } + + @ApiOperation(value = "文档拆分条款信息-判断包含子节点Y") + @GetMapping("/judgeContaintChilds") + /*@RequiresPermissions("lawss:sarMenu:judgequeryMenuByPid")*/ + public Result> judgeContaintChilds(String ids) { + Map result = fileSplitItemsEOService.judgeContaintChilds(ids); + return Result.OK(result); + } + +} 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 index a5c5583fd..8c7aa8910 100644 --- 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 @@ -59,8 +59,8 @@ import java.util.*; import static com.jero.modules.split.util.ExcelUtil.checkObjAllFieldsIsNull; @RestController -@RequestMapping("/split/sarFileSplitItems") -@Api(tags = "文档拆分条款信息") +@RequestMapping("/split/fileSplitItems") +@Api(tags = "条款信息-备用") public class SarFileSplitItemsEOController extends JeroController { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsEOController.class); 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 2c62c7d9f..b37fed3da 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 @@ -48,7 +48,7 @@ public class SarFileSplitItemsValEOController extends JeroController> list(SarFileSplitItemsValEOPage page) throws Exception { 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 7f0e5414c..be1acade3 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 @@ -3,10 +3,10 @@ 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.SarFileSplitItemsEO; 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; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -16,9 +16,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; @RestController @RequestMapping("/split/sarFileSplitMenu") @@ -33,6 +31,9 @@ public class SarFileSplitMenuEOController extends JeroController itemsMap) throws Exception { + int result = sarFileSplitMenuEOService.copyMenuNotChildren(itemsMap); + return Result.OK("复制成功",itemsMap); } @ApiOperation(value = "文档拆分条款目录-批量复制节点不包括子节点Y") @PostMapping("/copyMenuNotChildrenall") - public Result> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids, + 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); @@ -131,22 +132,21 @@ public class SarFileSplitMenuEOController extends JeroController menuidslist =new ArrayList<>(); menuidslist = Arrays.asList(menuidss); - String infoIdss[] = infoIds.split(","); List infoIdslist =new ArrayList<>(); infoIdslist = Arrays.asList(infoIdss); - List sarFileSplitItemsEOS = new ArrayList<>(); + 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); // 同时复制目录下的条款 - sarFileSplitItemsEO = sarFileSplitItemsEOMapper.selectByPrimaryKey(sarFileSplitItemsEO.getId()); - sarFileSplitItemsEOS.add(sarFileSplitItemsEO); + itemsMap = fileSplitItemsEOService.selectByPrimaryKey(idlist.get(i)); + itemsMapList.add(itemsMap); } - return Result.OK("复制成功",sarFileSplitItemsEOS); + return Result.OK("复制成功",itemsMapList); } } 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 new file mode 100644 index 000000000..e806986c7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/FileSplitItemsEOMapper.java @@ -0,0 +1,58 @@ +package com.jero.modules.split.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.split.entity.SarFileSplitItemsEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @Author: liyawei + * @Description: 文档拆分条款表 + * @Date: Created in 9:40 2022/3/24 + */ +public interface FileSplitItemsEOMapper extends BaseMapper { + + int insertInfo(@Param("insertField") String insertField, + @Param("insertValue") String insertValue); + + /** + * 分页查询 + * + * @param field + * @param condition + * @return + */ + IPage getInfoPage(@Param("page") IPage page, + @Param("field") String field, + @Param("condition") String condition); + + + /** + * 列表查询 + * + * @param + * @param field + * @param condition + * @return + */ + List> getInfoList(@Param("field") String field, + @Param("condition") String condition); + + /** + * 根据id查询 + * @param value + * @return + */ + Map selectByPrimaryKey(String value); + + int deleteByPrimaryKey(String value); + + List> queryByItemsIds(@Param("idList") List idList); + + List> queryItemsByMenuId(@Param("menuId") String menuId); + + int deleteByItemsIdList(@Param("idList") List idList); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java index 34b887f17..e21347122 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitMenuEOMapper.java @@ -27,7 +27,7 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper List queryByPidExcpetSelf(SarFileSplitMenuEO sarFileSplitMenuEO); - int deleteByPId(@Param("id") String id); + int deleteByPId(@Param("idList") List idList); int getMaxDisplayByid(@Param("id") String id); @@ -67,4 +67,6 @@ public interface SarFileSplitMenuEOMapper extends BaseMapper int queryByCount(SarFileSplitMenuEOPage page); List queryByPage(SarFileSplitMenuEOPage page); + + List getAllChildrenId(String menuId); } 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 new file mode 100644 index 000000000..62bb174e8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -0,0 +1,67 @@ + + + + + + + insert into sar_file_split_items(${insertField}) + values (${insertValue}) + + + + + + + + + + + + + delete from sar_file_split_items + where id = #{value} + + + + + + + + + delete from SAR_FILE_SPLIT_ITEMS + where id in + + #{item} + + + 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 index 281350e76..178021192 100644 --- 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 @@ -310,7 +310,7 @@ and SAR_FILE_SPLIT_ITEMS.MENU_ID in ( SELECT m.id - FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{menuId})) AS pids ) t + FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{menuId})) AS pids ) t WHERE FIND_IN_SET( m.id, t.pids ) AND valid_flag = '0' @@ -321,12 +321,13 @@ select m.* - from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t + from SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t WHERE FIND_IN_SET( m.id, t.pids ) AND valid_flag = '0' AND id != #{id} - - delete from SAR_FILE_SPLIT_MENU where id in ( - SELECT m.id - FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t - WHERE - FIND_IN_SET( m.id, t.pids ) - AND valid_flag = '0' - ) + + delete from SAR_FILE_SPLIT_MENU where id in + + #{id} + SELECT count(*) - FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t + FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t WHERE FIND_IN_SET( m.id, t.pids ) AND valid_flag = '0' @@ -308,7 +305,7 @@ modify_user = #{modifyUser} where id in ( SELECT m.id - FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t + FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t WHERE FIND_IN_SET( m.id, t.pids ) AND valid_flag = '0' @@ -322,7 +319,7 @@ modify_user = #{modifyUser} where id in ( SELECT m.id - FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querysSplitMenuChildren (#{id})) AS pids ) t + FROM SAR_FILE_SPLIT_MENU m,( SELECT ( @nodes := querySplitMenuChildren (#{id})) AS pids ) t WHERE FIND_IN_SET( m.id, t.pids ) AND valid_flag = '0' @@ -331,7 +328,7 @@