From bc8e8c3f2a5e8d42d46b60e7cd9ee23bd22116af Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 24 Feb 2022 20:33:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85+=E6=94=B6=E8=97=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/enums/ModuleEnum.java | 6 +- .../jero/common/constant/enums/TableEnum.java | 6 +- .../impl/OnlCgformFieldServiceImpl.java | 15 +- .../system/controller/SysDictController.java | 55 +++++--- .../OnlCgformCollectionController.java | 52 ++++--- .../entity/OnlCgformCollection.java | 17 ++- .../mapper/OnlCgformCollectionMapper.java | 7 + .../mapper/xml/OnlCgformCollectionMapper.xml | 6 +- .../service/IOnlCgformCollectionService.java | 27 ++-- .../impl/OnlCgformCollectionServiceImpl.java | 126 ++++++++++++----- .../OnlCgformSubscribeController.java | 34 ++++- .../mapper/OnlCgformSubscribeMapper.java | 13 +- .../mapper/xml/OnlCgformSubscribeMapper.xml | 4 - .../service/IOnlCgformSubscribeService.java | 19 ++- .../impl/OnlCgformSubscribeServiceImpl.java | 130 ++++++++++++++---- .../controller/OnlCgformAreaController.java | 30 ++++ .../controller/OnlCgformTagController.java | 29 ++++ .../modules/tag/entity/OnlCgformArea.java | 5 - .../tag/mapper/xml/OnlCgformTagMapper.xml | 1 + .../tag/service/IOnlCgformAreaService.java | 19 +++ .../tag/service/IOnlCgformTagService.java | 17 +++ .../impl/OnlCgformAreaServiceImpl.java | 77 ++++++++++- .../service/impl/OnlCgformTagServiceImpl.java | 75 +++++++++- 23 files changed, 620 insertions(+), 150 deletions(-) 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 05c0a08af..5067695ea 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 @@ -7,7 +7,11 @@ package com.jero.common.constant.enums; */ public enum ModuleEnum { DOCUMENT_LIBRARY("文档管理","1"), - OCR_RECORD("OCR识别转换记录表","2"); + OCR_RECORD("OCR识别转换记录表","2"), + ONL_CGFORM_TAG("标签项管理","3"), + ONL_CGFORM_AREA("展示区域管理","4"), + ONL_CGFORM_COLLECTION("我的收藏","5"), + ONL_CGFORM_SUBSCRIBE("我的订阅","6"); String name; 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 5c7e30faf..b135912e4 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 @@ -7,7 +7,11 @@ package com.jero.common.constant.enums; */ public enum TableEnum { BUSS_DOCUMENT_LIBRARY("buss_document_library"), - OCR_RECORD("ocr_record"); + OCR_RECORD("ocr_record"), + TAG("onl_cgform_tag"), + TAG_AREA("onl_cgform_area"), + ONL_CGFORM_COLLECTION("onl_cgform_collection"), + ONL_CGFORM_SUBSCRIBE("onl_cgform_subscribe"); String table; 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 1efc26e34..f294f26ae 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 @@ -818,13 +818,22 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl add(@RequestBody SysDict sysDict) { Result result = new Result(); try { - sysDict.setCreateTime(new Date()); - sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); - sysDictService.save(sysDict); - result.success("保存成功！"); - //添加成功后需要刷新缓存 - sysDictService.refreshCache(); + /*if (StringUtils.isNotBlank(sysDict.getDictCode())) { + if(sysDict.getIsTagDict()==1){ + sysDict.setDictEnName(sysDict.getDictCode().replace("_", " ")); + sysDict.setDictCode(sysDict.getDictEnName().replace(" ", "_")); + } + }*/ + if(StringUtils.isEmpty(sysDict.getDictCode())){ + //result.error500("字典Code不能为空"); + sysDict.setDictCode(sysDict.getDictName()); + }else { + sysDict.setCreateTime(new Date()); + sysDict.setDelFlag(CommonConstant.DEL_FLAG_0); + + sysDictService.save(sysDict); + result.success("保存成功！"); + //添加成功后需要刷新缓存 + sysDictService.refreshCache(); + } } catch (Exception e) { log.error(e.getMessage(),e); result.error500("操作失败"); @@ -365,19 +377,24 @@ public class SysDictController { SysDict sysdict = sysDictService.getById(sysDict.getId()); if (sysdict == null) { result.error500("未找到对应实体"); - } - else { - if (sysDict.getIsReadOnly() == 1) { - result.error500("固定字段,不能修改"); - } - else{ - sysDict.setUpdateTime(new Date()); - boolean ok = sysDictService.updateById(sysDict); - if (ok) { - result.success("编辑成功!"); - //编辑成功后需要刷新缓存 - sysDictService.refreshCache(); - } + }else { + if (org.apache.commons.lang3.StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) { + /*if (sysDict.getIsReadOnly() == 1) { + result.error500("固定字段,不可删除"); + }else{*/ + /*if(sysDict.getIsTagDict() == 1) { + sysDict.setDictEnName(sysDict.getDictCode().replace("_", " ")); + } + else {*/ + sysDict.setUpdateTime(new Date()); + boolean ok = sysDictService.updateById(sysDict); + if (ok) { + result.success("编辑成功!"); + //编辑成功后需要刷新缓存 + sysDictService.refreshCache(); + } + //} + // } } } return result; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java index 128769466..b3e96d815 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java @@ -20,9 +20,10 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: 我的收藏 * @Author: jero-boot * @Date: 2022-02-15 @@ -36,7 +37,7 @@ public class OnlCgformCollectionController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformCollectionService.queryCondition(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") + @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") + @GetMapping(value = "/queryCondition") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = onlCgformCollectionService.queryCondition(flag, cut); + return Result.OK(list); + } + + /** * 列表查询 * * @return @@ -131,21 +160,4 @@ public class OnlCgformCollectionController extends JeroController queryDocumentById(@RequestParam(name="id",required=true) String documentId) { - OnlCgformCollection onlCgformCollection = onlCgformCollectionService.queryById(documentId); - if(onlCgformCollection==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(onlCgformCollection); - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java index d6c739c67..f7d254002 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/entity/OnlCgformCollection.java @@ -8,13 +8,13 @@ import com.jero.common.aspect.annotation.Dict; import com.jero.modules.document.entity.BussDocumentLibraryEO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.Date; /** @@ -28,7 +28,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="onl_cgform_collection对象", description="我的收藏") -public class OnlCgformCollection implements Serializable { +public class OnlCgformCollection extends BussDocumentLibraryEO implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -46,11 +46,15 @@ public class OnlCgformCollection implements Serializable { @ApiModelProperty(value = "收藏日期") private java.util.Date createTime; - /** 更新人*/ + /**更新人*/ + @ApiModelProperty(value = "更新人") private String updateBy; - /**更新时间*/ - private Date updateTime; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") @@ -59,5 +63,6 @@ public class OnlCgformCollection implements Serializable { /**文档库id*/ @Excel(name = "文档库id", width = 15, dictTable = "buss_document_library", dicText = "id", dicCode = "id") @Dict(dictTable = "buss_document_library", dicText = "id", dicCode = "id") + @ApiModelProperty(value = "文档库id") private String documentId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java index 907455e0c..13131eac5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/OnlCgformCollectionMapper.java @@ -2,6 +2,10 @@ package com.jero.modules.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.collection.entity.OnlCgformCollection; +import org.apache.ibatis.annotations.Select; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Description: 我的收藏 @@ -11,4 +15,7 @@ import com.jero.modules.collection.entity.OnlCgformCollection; */ public interface OnlCgformCollectionMapper extends BaseMapper { + @Select("select * from buss_document_library as document LEFT JOIN onl_cgform_collection\n" + + "as collection on document.id= collection.document_id;") + List queryListByDocumentId(@Param("document_id") String document_id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml index fd8e868f7..1ba10c62b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/mapper/xml/OnlCgformCollectionMapper.xml @@ -5,9 +5,9 @@ + + - - - + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java index 0862768ed..1e32fa0b9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/IOnlCgformCollectionService.java @@ -2,9 +2,9 @@ package com.jero.modules.collection.service; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.collection.entity.OnlCgformCollection; -import com.jero.modules.document.entity.BussDocumentLibraryEO; import java.util.List; +import java.util.Map; /** * @Description: 我的收藏 @@ -46,18 +46,27 @@ public interface IOnlCgformCollectionService extends IService queryList(OnlCgformCollection onlCgformCollection); + + /** + * 列表表头中英文切换 + * @param flag + * @param cut + * @return + */ + public List> getHeader(String flag, String cut); + + /** + * 查询条件中英文切换 + * @param flag + * @param cut + * @return + */ + public List> queryCondition(String flag, String cut); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java index 901218b2a..06b4295d5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java @@ -1,15 +1,19 @@ package com.jero.modules.collection.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +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.collection.entity.OnlCgformCollection; import com.jero.modules.collection.mapper.OnlCgformCollectionMapper; import com.jero.modules.collection.service.IOnlCgformCollectionService; -import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.ocr.util.LineHumpUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 我的收藏 @@ -19,6 +23,10 @@ import java.util.List; */ @Service public class OnlCgformCollectionServiceImpl extends ServiceImpl implements IOnlCgformCollectionService { + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + @Autowired + OnlCgformCollectionMapper onlCgformCollectionMapper; /** * 保存 @@ -27,11 +35,11 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -63,30 +71,80 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl queryList(OnlCgformCollection onlCgformCollection) { - LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(OnlCgformCollection::getCreateBy,onlCgformCollection.getCreateBy()); - return list(); - } -} + public List queryList(OnlCgformCollection onlCgformCollection) { + List list = onlCgformCollectionMapper.queryListByDocumentId(onlCgformCollection.getDocumentId()); + return list; + } + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if ("file_name".equals(onlCgformField.getDbFieldName())) { + //跳转详情的标识 + map.put("click", "true"); + } + //单独处理发布日期和标准实施日期 + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + 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; + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @Override + public List> queryCondition(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.getIsQuery()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + 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; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java index 2286b20c5..2f9fa92e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/controller/OnlCgformSubscribeController.java @@ -21,9 +21,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: 我的订阅 * @Author: jero-boot * @Date: 2022-02-23 @@ -59,6 +60,33 @@ public class OnlCgformSubscribeController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformSubscribeService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") + @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") + @GetMapping(value = "/queryCondition") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = onlCgformSubscribeService.queryCondition(flag, cut); + return Result.OK(list); + } /** * 列表查询 * @@ -67,8 +95,8 @@ public class OnlCgformSubscribeController extends JeroController> queryList() { - List list = onlCgformSubscribeService.queryList(); + public Result> queryList(OnlCgformSubscribe onlCgformSubscribe) { + List list = onlCgformSubscribeService.queryList(onlCgformSubscribe); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java index 100892a4a..cc41d3b55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/OnlCgformSubscribeMapper.java @@ -1,10 +1,11 @@ package com.jero.modules.subscribe.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.subscribe.entity.OnlCgformSubscribe; +import org.apache.ibatis.annotations.Select; +import org.springframework.data.repository.query.Param; + +import java.util.List; /** * @Description: 我的订阅 @@ -13,5 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface OnlCgformSubscribeMapper extends BaseMapper { - + @Select("select * from buss_document_library as document LEFT JOIN onl_cgform_subscribe\n" + + "as subscribe on document.id= subscribe.document_id;") + List queryListByDocumentId(@Param("document_id") String document_id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml index 9ea4e8ad1..5def5b8aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/mapper/xml/OnlCgformSubscribeMapper.xml @@ -9,9 +9,5 @@ - - - - \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java index 90378406e..4465ad15b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/IOnlCgformSubscribeService.java @@ -3,6 +3,7 @@ package com.jero.modules.subscribe.service; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 我的订阅 @@ -57,5 +58,21 @@ public interface IOnlCgformSubscribeService extends IService * * @return */ - List queryList(); + List queryList(OnlCgformSubscribe onlCgformSubscribe); + + /** + * 列表表头中英文切换 + * @param flag + * @param cut + * @return + */ + public List> getHeader(String flag, String cut); + + /** + * 查询条件中英文切换 + * @param flag + * @param cut + * @return + */ + public List> queryCondition(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java index af780be56..5038039f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/subscribe/service/impl/OnlCgformSubscribeServiceImpl.java @@ -1,12 +1,19 @@ package com.jero.modules.subscribe.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +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.ocr.util.LineHumpUtil; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.mapper.OnlCgformSubscribeMapper; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 我的订阅 @@ -16,6 +23,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class OnlCgformSubscribeServiceImpl extends ServiceImpl implements IOnlCgformSubscribeService { + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + @Autowired + private OnlCgformSubscribeMapper onlCgformSubscribeMapper; /** * 保存 @@ -24,12 +35,12 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -73,17 +84,80 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl queryList() { - return list(); - } -} + public List queryList(OnlCgformSubscribe onlCgformSubscribe) { + List list = onlCgformSubscribeMapper.queryListByDocumentId(onlCgformSubscribe.getDocumentId()); + return list; + } + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if ("file_name".equals(onlCgformField.getDbFieldName())) { + //跳转详情的标识 + map.put("click", "true"); + } + //单独处理发布日期和标准实施日期 + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + 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; + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @Override + public List> queryCondition(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.getIsQuery()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + 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; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index f35389933..b77a58ff8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** @@ -60,6 +61,34 @@ public class OnlCgformAreaController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformAreaService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") + @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") + @GetMapping(value = "/queryCondition") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = onlCgformAreaService.queryCondition(flag, cut); + return Result.OK(list); + } + /** * 列表查询 * @@ -72,6 +101,7 @@ public class OnlCgformAreaController extends JeroController list = onlCgformAreaService.queryList(onlCgformArea); return Result.OK(list); } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index f42a37177..b9d10855b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** @@ -66,6 +67,34 @@ public class OnlCgformTagController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformTagService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") + @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") + @GetMapping(value = "/queryCondition") + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = onlCgformTagService.queryCondition(flag, cut); + return Result.OK(list); + } + /** * 列表查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index f8bf32138..358cab53d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -79,9 +79,4 @@ public class OnlCgformArea implements Serializable { @Excel(name = "排序号", width = 15) @ApiModelProperty(value = "排序号") private java.lang.Integer sort; - - //TODO 定义@data后不需要再重写get/set方法 - public void setShowArea(String showArea) { - this.showArea = showArea; - } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml index 69de4da41..d713e8d03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml @@ -20,6 +20,7 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 63a1a1e68..b875e4608 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.tag.entity.OnlCgformArea; import java.util.List; +import java.util.Map; /** * @Description: 区域管理表 @@ -59,12 +60,14 @@ public interface IOnlCgformAreaService extends IService { * @return */ List queryList(OnlCgformArea onlCgformArea); + /** * 查询展示区域 * * @return */ List queryShowArea(OnlCgformArea onlCgformArea); + /** * 展示区域查询 * @@ -72,4 +75,20 @@ public interface IOnlCgformAreaService extends IService { * @return */ List selectShowAreaById(String id); + + /** + * 列表表头中英文切换 + * @param flag + * @param cut + * @return + */ + public List> getHeader(String flag, String cut); + + /** + * 查询条件中英文切换 + * @param flag + * @param cut + * @return + */ + public List> queryCondition(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index 53cdaafde..46a46c20e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -6,6 +6,7 @@ import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import java.util.List; +import java.util.Map; /** * @Description: 标签管理 @@ -76,4 +77,20 @@ public interface IOnlCgformTagService extends IService { * @return */ Result queryExitData(OnlCgformTag onlCgformTag) ; + + /** + * 列表表头中英文切换 + * @param flag + * @param cut + * @return + */ + public List> getHeader(String flag, String cut); + + /** + * 查询条件中英文切换 + * @param flag + * @param cut + * @return + */ + public List> queryCondition(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 17b7d6068..9d6fff918 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -3,14 +3,20 @@ package com.jero.modules.tag.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +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.ocr.util.LineHumpUtil; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.service.IOnlCgformAreaService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 区域管理表 @@ -20,7 +26,8 @@ import java.util.List; */ @Service public class OnlCgformAreaServiceImpl extends ServiceImpl implements IOnlCgformAreaService { - + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; /** * 保存 * @@ -119,4 +126,66 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl list=new QueryWrapper().select(id,"showArea"); return list(list); } -} + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if ("file_name".equals(onlCgformField.getDbFieldName())) { + //跳转详情的标识 + map.put("click", "true"); + } + //单独处理发布日期和标准实施日期 + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + 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; + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @Override + public List> queryCondition(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.getIsQuery()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + 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; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 68cedd385..fa92c1907 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -5,6 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.CutEnum; +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.ocr.util.LineHumpUtil; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; @@ -13,8 +18,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 标签管理 @@ -26,7 +31,8 @@ import java.util.List; public class OnlCgformTagServiceImpl extends ServiceImpl implements IOnlCgformTagService { @Autowired private OnlCgformTagMapper onlCgformTagMapper; - + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; /** * 保存 * @@ -132,4 +138,65 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if ("file_name".equals(onlCgformField.getDbFieldName())) { + //跳转详情的标识 + map.put("click", "true"); + } + //单独处理发布日期和标准实施日期 + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + 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; + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @Override + public List> queryCondition(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.getIsQuery()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) + map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 + 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; + } +} \ No newline at end of file