From 00418b5ffad964aeaad25ed78e132723657a8536 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 1 Mar 2022 17:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E3=80=81?= =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E9=98=85=E3=80=82=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AE=89=E5=85=A8=E6=A0=A1=E9=AA=8C=E3=80=82=20?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E3=80=81=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OnlCgformCollectionController.java | 38 +++++- .../mapper/OnlCgformCollectionMapper.java | 4 + .../mapper/xml/OnlCgformCollectionMapper.xml | 24 ++++ .../service/IOnlCgformCollectionService.java | 7 ++ .../impl/OnlCgformCollectionServiceImpl.java | 105 +++++++++++++++- .../OnlCgformSubscribeController.java | 12 +- .../mapper/OnlCgformSubscribeMapper.java | 4 + .../mapper/xml/OnlCgformSubscribeMapper.xml | 25 ++++ .../service/IOnlCgformSubscribeService.java | 8 ++ .../impl/OnlCgformSubscribeServiceImpl.java | 112 +++++++++++++++++- .../controller/OnlCgformTagController.java | 12 +- 11 files changed, 331 insertions(+), 20 deletions(-) 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 32821a5f0..e5a512fad 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 @@ -52,6 +52,8 @@ public class OnlCgformCollectionController extends JeroController queryPageList(@RequestParam Map params){ + /* public Result queryPageList(OnlCgformCollection onlCgformCollection, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -59,6 +61,8 @@ public class OnlCgformCollectionController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(onlCgformCollection, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = onlCgformCollectionService.page(page, queryWrapper); + */ + IPage pageList = onlCgformCollectionService.queryPageList(params); return Result.OK(pageList); } @@ -67,6 +71,7 @@ public class OnlCgformCollectionController extends JeroController> list =onlCgformCollectionService.queryCondition(flag, cut); return Result.OK(list); } + */ /** * 查询条件中英文切换 * * @return */ + /* @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") @GetMapping(value = "/queryCondition") @@ -89,7 +96,7 @@ public class OnlCgformCollectionController extends JeroController> list = onlCgformCollectionService.queryCondition(flag, cut); return Result.OK(list); } - + */ /** * 列表查询 * @@ -170,4 +177,33 @@ public class OnlCgformCollectionController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformCollectionService.getHeader(flag, cut); + return Result.OK(list); + } + + /** + * 查询条件中英文切换 + * + * @return + */ + @AutoLog(value = "我的收藏-查询条件中英文切换") + @ApiOperation(value="我的收藏-查询条件中英文切换", notes="我的收藏-查询条件中英文切换") + @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); + } } 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 03d9add50..c32719cb8 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 @@ -1,11 +1,13 @@ package com.jero.modules.collection.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.collection.entity.OnlCgformCollection; import org.apache.ibatis.annotations.Select; import org.springframework.data.repository.query.Param; import java.util.List; +import java.util.Map; /** * @Description: 我的收藏 @@ -18,4 +20,6 @@ public interface OnlCgformCollectionMapper extends BaseMapper queryListByDocumentId(@Param("document_id") String document_id); + + IPage queryPageList(IPage page,@Param("params") Map params); } 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 1ba10c62b..8bee10736 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 @@ -10,4 +10,28 @@ + + \ 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 1e32fa0b9..4c4898c27 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 @@ -1,5 +1,6 @@ package com.jero.modules.collection.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.collection.entity.OnlCgformCollection; @@ -69,4 +70,10 @@ public interface IOnlCgformCollectionService extends IService> queryCondition(String flag, String cut); + /** + * 分页查询 + * @param params + * @return + */ + IPage queryPageList(Map params); } 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 06b4295d5..2734ed376 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,17 +1,28 @@ package com.jero.modules.collection.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; 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.ocr.util.LineHumpUtil; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -27,6 +38,8 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl ids) { + for (String id : ids) { + boolean checkData = checkData(id); + if(!checkData){ + throw new JeroBootException("该用户没有权限！"); + } + } removeByIds(ids); } @@ -72,6 +95,10 @@ public class OnlCgformCollectionServiceImpl 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()); + //过滤列表字段(is_show_list-->列表是否显示0否 1是) 过滤出需要的表头字段 + fieldList = fieldList.stream().filter( + e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList())) + && ( + e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") + ||e.getDbFieldEnName().equals("state") + ) + ).collect(Collectors.toList()); } List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { @@ -129,8 +162,14 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl> 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()); + //过滤出需要的搜索条件() + fieldList = fieldList.stream().filter( + e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery())) + && ( + e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") + ||e.getDbFieldEnName().equals("state") + ) + ).collect(Collectors.toList()); } List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { @@ -147,4 +186,62 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl queryPageList(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + params.put("createBy",sysUser.getUsername()); + IPage result = onlCgformCollectionMapper.queryPageList(page,params); + List> records = result.getRecords(); + dataDispose(records); + return result; + } + + public void dataDispose(List> datas){ + if(CollectionUtils.isNotEmpty(datas)){ + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //获取所有文本状态数据字典 + List stateList = sysDictItems.stream() + .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals("file_type")) + .collect(Collectors.toList()); + SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + for (Map data : datas) { + Date createTime = (Date) data.get("createTime"); + data.put("createTime",sdf.format(createTime)); + String state = (String) data.get("state"); + for (SysDictItem sysDictItem : stateList) { + if(StringUtils.equals(state,sysDictItem.getItemValue())){ + data.put("state",sysDictItem.getItemText()); + break; + } + } + } + } + } + + /** + * 验证数据 + * @param id + * @return + */ + public boolean checkData(String id){ + boolean result = false; + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OnlCgformCollection::getId,id); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.lambda().eq(OnlCgformCollection::getCreateBy,sysUser.getUsername()); + Integer integer = onlCgformCollectionMapper.selectCount(queryWrapper); + if(integer>0){ + result = true; + } + }catch (Exception ex){ + log.error("验证我的收藏数据异常：" + ex.getMessage()); + throw new JeroBootException("验证我的收藏数据异常！"); + } + return result; + } } \ 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 c94c21906..2b6a46c06 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 @@ -51,6 +51,8 @@ public class OnlCgformSubscribeController extends JeroController queryPageList(@RequestParam Map params) { + /* public Result queryPageList(OnlCgformSubscribe onlCgformSubscribe, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -58,6 +60,8 @@ public class OnlCgformSubscribeController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(onlCgformSubscribe, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = onlCgformSubscribeService.page(page, queryWrapper); + */ + IPage pageList = onlCgformSubscribeService.queryPageList(params); return Result.OK(pageList); } @@ -66,8 +70,8 @@ public class OnlCgformSubscribeController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { @@ -80,8 +84,8 @@ public class OnlCgformSubscribeController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { 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 cc41d3b55..e453fd655 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,11 +1,13 @@ package com.jero.modules.subscribe.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import org.apache.ibatis.annotations.Select; import org.springframework.data.repository.query.Param; import java.util.List; +import java.util.Map; /** * @Description: 我的订阅 @@ -17,4 +19,6 @@ 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); + + IPage queryPageList(IPage page, @Param("params") Map params); } 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 5def5b8aa..bafb9b1bb 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 @@ -10,4 +10,29 @@ + + \ 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 4465ad15b..fadbbd08d 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 @@ -1,5 +1,6 @@ package com.jero.modules.subscribe.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -75,4 +76,11 @@ public interface IOnlCgformSubscribeService extends IService * @return */ public List> queryCondition(String flag, String cut); + + /** + * 分页查询 + * @param params + * @return + */ + IPage queryPageList(Map params); } 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 5038039f1..19e503915 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,17 +1,28 @@ package com.jero.modules.subscribe.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; 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 com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -27,7 +38,8 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl ids) { + ids.forEach(id -> { + boolean checkData = checkData(id); + if(!checkData){ + throw new JeroBootException("该用户没有权限！"); + } + }); removeByIds(ids); } @@ -85,6 +111,10 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl 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()); - } + fieldList = fieldList.stream().filter( + e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery())) + && ( + e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") + ||e.getDbFieldEnName().equals("state") + ) + ).collect(Collectors.toList()); } List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -143,8 +178,13 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { //过滤出搜索条件() - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); - } + fieldList = fieldList.stream().filter( + e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery())) + && ( + e.getDbFieldEnName().equals("serial_number")||e.getDbFieldEnName().equals("title") + ||e.getDbFieldEnName().equals("state") + ) + ).collect(Collectors.toList()); } List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -160,4 +200,66 @@ public class OnlCgformSubscribeServiceImpl extends ServiceImpl queryPageList(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + params.put("createBy",sysUser.getUsername()); + IPage result = onlCgformSubscribeMapper.queryPageList(page,params); + List> records = result.getRecords(); + dataDispose(records); + return result; + } + + /** + * 验证数据 + * @param id + * @return + */ + public boolean checkData(String id){ + boolean result = false; + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(OnlCgformSubscribe::getId,id); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + queryWrapper.lambda().eq(OnlCgformSubscribe::getCreateBy,sysUser.getUsername()); + Integer integer = onlCgformSubscribeMapper.selectCount(queryWrapper); + if(integer>0){ + result = true; + } + }catch (Exception ex){ + log.error("验证我的订阅数据异常：" + ex.getMessage()); + throw new JeroBootException("验证我的订阅数据异常！"); + } + return result; + } + + /** + * 数据处理 + * @param datas + */ + public void dataDispose(List> datas){ + if(CollectionUtils.isNotEmpty(datas)){ + List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + //获取所有文本状态数据字典 + List stateList = sysDictItems.stream() + .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals("file_type")) + .collect(Collectors.toList()); + SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); + for (Map data : datas) { + Date createTime = (Date) data.get("createTime"); + data.put("createTime",sdf.format(createTime)); + String state = (String) data.get("state"); + for (SysDictItem sysDictItem : stateList) { + if(StringUtils.equals(state,sysDictItem.getItemValue())){ + data.put("state",sysDictItem.getItemText()); + break; + } + } + } + } + } } \ No newline at end of file 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 f600adc26..eb38cc5f3 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 @@ -119,12 +119,12 @@ public class OnlCgformTagController extends JeroController add(@Validated @RequestBody OnlCgformTag onlCgformTag) { - Integer count=onlCgformTagService.queryExitData(onlCgformTag); - if (count > 0) { - onlCgformTag.setIsDelete(0); - } else { - onlCgformTagService.add(onlCgformTag); - } +// Integer count=onlCgformTagService.queryExitData(onlCgformTag); +// if (count > 0) { +// onlCgformTag.setIsDelete(0); +// } else { +// onlCgformTagService.add(onlCgformTag); +// } return Result.OK("添加成功！"); }