guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix:1.admin账号后台登录问题 2.可疑文件搜索返回相关字段信息TODO' (#41) from fix/dubious_file_2897 into test

Browse Source 
Reviewed-on: #41
pull/44/head
lili 1 year ago
parent 3db9b614d1 62c2223213
commit cd186235e4
5 changed files with 96 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java
Unescape View File

@ -130,7 +130,7 @@ public class MyAuthenticationProvider implements AuthenticationProvider {
}
boolean tenantStatus = userTokenService.getTenantStatus(agentcode);
if (!tenantStatus) {
if (!"admin".equals(loginname) && !tenantStatus) {
throw new AuthenticationServiceException("该租户已被冻结！");
}

21
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java
Unescape View File

@ -8,6 +8,7 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataobject.*;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -59,9 +60,15 @@ public class OcrTaskchildDubiousFileController {
*/
@RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET)
public ResultVo dubiousfilelist(HttpServletRequest request,
@RequestParam(value = "pageNo", required = false, defaultValue = "0") int pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
@RequestParam(value = "orderbyname", required = true, defaultValue = "0") String orderbyname) {
@RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
@RequestParam(value = "orderbyname", required = true, defaultValue = "desc") String orderbyname) {
String tenantId = request.getHeader("X-Tenant-Id");
if(StringUtils.isBlank(tenantId)){
return ResultVoUtil.error("租户主键不能为空");
}
UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@ -83,14 +90,10 @@ public class OcrTaskchildDubiousFileController {
wrapper.orderByAsc("create_time");
}
//执行查询方法
IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
//TODO
//Page<OcrTaskChildPictureVo> page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderbyname,userToken,tenantId);
return ResultVoUtil.success(page);
}

5
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java
Unescape View File

@ -1,7 +1,10 @@
package cn.jyjz.xiaoyao.ocr.service;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@ -14,4 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IOcrTaskchildDubiousFileService extends IService<OcrTaskchildDubiousFile> {
Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize, String orderbyname, UserToken userToken, String tenantId);
}

76
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java
Unescape View File

@ -1,11 +1,29 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.jyjz.flowable.common.ProcessConstant;
import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
import cn.jyjz.xiaoyao.common.base.vo.UserToken;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildDubiousFileMapper;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile;
import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService;
import cn.jyjz.xiaoyao.ocr.service.OcrPictureInfoService;
import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
* 可疑文件夹 服务实现类
@ -17,4 +35,62 @@ import org.springframework.stereotype.Service;
@Service
public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchildDubiousFileMapper, OcrTaskchildDubiousFile> implements IOcrTaskchildDubiousFileService {
@Resource
private OcrPictureInfoService pictureInfoService;
@Resource
private OcrTaskchildPictureService ocrTaskchildPictureService;
/**
* 分页查询可疑文件夹下的图片信息,并返回对应的状态，相似度，时间值等
* @param pageNo
* @param pageSize
* @param orderbyname
* @param userToken
* @param tenantId
* @return
*/
@Override
public Page<OcrTaskChildPictureVo> dubiousfilelist(Integer pageNo, Integer pageSize, String orderbyname, UserToken userToken, String tenantId) {
Page<OcrTaskChildPictureVo> objectPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize));
//获取可疑文件图片列表
QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
dubiouswrapper.eq("userid",userToken.getUserid());
dubiouswrapper.eq("tenantid",tenantId);
List<OcrTaskchildDubiousFile> list = this.list(dubiouswrapper);
if(list.size()==0){
return new Page<>();
}
//提取可疑图片列表id
List<String> pictureIdList = list.stream().map(i -> String.valueOf(i.getPictureId())).collect(Collectors.toList());
//获取图片历史对比表数据
String userNodeType = ProcessConstant.userNodeType.getOrDefault(userToken.getNodeType(), "一级审批");
List<OcrTaskChildPictureVo> taskChildPictures = ocrTaskchildPictureService.getPictureHistoryList(new ArrayList<>(pictureIdList), userNodeType);
// //获取图片比对结果分数，状态
// for (OcrTaskChildPictureVo taskChildPicture : taskChildPictures) {
//// taskChildPicture.setSimilarityScore(Integer.parseInt(jsonObject.getString(taskChildPicture.getPictureId().toString())));
// }
//按时间字段排序
if("desc".equals(orderbyname)){
taskChildPictures.stream().sorted(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate).reversed()).collect(Collectors.toList());
}else {
taskChildPictures.stream().sorted(Comparator.comparing(OcrTaskChildPictureVo::getCreateDate)).collect(Collectors.toList());
}
List<OcrTaskChildPictureVo> records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
for (OcrTaskChildPictureVo ocrTaskChildPictureVo : records) {
OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper<OcrPictureInfo>().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId()));
ocrTaskChildPictureVo.setPictureInfo(one);
}
objectPage.setRecords(records);
objectPage.setTotal(taskChildPictures.size());
return objectPage;
}
}

3
jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
Unescape View File

@ -590,7 +590,8 @@
t1.imgUrl,
ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp
t1.photo_date_timestamp photoDateTimestamp,
t1.similarity_score similarityScore
FROM ocr_picture t1
LEFT JOIN ocr_taskchild_picture t2
on t1.ID = t2.PICTUREID

Write Preview
Loading…
Cancel
Save