From 90e4a2a83d5f38b0340f2fcaf08d934aab63cada Mon Sep 17 00:00:00 2001 From: "707464720@qq.com" <707464720@qq.com> Date: Mon, 25 Mar 2024 17:52:09 +0800 Subject: [PATCH] =?UTF-8?q?add:1.=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=89=8D=E7=AB=AF=E8=8F=9C=E5=8D=95=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=88=97=E8=A1=A8=202.=E6=A0=B9=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E9=87=8D=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=B0=E5=BD=93=E5=89=8D=E6=9F=A5=E9=87=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/xiaoyao/common/base/vo/User.java | 3 + .../xiaoyao/admin/dataDao/SFrontmenuTDao.java | 20 ++++++ .../xiaoyao/admin/dataobject/SFrontmenuT.java | 61 +++++++++++++++++++ .../jyjz/xiaoyao/admin/dataobject/User.java | 4 ++ .../admin/service/ISFrontmenuTService.java | 19 ++++++ .../service/impl/SFrontmenuTServiceImpl.java | 34 +++++++++++ .../admin/service/impl/UserServiceImpl.java | 8 +++ .../mapper/admin/SFrontmenuTMapper.xml | 32 ++++++++++ .../OcrCheckDuplicateController.java | 33 +++++++++- .../IOcrCheckDuplicateResultService.java | 3 + .../service/IOcrCheckDuplicateService.java | 3 + .../OcrCheckDuplicateResultServiceImpl.java | 33 ++++++++++ .../impl/OcrCheckDuplicateServiceImpl.java | 33 +++++++--- 13 files changed, 275 insertions(+), 11 deletions(-) create mode 100644 jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/SFrontmenuTDao.java create mode 100644 jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/SFrontmenuT.java create mode 100644 jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/ISFrontmenuTService.java create mode 100644 jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/SFrontmenuTServiceImpl.java create mode 100644 jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/SFrontmenuTMapper.xml diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/User.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/User.java index b3a8596c..8ef4f310 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/User.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/User.java @@ -129,6 +129,9 @@ public class User implements java.io.Serializable { //存放其他平台关联用户的对象信息 private List oauthUserList = new ArrayList(0); + //前端菜单展示列表权限 + private List frontmenuTList = new ArrayList<>(); + public UserToken getFormatUserToken(){ //初始化登录用户信息 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/SFrontmenuTDao.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/SFrontmenuTDao.java new file mode 100644 index 00000000..6f5de7d7 --- /dev/null +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/SFrontmenuTDao.java @@ -0,0 +1,20 @@ +package cn.jyjz.xiaoyao.admin.dataDao; + +import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 前端菜单表 Mapper 接口 + *

+ * + * @author author + * @since 2024-03-25 + */ +@Mapper +public interface SFrontmenuTDao extends BaseMapper { + + List queryUserMenuById(String loginName); +} diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/SFrontmenuT.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/SFrontmenuT.java new file mode 100644 index 00000000..b3ee388d --- /dev/null +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/SFrontmenuT.java @@ -0,0 +1,61 @@ +package cn.jyjz.xiaoyao.admin.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 前端菜单表 + *

+ * + * @author author + * @since 2024-03-25 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("s_frontmenu_t") +@ApiModel(value="SFrontmenuT对象", description="前端菜单表") +public class SFrontmenuT implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键ID") + @TableId(value = "id", type = IdType.NONE) + private Long id; + + @ApiModelProperty(value = "菜单名") + private String name; + + @ApiModelProperty(value = "父级菜单ID") + private Integer parentId; + + @ApiModelProperty(value = "资源标识唯一KEY") + private String resKey; + + @ApiModelProperty(value = "菜单地址") + private String resUrl; + + @ApiModelProperty(value = "菜单级别") + private Integer level; + + @ApiModelProperty(value = "菜单图标") + private String icon; + + @ApiModelProperty(value = "菜单排序") + private Integer orderNum; + + @ApiModelProperty(value = "菜单是否隐藏（0:否,1:是）") + private Integer ishide; + + @ApiModelProperty(value = "菜单描述") + private String description; + +} diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java index fd35ab63..fcc63e3c 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java @@ -178,6 +178,10 @@ public class User implements BaseDto,java.io.Serializable { @TableField(exist = false) private List deptlist = new ArrayList(0); + //前端菜单展示列表权限 + @TableField(exist = false) + private List frontmenuTList = new ArrayList<>(); + public UserToken getUserToken(){ UserToken userToken = BeanUtil.copyProperties(this,UserToken.class); diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/ISFrontmenuTService.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/ISFrontmenuTService.java new file mode 100644 index 00000000..fa673140 --- /dev/null +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/ISFrontmenuTService.java @@ -0,0 +1,19 @@ +package cn.jyjz.xiaoyao.admin.service; + +import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + *

+ * 前端菜单表 服务类 + *

+ * + * @author author + * @since 2024-03-25 + */ +public interface ISFrontmenuTService extends IService { + + List queryUserMenuById(String loginName); + +} diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/SFrontmenuTServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/SFrontmenuTServiceImpl.java new file mode 100644 index 00000000..957c4639 --- /dev/null +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/SFrontmenuTServiceImpl.java @@ -0,0 +1,34 @@ +package cn.jyjz.xiaoyao.admin.service.impl; +import cn.jyjz.xiaoyao.admin.dataDao.SFrontmenuTDao; +import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT; +import cn.jyjz.xiaoyao.admin.service.ISFrontmenuTService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import javax.annotation.Resource; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + *

+ * 前端菜单表 服务实现类 + *

+ * + * @author author + * @since 2024-03-25 + */ +@Service +@Slf4j +public class SFrontmenuTServiceImpl extends ServiceImpl implements ISFrontmenuTService { + + @Resource + private SFrontmenuTDao sFrontmenuTDao; + + @Override + public List queryUserMenuById(String loginName){ + List sFrontmenuTList = sFrontmenuTDao.queryUserMenuById(loginName); + + return sFrontmenuTList; + } + +} diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java index 717e0f19..6ac4f6b5 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java @@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.admin.dataDao.UserobjectMybatisDao; import cn.jyjz.xiaoyao.admin.dataDao.UserpostMybatisDao; import cn.jyjz.xiaoyao.admin.dataDao.UserrolesMybatisDao; import cn.jyjz.xiaoyao.admin.dataobject.*; +import cn.jyjz.xiaoyao.admin.service.ISFrontmenuTService; import cn.jyjz.xiaoyao.admin.service.UserService; import cn.jyjz.xiaoyao.admin.service.UserTenantService; import cn.jyjz.xiaoyao.common.base.config.XiaoyaoConfig; @@ -77,6 +78,10 @@ public class UserServiceImpl extends BaseServiceImpl imple @Resource private UserTenantService userTenantService; + + @Resource + private ISFrontmenuTService isFrontmenuTService; + /** * 根据登录账号查询用户信息 * @param loginname 登录账号 @@ -102,6 +107,9 @@ public class UserServiceImpl extends BaseServiceImpl imple user.formatDeptlist(departmentList); user.setTenantList(this.userTenantService.listUserTenant(user.getId())); + //返回用户前端菜单权限列表 + List frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname()); + user.setFrontmenuTList(frontmenuTList1); return user; } /** diff --git a/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/SFrontmenuTMapper.xml b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/SFrontmenuTMapper.xml new file mode 100644 index 00000000..3127c666 --- /dev/null +++ b/jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/SFrontmenuTMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + id, `name`, parentId, resKey, resUrl, `level`, icon, orderNum, ishide, description + + + + \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java index 431cd0f4..925c72be 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java @@ -1,17 +1,23 @@ package cn.jyjz.xiaoyao.ocr.controller; +import cn.hutool.core.collection.CollUtil; import cn.jyjz.xiaoyao.common.base.service.UserTokenService; import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService; import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateService; import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.util.DataUtil; import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -22,6 +28,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -86,9 +93,6 @@ public class OcrCheckDuplicateController { } } - //取消查重任务接口 - - @ApiOperation(value = "获取查重任务接口异步状态", notes = "获取查重任务接口异步状态") @GetMapping("/getCheckDuplicateStatus") @ResponseBody @@ -154,4 +158,27 @@ public class OcrCheckDuplicateController { } return ResultVoUtil.error("取消任务失败!"); } + + @ApiOperation(value = "查重图片分页列表查询", notes = "根据查重任务编号，返回查重任务图片结果") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true), + @ApiImplicitParam(paramType = "path", name = "checkDuplicateNo", value = "查重任务编号", dataType = "String", required = true) + }) + @GetMapping(value = "/queryPageListByCheckNo") + public ResultVo> queryPageListByCheckNo(@RequestParam(name = "checkDuplicateNo") String checkDuplicateNo, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + //租户主键，由前端页面传送 + String tenantId = req.getHeader("X-Tenant-Id"); + if (StringUtils.isBlank(tenantId)) { + return ResultVoUtil.error("租户主键不能为空"); + } + + IPage pageList = ocrCheckDuplicateService.queryPageListByCheckNo(checkDuplicateNo,tenantId,pageNo,pageSize); + + return ResultVoUtil.success(pageList); + } + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateResultService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateResultService.java index 629aa048..e20c014a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateResultService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateResultService.java @@ -3,6 +3,8 @@ package cn.jyjz.xiaoyao.ocr.service; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** *

* 服务类 @@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IOcrCheckDuplicateResultService extends IService { + List selectListByCheckDuplicateNo(String checkDuplicateNo, String tenantId); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java index 13dde09e..b405c1e8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java @@ -4,6 +4,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate; import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; @@ -63,4 +64,6 @@ public interface IOcrCheckDuplicateService extends IService { * @return */ OcrCheckDuplicate queryByCheckDuplicateNo(String checkDuplicateNo, Long tenantId); + + IPage queryPageListByCheckNo(String checkDuplicateNo, String tenantId, Integer pageNo, Integer pageSize); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateResultServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateResultServiceImpl.java index 209ad533..47c5c1b8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateResultServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateResultServiceImpl.java @@ -1,11 +1,18 @@ package cn.jyjz.xiaoyao.ocr.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDuplicateMapper; import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDuplicateResultMapper; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult; import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; + /** *

* 服务实现类 @@ -17,4 +24,30 @@ import org.springframework.stereotype.Service; @Service public class OcrCheckDuplicateResultServiceImpl extends ServiceImpl implements IOcrCheckDuplicateResultService { + + @Resource + private OcrCheckDuplicateResultMapper checkDuplicateResultMapper; + + @Resource + private OcrCheckDuplicateMapper ocrCheckDuplicateMapper; + + @Override + public List selectListByCheckDuplicateNo(String checkDuplicateNo, String tenantId) { + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("tenant_id", tenantId); + queryWrapper1.eq("check_duplicate_no", checkDuplicateNo); + + OcrCheckDuplicate ocrCheckDuplicate = ocrCheckDuplicateMapper.selectOne(queryWrapper1); + if(ObjectUtil.isNull(ocrCheckDuplicate)){ + return null; + } + + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("check_duplicate_id", ocrCheckDuplicate.getId()); + List list = checkDuplicateResultMapper.selectList(queryWrapper); + return list; + } + + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java index 9fd25b1d..ec70f7ae 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java @@ -2,8 +2,6 @@ package cn.jyjz.xiaoyao.ocr.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; -import cn.hutool.json.JSONUtil; -import cn.jyjz.xiaoyao.admin.dataobject.User; import cn.jyjz.xiaoyao.admin.service.LogService; import cn.jyjz.xiaoyao.common.base.exception.CommonExceptionCodeEnum; import cn.jyjz.xiaoyao.common.base.exception.ServiceException; @@ -13,7 +11,6 @@ import cn.jyjz.xiaoyao.common.base.util.StringUtils; import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; import cn.jyjz.xiaoyao.common.base.vo.UserToken; -import cn.jyjz.xiaoyao.common.redis.cache.ehcache.EhCacheTask; import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDuplicateMapper; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate; import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult; @@ -24,12 +21,10 @@ import cn.jyjz.xiaoyao.ocr.util.HashCompareUtil; import cn.jyjz.xiaoyao.ocr.util.ImageClassUtil; import com.alibaba.fastjson.JSONObject; 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.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.SneakyThrows; -import lombok.extern.log4j.Log4j; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +36,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; import java.util.*; -import java.util.function.Function; /** *

@@ -395,4 +389,27 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl queryPageListByCheckNo(String checkDuplicateNo, String tenantId, Integer pageNo, Integer pageSize){ + + QueryWrapper queryWrapper = new QueryWrapper<>(); + List ocrCheckDuplicateResults = checkDuplicateResultService.selectListByCheckDuplicateNo(checkDuplicateNo, tenantId); + //调用查询参数解析方法，解析为queryWrapper + List picIdList = new ArrayList<>(); + if(CollUtil.isNotEmpty(ocrCheckDuplicateResults)){ + for (OcrCheckDuplicateResult ocrCheckDuplicateResult : ocrCheckDuplicateResults) { + picIdList.add(ocrCheckDuplicateResult.getPictureId()); + } + } + + queryWrapper.in("id",picIdList); + queryWrapper.eq("tenant_id", tenantId); + + //分页返回图片信息 + Page page = new Page(pageNo, pageSize); + IPage pageList = pictureService.page(page, queryWrapper); + + return pageList; + } + }