From d835c7dd6e461f3d0face7aa579d448b9efb146b Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Thu, 21 Mar 2024 16:24:01 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8E=92=E6=9F=A5=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8E=20=E6=8E=92=E5=BA=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20=E5=8E=9F=E5=9B=A0=E6=98=AF=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9=E5=AE=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E8=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/xiaoyao/ocr/controller/OcrBooknoteController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrBooknoteController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrBooknoteController.java index 1a15c87..e7acc30 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrBooknoteController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrBooknoteController.java @@ -117,6 +117,7 @@ public class OcrBooknoteController extends BaseController{ QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("CREATEUSER",userToken.getLoginname()); queryWrapper.eq("TENANTID",tenantId); + queryWrapper.orderByDesc("CREATEDATE"); List list = ocrBooknoteService.list(queryWrapper); if(null == list || list.isEmpty()){ From 42ba770547055b001fa2f5d0a254023d4ed1525c Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Thu, 21 Mar 2024 16:54:43 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyAuthenticationProvider.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java index c1a28bf..b2ca51e 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java @@ -88,8 +88,16 @@ public class MyAuthenticationProvider implements AuthenticationProvider { // //从缓存中删除验证码 // iCacheManager.remove(CacheConstants.CACHE_CODE,codetoken); - if(StringUtils.isBlank(loginname) || StringUtils.isBlank(password)){ - throw new AuthenticationServiceException("账号密码不正确"); +// if(StringUtils.isBlank(loginname) || StringUtils.isBlank(password)){ +// throw new AuthenticationServiceException("账号密码不正确"); +// } + + if(StringUtils.isBlank(loginname)){ + throw new AuthenticationServiceException("请输入账号!"); + } + + if(StringUtils.isBlank(password)){ + throw new AuthenticationServiceException("密码错误!"); } //判断验证码不能为空 @@ -102,12 +110,19 @@ public class MyAuthenticationProvider implements AuthenticationProvider { // throw new AuthenticationServiceException("验证码错误"); // } + //判断手机号与企业编码是否存在 +// if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ +// throw new AuthenticationServiceException("企业编码或账号错误"); +// } + //判断手机号与企业编码是否存在 if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ - throw new AuthenticationServiceException("企业编码或账号错误"); + throw new AuthenticationServiceException("企业编码错误！"); } - - + if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ + throw new AuthenticationServiceException("账号不存在！"); + } + //数据库查询用户对象 User user = userTokenService.findByLoginname(loginname); if(null == user){ From 11bdeeaea95d77658ebf39166857edbbacd89e9e Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Thu, 21 Mar 2024 19:48:03 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=81=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2-=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E3=80=81?= =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=9C=A8=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9=E6=8E=92?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/ocr/controller/OcrPictureController.java | 1 + .../controller/OcrTaskchildPictureController.java | 9 +++++++++ .../cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 12 +++++++----- .../ocr/service/impl/OcrPictureServiceImpl.java | 2 +- .../main/resources/mapper/oa/OcrPictureMapper.xml | 5 ++++- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java index 0760659..2b88a86 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java @@ -215,6 +215,7 @@ public class OcrPictureController extends BaseController { String search_month = req.getParameter("search_month"); String ordertype = req.getParameter("ordertype"); + queryWrapper.eq("suspiciousfile","0"); if (StringUtils.isNotBlank(ordertype)) { if (ordertype.equals("0")) { queryWrapper.orderByAsc("similarity_score"); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 4b95acf..0420e9a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -56,6 +56,7 @@ public class OcrTaskchildPictureController extends BaseController { @Resource private UserService userService; + /** * 方法描述：返回json字符串，接受参数，dto名称以及分页信息 * 创建人：mail.zhangyong@gmail.com @@ -169,6 +170,14 @@ public class OcrTaskchildPictureController extends BaseController { jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString()); return jsonObject; }).collect(Collectors.toList()); + for (JSONObject asd:collect){ + QueryWrapper imgWrapper = new QueryWrapper<>(); + imgWrapper.eq("id",asd.get("pictureid")); + OcrPicture one = ocrPictureService.getOne(imgWrapper); + if (one.getSuspiciousfile()!=0){ + collect.add(asd); + } + } IPage objects = new Page<>(); BeanUtils.copyProperties(page, objects); objects.setRecords(collect); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index fb7c0e4..b2175f6 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -338,6 +338,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "server_thumbnail_url") private String serverThumbnailUrl; + @ApiModelProperty(value = "可疑文件夹 0:不在，1：在") + @Schema(description = "可疑文件夹 0:不在，1：在") + @TableField(value = "suspiciousfile") + private Integer suspiciousfile; + //图片分类 @TableField(exist = false) private OcrPictureclass ocrPictureclass; @@ -347,10 +352,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @JsonIgnore private SearchQuery searchQueryrolesShowleave; - @ApiModelProperty(value = "提报日期时间戳") - @TableField(value = "submit_date_timestamp") - private Long submitDateTimestamp; - @TableField(exist = false) @JsonIgnore private final Map query = Stream.of( @@ -419,7 +420,8 @@ public class OcrPicture implements BaseDto, java.io.Serializable { new SimpleEntry<>("localpictrueurl", "localpictrueurl"), new SimpleEntry<>("imgHash", "imgHash"), new SimpleEntry<>("serverThumbnailUrl", "serverThumbnailUrl"), - new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl") + new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl"), + new SimpleEntry<>("suspiciousfile", "suspiciousfile") ) .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java index 4792cc8..1e88e7a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java @@ -754,7 +754,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper(); - + queryWrapper.eq("suspiciousfile","0"); for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) { this.formattingSearchChild(queryWrapper, usersearchchild); diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml index 96bf4ac..526db57 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml @@ -64,6 +64,7 @@ + ID AS id, @@ -127,7 +128,8 @@ field15 AS field15, field16 AS field16, field17 AS field17, - field18 AS field18 + field18 AS field18, + suspiciousfile AS suspiciousfile @@ -195,6 +197,7 @@ and field16 ${field16.dataOp} ${field16.likestar}#{field16.value}${field16.likeend} and field17 ${field17.dataOp} ${field17.likestar}#{field17.value}${field17.likeend} and field18 ${field18.dataOp} ${field18.likestar}#{field18.value}${field18.likeend} + and suspiciousfile ${suspiciousfile.dataOp} ${suspiciousfile.likestar}#{suspiciousfile.value}${suspiciousfile.likeend} From e6fd677957838d8da805c6351b4dec0e82deb880 Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Thu, 21 Mar 2024 20:55:16 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E8=A1=A5=E4=B8=8A=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index b2175f6..94dabec 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java @@ -338,6 +338,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "server_thumbnail_url") private String serverThumbnailUrl; + @ApiModelProperty(value = "提报日期时间戳") + @TableField(value = "submit_date_timestamp") + private Long submitDateTimestamp; + + @ApiModelProperty(value = "可疑文件夹 0:不在，1：在") @Schema(description = "可疑文件夹 0:不在，1：在") @TableField(value = "suspiciousfile") From 1f0acd7603a08e15879f26487058ee0bbb1ed63a Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Thu, 21 Mar 2024 21:09:34 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=85=A8=E6=96=87=E6=A3=80=E7=B4=A2bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/dataDao/OcrSearchHistoryMapper.java | 6 +++--- .../impl/OcrSearchHistoryServiceImpl.java | 18 ++++++++++++++--- .../mapper/oa/OcrSearchHistoryMapper.xml | 20 ++++++------------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java index 4a702bb..e0cb2e3 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java @@ -19,11 +19,11 @@ import java.util.Map; */ @Mapper public interface OcrSearchHistoryMapper extends BaseMapper { - List> selectsearch1(@Param("search")String search); + List> selectsearch1(@Param("userid")String userid,@Param("search")String search); - List> selectsearch2(@Param("search")String search); + List> selectsearch2(@Param("userid")String userid,@Param("search")String search); - List> selectsearch3(@Param("search")String search); + List> selectsearch3(@Param("userid")String userid,@Param("search")String search); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java index cc88273..da8232e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrSearchHistoryServiceImpl.java @@ -15,6 +15,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -38,9 +39,12 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>> selectsearch(String search, String assignee) { - List> strings1 = ocrsearchhistorymapper.selectsearch1(search); - List> strings2 = ocrsearchhistorymapper.selectsearch2(search); - List> strings3 = ocrsearchhistorymapper.selectsearch3(search); + + + + List> strings1 = ocrsearchhistorymapper.selectsearch1(assignee,search); + List> strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search); + List> strings3 = ocrsearchhistorymapper.selectsearch3(assignee,search); // List>>> list = new ArrayList<>(); @@ -119,6 +123,14 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl collect = Arrays.stream(cps) +// .map(Long::parseLong) +// .map(childpictureid -> this.ocrPictureService.selectDtoById(childpictureid)) +// .filter(ocrPicture->ocrPicture.getSimilarityscore() >= 90) +// +// .collect(Collectors.toList()); + + return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error(); } } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index 7c5aee4..bbbc263 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -16,23 +16,11 @@ + - + From 2362043c07dcf9a242e5ac3f41646eb7f196fb4f Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Thu, 21 Mar 2024 22:07:03 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyAuthenticationProvider.java | 1 + .../OcrTaskchildDubiousFileController.java | 157 ++++++++++++++++++ .../OcrTaskchildDubiousFileMapper.java | 19 +++ .../dataobject/OcrTaskchildDubiousFile.java | 117 +++++++++++++ .../IOcrTaskchildDubiousFileService.java | 17 ++ .../OcrTaskchildDubiousFileServiceImpl.java | 20 +++ .../oa/OcrTaskchildDubiousFileMapper.xml | 20 +++ 7 files changed, 351 insertions(+) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildDubiousFileMapper.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildDubiousFile.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildDubiousFileMapper.xml diff --git a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java index b2ca51e..0732359 100644 --- a/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java +++ b/jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java @@ -119,6 +119,7 @@ public class MyAuthenticationProvider implements AuthenticationProvider { if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ throw new AuthenticationServiceException("企业编码错误！"); } + if(!"admin".equals(loginname) && userTokenService.listCount(agentcode,loginname).intValue() <= 0){ throw new AuthenticationServiceException("账号不存在！"); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java new file mode 100644 index 0000000..e8fd14b --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -0,0 +1,157 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +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.*; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestParam; +import javax.servlet.http.HttpServletRequest; +import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * ocr控制器 + * + * @author 你的肉 + * @Date 2024-03-21 19:00:57 + */ +@RestController +@RequestMapping("/ocr/dubiousfile") +public class OcrTaskchildDubiousFileController { + + + @Autowired + private IOcrTaskchildDubiousFileService ocrTaskchildDubiousFileService; + + @Autowired + private UserTokenService userTokenService; + + @Autowired + OcrTaskchildPictureService ocrtaskchildpictureservice; + + @Autowired + OcrPictureService ocrpictureservice; + +// /** +// * 分页查询 +// * @param request +// * @param start 起始页 +// * @param limit 每页显示多少条 默认10 条 +// * @return +// */ +// @RequestMapping(value = "", method = RequestMethod.GET) +// public ResponseEntity list(HttpServletRequest request, +// @RequestParam(value = "start", required = false, defaultValue = "0") int start, +// @RequestParam(value = "limit", required = false, defaultValue = "10") int limit) { +// //条件查询 +// EntityWrapper entityWrapper = new EntityWrapper(); +// //执行查询方法 +// Page pageVO = ocrTaskchildDubiousFileService.selectPage(new Page(start, limit), entityWrapper); +// return new ResponseEntity(pageVO, HttpStatus.OK); +// } + + +// /** +// * 通过ID 删除 +// * @param request +// * @param id +// * @return +// */ +// @RequestMapping(value = "", method = RequestMethod.DELETE) +// public ResponseEntity deleteById(HttpServletRequest request, @PathVariable("id") Integer id) { +// //获取用户信息 +// User user = userService.getUserInfo(request); +// //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 +// ocrTaskchildDubiousFileService.deleteById(id); +// return new ResponseEntity(HttpStatus.NO_CONTENT); +// } + +// /** +// * 通过 ID 查询 单条 信息 +// * +// * @param request +// * @param id 编号 +// * @return +// */ +// @RequestMapping(value = "", method = RequestMethod.GET) +// public ResponseEntity findById(HttpServletRequest request, @PathVariable("id") Integer id) { +// //获取用户信息 +// User user = userService.getUserInfo(request); +// OcrTaskchildDubiousFile ocrTaskchildDubiousFile= ocrTaskchildDubiousFileService.selectById(id); +// return new ResponseEntity(ocrTaskchildDubiousFile, HttpStatus.OK); +// } +// +// /** 修改操作 +// * @param request +// * @param ocrTaskchildDubiousFile +// * @return +// */ +// @RequestMapping(value = "", method = RequestMethod.PATCH) +// public ResponseEntity update(HttpServletRequest request, @RequestBody OcrTaskchildDubiousFile ocrTaskchildDubiousFile) { +// //获取用户信息 +// User user = userService.getUserInfo(request); +// ocrTaskchildDubiousFileService.insertOrUpdate(ocrTaskchildDubiousFile); +// //此处需要手工处理 返回需要将修改后的数据返回 +// return new ResponseEntity(HttpStatus.CREATED); +// } + + /** + * 添加 + * @param request + * @return + */ + @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.POST) + public ResultVo dubiousfileyd(HttpServletRequest request, @RequestBody Map map) { + + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + List list=new ArrayList<>(); + String[] taskchildid = map.get("taskchildid").toString().split(","); + for (String asd:taskchildid){ + OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); + ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd)); + ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId)); + ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid())); + ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis()); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("PICTUREID as pictureid").eq("ID",asd); + OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper); + ocrtaskchilddubiousfile.setPictureId(one.getPictureid()); + + UpdateWrapper updatewrapper = new UpdateWrapper<>(); + updatewrapper.eq("ID", one.getPictureid()).set("suspiciousfile","1"); + + ocrpictureservice.update(updatewrapper); + + list.add(ocrtaskchilddubiousfile); + } + + boolean b = ocrTaskchildDubiousFileService.saveBatch(list); + + return ResultVoUtil.success(b); + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildDubiousFileMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildDubiousFileMapper.java new file mode 100644 index 0000000..0d6fdeb --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildDubiousFileMapper.java @@ -0,0 +1,19 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 可疑文件夹 Mapper 接口 + *

+ * + * @author 你的肉123 + * @since 2024-03-21 + */ +@Mapper +public interface OcrTaskchildDubiousFileMapper extends BaseMapper { + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildDubiousFile.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildDubiousFile.java new file mode 100644 index 0000000..4fcef9d --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildDubiousFile.java @@ -0,0 +1,117 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + + +/** + *

+ * 可疑文件夹 + *

+ * + * @author 你的肉123 + * @since 2024-03-21 + */ +@TableName("ocr_taskchild_dubious_file") +public class OcrTaskchildDubiousFile extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 可疑文件夹主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + /** + * 任务id + */ + @TableField("taskchild_id") + private Long taskchildId; + /** + * 图片主键 + */ + @TableField("picture_id") + private Long pictureId; + /** + * 租户id + */ + private Long tenantid; + /** + * 用户id + */ + private Long userid; + /** + * 创建时间 + */ + private Long createdate; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTaskchildId() { + return taskchildId; + } + + public void setTaskchildId(Long taskchildId) { + this.taskchildId = taskchildId; + } + + public Long getPictureId() { + return pictureId; + } + + public void setPictureId(Long pictureId) { + this.pictureId = pictureId; + } + + public Long getTenantid() { + return tenantid; + } + + public void setTenantid(Long tenantid) { + this.tenantid = tenantid; + } + + public Long getUserid() { + return userid; + } + + public void setUserid(Long userid) { + this.userid = userid; + } + + public Long getCreatedate() { + return createdate; + } + + public void setCreatedate(Long createdate) { + this.createdate = createdate; + } + + @Override + public Serializable pkVal() { + return this.id; + } + + @Override + public String toString() { + return "OcrTaskchildDubiousFile{" + + "id=" + id + + ", taskchildId=" + taskchildId + + ", pictureId=" + pictureId + + ", tenantid=" + tenantid + + ", userid=" + userid + + ", createdate=" + createdate + + "}"; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java new file mode 100644 index 0000000..43a496a --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskchildDubiousFileService.java @@ -0,0 +1,17 @@ +package cn.jyjz.xiaoyao.ocr.service; + + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 可疑文件夹 服务类 + *

+ * + * @author 你的肉123 + * @since 2024-03-21 + */ +public interface IOcrTaskchildDubiousFileService extends IService { + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java new file mode 100644 index 0000000..e58b1db --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java @@ -0,0 +1,20 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildDubiousFileMapper; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile; +import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 可疑文件夹 服务实现类 + *

+ * + * @author 你的肉123 + * @since 2024-03-21 + */ +@Service +public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl implements IOcrTaskchildDubiousFileService { + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildDubiousFileMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildDubiousFileMapper.xml new file mode 100644 index 0000000..1550828 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildDubiousFileMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + id, taskchild_id AS taskchildId, picture_id AS pictureId, tenantid, userid, createdate + + + From fc47a67318dbd327b53b6ba614965636a1a70a96 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Thu, 21 Mar 2024 22:28:31 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java | 1 + .../cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 7d39b31..d24ef4c 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -1487,6 +1487,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ocrTaskchildPictureApproVo.setItemCategory(one.getPicture().getField17()); ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); + ocrTaskchildPictureApproVo.setPackageid(one.getPackageid()); listNew.add(ocrTaskchildPictureApproVo); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java index 15d4173..2de2ed4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskchildPictureApproVo.java @@ -74,4 +74,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable { @ApiModelProperty(value = "厂商") private String manufacturer; + @ApiModelProperty(value ="任务包主键") + private String packageid; + } From 266a8d337c2db6a7fa5f0e49b8d2e3d62e169642 Mon Sep 17 00:00:00 2001 From: lijingtao <18301674552@163.COM> Date: Thu, 21 Mar 2024 22:50:19 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrTaskchildDubiousFileController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index e8fd14b..62ba661 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -117,8 +117,8 @@ public class OcrTaskchildDubiousFileController { * @param request * @return */ - @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.POST) - public ResultVo dubiousfileyd(HttpServletRequest request, @RequestBody Map map) { + @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET) + public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "taskchildid", required = true) String taskchildid) { String tenantId = request.getHeader("X-Tenant-Id"); if(StringUtils.isBlank(tenantId)){ @@ -129,8 +129,8 @@ public class OcrTaskchildDubiousFileController { UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); List list=new ArrayList<>(); - String[] taskchildid = map.get("taskchildid").toString().split(","); - for (String asd:taskchildid){ + String[] taskchildid1 = taskchildid.toString().split(","); + for (String asd:taskchildid1){ OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile(); ocrtaskchilddubiousfile.setTaskchildId(Long.parseLong(asd)); ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId)); From 162cea8f85c7615d1aa2810c481ab6c666f534b8 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Fri, 22 Mar 2024 08:08:34 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoyao/ocr/controller/OcrTaskchildPictureController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 0420e9a..80d7722 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -174,7 +174,7 @@ public class OcrTaskchildPictureController extends BaseController { QueryWrapper imgWrapper = new QueryWrapper<>(); imgWrapper.eq("id",asd.get("pictureid")); OcrPicture one = ocrPictureService.getOne(imgWrapper); - if (one.getSuspiciousfile()!=0){ + if (one.getSuspiciousfile()==0){ collect.add(asd); } } From 6149b38538cc5a52fc54f746a81c650b2c8c2594 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Fri, 22 Mar 2024 09:39:35 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8C=85-=E5=8D=95?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85-=E7=9B=B8=E4=BC=BC?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrTaskchildPictureController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 80d7722..15f79dc 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -1,6 +1,7 @@ package cn.jyjz.xiaoyao.ocr.controller; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -170,17 +171,18 @@ public class OcrTaskchildPictureController extends BaseController { jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString()); return jsonObject; }).collect(Collectors.toList()); + List collect1=new ArrayList<>(); for (JSONObject asd:collect){ QueryWrapper imgWrapper = new QueryWrapper<>(); imgWrapper.eq("id",asd.get("pictureid")); OcrPicture one = ocrPictureService.getOne(imgWrapper); if (one.getSuspiciousfile()==0){ - collect.add(asd); + collect1.add(asd); } } IPage objects = new Page<>(); BeanUtils.copyProperties(page, objects); - objects.setRecords(collect); + objects.setRecords(collect1); return ResultVoUtil.success(objects); } From 5be2580cba37a51ccf5b0cf3465cf19bb5b9d375 Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Fri, 22 Mar 2024 10:53:21 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=88=97=E8=A1=A8=E5=92=8C=E7=A7=BB=E5=87=BA=E5=8F=AF?= =?UTF-8?q?=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrTaskchildDubiousFileController.java | 101 ++++++++++++------ 1 file changed, 70 insertions(+), 31 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index 62ba661..5b091ce 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -10,6 +10,8 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -25,6 +27,7 @@ import cn.jyjz.xiaoyao.ocr.service.IOcrTaskchildDubiousFileService; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * ocr控制器 @@ -49,39 +52,75 @@ public class OcrTaskchildDubiousFileController { @Autowired OcrPictureService ocrpictureservice; -// /** -// * 分页查询 -// * @param request -// * @param start 起始页 -// * @param limit 每页显示多少条 默认10 条 -// * @return -// */ -// @RequestMapping(value = "", method = RequestMethod.GET) -// public ResponseEntity list(HttpServletRequest request, -// @RequestParam(value = "start", required = false, defaultValue = "0") int start, -// @RequestParam(value = "limit", required = false, defaultValue = "10") int limit) { -// //条件查询 -// EntityWrapper entityWrapper = new EntityWrapper(); -// //执行查询方法 -// Page pageVO = ocrTaskchildDubiousFileService.selectPage(new Page(start, limit), entityWrapper); -// return new ResponseEntity(pageVO, HttpStatus.OK); -// } + /** + * 分页查询 + * @param request + * @return + */ + @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) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); -// /** -// * 通过ID 删除 -// * @param request -// * @param id -// * @return -// */ -// @RequestMapping(value = "", method = RequestMethod.DELETE) -// public ResponseEntity deleteById(HttpServletRequest request, @PathVariable("id") Integer id) { -// //获取用户信息 -// User user = userService.getUserInfo(request); -// //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 -// ocrTaskchildDubiousFileService.deleteById(id); -// return new ResponseEntity(HttpStatus.NO_CONTENT); -// } + QueryWrapper dubiouswrapper = new QueryWrapper<>(); + dubiouswrapper.eq("userid",userToken.getUserid()); + List list = ocrTaskchildDubiousFileService.list(dubiouswrapper); + + + +// for (OcrTaskchildDubiousFile ocrtaskchilddubiousfile:list){ +// ocrtaskchilddubiousfile.getPictureId() +// } + + IPage iPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize)); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("ID",list.stream().map(i->i.getPictureId()).collect(Collectors.toList())); + + + //执行查询方法 + IPage page = ocrpictureservice.page(iPage, wrapper); + + + return ResultVoUtil.success(page); + } + + + /** + * 删除 + * @param request + * @return + */ + @RequestMapping(value = "/dubiousfileyc", method = RequestMethod.GET) + public ResultVo dubiousfileyc(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { + + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + String[] cps = pictureid.split(","); + + List saveList = new ArrayList<>(); + List fileList = new ArrayList<>(); + for (String childpictureid : cps) { + OcrPicture ocrPicture = ocrpictureservice.selectDtoById(Long.parseLong(childpictureid)); + ocrPicture.setSuspiciousfile(0); + ocrPicture.setUpdateTime(System.currentTimeMillis()); + saveList.add(ocrPicture); + + QueryWrapper dubiouswrapper = new QueryWrapper<>(); + dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid); + OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper); + fileList.add(one); + } + + ocrpictureservice.updateBatchById(saveList); + + + //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据 + boolean b = ocrTaskchildDubiousFileService.removeByIds(fileList); + return ResultVoUtil.success(b); + } // /** // * 通过 ID 查询 单条 信息 From 2d5577f5c3ac11f5762384799da2376d280a033e Mon Sep 17 00:00:00 2001 From: ljt <18301674552@163.com> Date: Fri, 22 Mar 2024 13:22:17 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=95=88=E9=AA=8C=E8=BF=94=E5=9B=9Eerror=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E3=80=81=E7=BB=BC=E5=90=88=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrSUserTController.java | 16 ++++++++-------- .../mapper/oa/OcrSearchHistoryMapper.xml | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java index a797b56..4f3736b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java @@ -131,40 +131,40 @@ public class OcrSUserTController { return ResultVoUtil.success(ResultVo.SUCCESS,list); }else { // return new ResponseEntity("验证码错误！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"验证码错误！"); + return ResultVoUtil.error(ResultVo.ERROR,"验证码错误！"); } }else { // return new ResponseEntity("手机号错误！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"手机号错误！"); + return ResultVoUtil.error(ResultVo.ERROR,"手机号错误！"); } }else { // return new ResponseEntity("账号不存在！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"账号不存在！"); + return ResultVoUtil.error(ResultVo.ERROR,"账号不存在！"); } }else { // return new ResponseEntity("企业编码错误！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"企业编码错误！"); + return ResultVoUtil.error(ResultVo.ERROR,"企业编码错误！"); } }else { // return new ResponseEntity("请输入企业编码！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入企业编码！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入企业编码！"); } }else { // return new ResponseEntity("请输入验证码！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入验证码！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入验证码！"); } }else { // return new ResponseEntity("请输入手机号！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入手机号！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入手机号！"); } }else { // return new ResponseEntity("请输入账号！",HttpStatus.OK); - return ResultVoUtil.error(ResultVo.SUCCESS,"请输入账号！"); + return ResultVoUtil.error(ResultVo.ERROR,"请输入账号！"); } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index bbbc263..e1d13cb 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -23,7 +23,7 @@