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..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 @@ -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,20 @@ 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){ diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 2aca5df..7d42009 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -166,7 +166,6 @@ public class FlowTaskController extends BaseController { //审批意见") String taskComment = request.getParameter("taskComment"); - //判断当前任务审批人是否一致 if(!this.ocrTaskchildPictureService.validateAssignee(formid,userToken)){ return ResultVoUtil.error("审批人不一致，请到任务审批中处理。"); @@ -647,7 +646,7 @@ public class FlowTaskController extends BaseController { }) @GetMapping("/repetitionTask") @ResponseBody - public ResultVo repetitionTask(HttpServletRequest request){ + public ResultVo repetitionTask(){ return flowTaskService.repetitionTask(); } } 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 a947fa0..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 @@ -452,6 +452,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask variables.put("taskApprovd", taskVO.getTaskApprovd().intValue()); } variables.put("approvd", taskVO.getApprovd()); + OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid())); //只有同意，再进行候选人设置 if (taskVO.getApprovd()) { @@ -498,7 +499,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename()); FlowModelVO formData = iFormCustomService.getForm(taskVO.getFormid()); - OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid())); List taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid()); Task taskData = null; @@ -509,30 +509,33 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask if (null != taskData && StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) { User user = userService.findByLoginname(formData.getAssignee()); userFinalService.save(user.getId().toString(), taskVO.getFormid()); + model.setFinishtime(System.currentTimeMillis()); + ocrTaskchildPictureService.updateById(model); + }else{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee()); + OcrMsg msg = new OcrMsg(); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendTime(System.currentTimeMillis()); + msg.setReceiveUserIds(byLoginname.getId().toString()); + msg.setTitile(model.getFromtaskname()); + msg.setSender(Long.valueOf(userToken.getUserid())); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("taskId", model.getFromtaskid()); + jsonObject.put("nodeName", model.getTaskname()); + jsonObject.put("states", model.getStates()); + jsonObject.put("sendUserId", userToken.getUserid()); + jsonObject.put("sendUserName", userToken.getUsername()); + jsonObject.put("sendTime", System.currentTimeMillis()); + jsonObject.put("fromId", model.getId().toString()); + jsonObject.put("taskName", model.getFromtaskname()); + jsonObject.put("packageId",model.getPackageid()); + msg.setBusJson(jsonObject.toJSONString()); + msg.setCreateBy(Long.valueOf(userToken.getUserid())); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendStatus("1"); + ocrMsgService.save(msg); } - UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); - cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee()); - OcrMsg msg = new OcrMsg(); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendTime(System.currentTimeMillis()); - msg.setReceiveUserIds(byLoginname.getId().toString()); - msg.setTitile(model.getFromtaskname()); - msg.setSender(Long.valueOf(userToken.getUserid())); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("taskId", model.getFromtaskid()); - jsonObject.put("nodeName", model.getTaskname()); - jsonObject.put("states", model.getStates()); - jsonObject.put("sendUserId", userToken.getUserid()); - jsonObject.put("sendUserName", userToken.getUsername()); - jsonObject.put("sendTime", System.currentTimeMillis()); - jsonObject.put("fromId", model.getId().toString()); - jsonObject.put("taskName", model.getFromtaskname()); - msg.setBusJson(jsonObject.toJSONString()); - msg.setCreateBy(Long.valueOf(userToken.getUserid())); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendStatus("1"); - - ocrMsgService.save(msg); //增加未查看记录 userViewApproeService.saveUserViewApproe(formData.getAssignee(), formData.getFormid().toString(), formData.getTenantid().toString()); } else { @@ -569,7 +572,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask List executionIds = new ArrayList<>(); executions.forEach(execution -> executionIds.add(execution.getId())); runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).processVariables(variables).changeState(); - + model.setFinishtime(System.currentTimeMillis()); + ocrTaskchildPictureService.updateById(model); } @@ -1483,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/oa/from/dataDao/FlowableccMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java index fbbce38..3f3d718 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java @@ -2,6 +2,7 @@ package cn.jyjz.xiaoyao.oa.from.dataDao; import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc; import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; +import cn.jyjz.xiaoyao.oa.from.vo.RepeatedContentVo; import cn.jyjz.xiaoyao.oa.from.vo.UserDistionaryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -36,5 +37,5 @@ public interface FlowableccMybatisDao extends BaseMapper { */ List selectUserByFromid(String fromid); - List> repetitionTask(); + List repetitionTask(); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java index f58a6fc..bfb5d8a 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java @@ -32,9 +32,9 @@ public class UserapproveServiceImpl extends BaseServiceImpl repeatedTaskList; + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java new file mode 100644 index 0000000..aa28ba5 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java @@ -0,0 +1,27 @@ +package cn.jyjz.xiaoyao.oa.from.vo; + +import lombok.Data; + +/** + * ClassName： RepeatedTaskVo$.java + * Description: + * Author： scl. + * Date： 2024/3/21 14:36 + */ +@Data +public class RepeatedTaskVo { + + private String taskId; + + private String taskName; + + private String nodeName; + + private Integer states; + + private String similarityScore; + + private String fromTime; + + private String updateTime; +} 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()){ 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/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/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..5b091ce --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -0,0 +1,196 @@ +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 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; +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; +import java.util.stream.Collectors; + +/** + * 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 + * @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)); + + 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 查询 单条 信息 +// * +// * @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.GET) + public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "taskchildid", required = true) String taskchildid) { + + 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[] taskchildid1 = taskchildid.toString().split(","); + for (String asd:taskchildid1){ + 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/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index 4b95acf..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; @@ -56,6 +57,7 @@ public class OcrTaskchildPictureController extends BaseController { @Resource private UserService userService; + /** * 方法描述：返回json字符串，接受参数，dto名称以及分页信息 * 创建人：mail.zhangyong@gmail.com @@ -169,9 +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){ + collect1.add(asd); + } + } IPage objects = new Page<>(); BeanUtils.copyProperties(page, objects); - objects.setRecords(collect); + objects.setRecords(collect1); return ResultVoUtil.success(objects); } 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/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/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java index fb7c0e4..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,16 @@ 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") + private Integer suspiciousfile; + //图片分类 @TableField(exist = false) private OcrPictureclass ocrPictureclass; @@ -347,10 +357,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 +425,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/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/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java index 1900a32..20cb4ee 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java @@ -163,10 +163,18 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(value = "FROMUSERID") private String fromuserid; + @ApiModelProperty(value = "提报人名称") + @TableField(value = "FROMUSERNAME") + private String fromusername; + @ApiModelProperty(value = "所属项目") @TableField(value = "FROMPROJECTID") private String fromprojectid; + @ApiModelProperty(value = "所属项目名称") + @TableField(value = "FROMPROJECTNAME") + private String fromprojectname; + @ApiModelProperty(value = "所属计划") @TableField(value = "FROMPLANID") private String fromplanid; @@ -187,6 +195,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable { @TableField(value = "TASKNAME") private String taskname; + @Schema(description = "完成时间") + @TableField(value = "FINISHTIME") + private Long finishtime; + @ApiModelProperty(value = "项目对象") @TableField(exist = false) private Category categoryDto; 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/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/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/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/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 36450b5..2190950 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -488,6 +488,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl + + + + + + + + + + + + + + + + ID AS formid, BUESSINESSNO AS buessinessno, @@ -182,12 +198,23 @@ - + 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} 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..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 @@ -16,35 +16,25 @@ +