Merge remote-tracking branch 'origin/master' into dev-lili

pull/1/head
707464720@qq.com 2 years ago
commit eaaebc05eb

@ -88,8 +88,16 @@ public class MyAuthenticationProvider implements AuthenticationProvider {
// //从缓存中删除验证码 // //从缓存中删除验证码
// iCacheManager.remove(CacheConstants.CACHE_CODE,codetoken); // iCacheManager.remove(CacheConstants.CACHE_CODE,codetoken);
if(StringUtils.isBlank(loginname) || StringUtils.isBlank(password)){ // if(StringUtils.isBlank(loginname) || StringUtils.isBlank(password)){
throw new AuthenticationServiceException("账号密码不正确"); // 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("验证码错误"); // 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){ 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); User user = userTokenService.findByLoginname(loginname);
if(null == user){ if(null == user){

@ -166,7 +166,6 @@ public class FlowTaskController extends BaseController {
//审批意见") //审批意见")
String taskComment = request.getParameter("taskComment"); String taskComment = request.getParameter("taskComment");
//判断当前任务审批人是否一致 //判断当前任务审批人是否一致
if(!this.ocrTaskchildPictureService.validateAssignee(formid,userToken)){ if(!this.ocrTaskchildPictureService.validateAssignee(formid,userToken)){
return ResultVoUtil.error("审批人不一致,请到任务审批中处理。"); return ResultVoUtil.error("审批人不一致,请到任务审批中处理。");
@ -647,7 +646,7 @@ public class FlowTaskController extends BaseController {
}) })
@GetMapping("/repetitionTask") @GetMapping("/repetitionTask")
@ResponseBody @ResponseBody
public ResultVo repetitionTask(HttpServletRequest request){ public ResultVo repetitionTask(){
return flowTaskService.repetitionTask(); return flowTaskService.repetitionTask();
} }
} }

@ -452,6 +452,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
variables.put("taskApprovd", taskVO.getTaskApprovd().intValue()); variables.put("taskApprovd", taskVO.getTaskApprovd().intValue());
} }
variables.put("approvd", taskVO.getApprovd()); variables.put("approvd", taskVO.getApprovd());
OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
//只有同意,再进行候选人设置 //只有同意,再进行候选人设置
if (taskVO.getApprovd()) { if (taskVO.getApprovd()) {
@ -498,7 +499,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename()); IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
FlowModelVO formData = iFormCustomService.getForm(taskVO.getFormid()); FlowModelVO formData = iFormCustomService.getForm(taskVO.getFormid());
OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid()); List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid());
Task taskData = null; 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)) { if (null != taskData && StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) {
User user = userService.findByLoginname(formData.getAssignee()); User user = userService.findByLoginname(formData.getAssignee());
userFinalService.save(user.getId().toString(), taskVO.getFormid()); 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()); userViewApproeService.saveUserViewApproe(formData.getAssignee(), formData.getFormid().toString(), formData.getTenantid().toString());
} else { } else {
@ -569,7 +572,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List<String> executionIds = new ArrayList<>(); List<String> executionIds = new ArrayList<>();
executions.forEach(execution -> executionIds.add(execution.getId())); executions.forEach(execution -> executionIds.add(execution.getId()));
runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).processVariables(variables).changeState(); 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.setItemCategory(one.getPicture().getField17());
ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName());
ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5());
ocrTaskchildPictureApproVo.setPackageid(one.getPackageid());
listNew.add(ocrTaskchildPictureApproVo); listNew.add(ocrTaskchildPictureApproVo);
} }

@ -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.dataobject.Flowablecc;
import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo; 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 cn.jyjz.xiaoyao.oa.from.vo.UserDistionaryVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -36,5 +37,5 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
*/ */
List<UserDistionaryVo> selectUserByFromid(String fromid); List<UserDistionaryVo> selectUserByFromid(String fromid);
List<Map<String,Object>> repetitionTask(); List<RepeatedContentVo> repetitionTask();
} }

@ -32,9 +32,9 @@ public class UserapproveServiceImpl extends BaseServiceImpl<UserapproveMybatisDa
userapprove.setCreatedate(System.currentTimeMillis()); userapprove.setCreatedate(System.currentTimeMillis());
userapprove.setUsername(userToken.getUsername()); userapprove.setUsername(userToken.getUsername());
if (taskVO.getApprovd()) { if (taskVO.getApprovd()) {
userapprove.setStatshis(2);
} else {
userapprove.setStatshis(3); userapprove.setStatshis(3);
} else {
userapprove.setStatshis(5);
} }

@ -0,0 +1,27 @@
package cn.jyjz.xiaoyao.oa.from.vo;
import lombok.Data;
import java.util.List;
/**
* ClassName RepeatedContentVo$.java
* Description:
* Author scl.
* Date 2024/3/21 14:14
*/
@Data
public class RepeatedContentVo {
private String id;
private String content;
private Integer count;
private String imgUrl;
private List<RepeatedTaskVo> repeatedTaskList;
}

@ -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;
}

@ -117,6 +117,7 @@ public class OcrBooknoteController extends BaseController{
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("CREATEUSER",userToken.getLoginname()); queryWrapper.eq("CREATEUSER",userToken.getLoginname());
queryWrapper.eq("TENANTID",tenantId); queryWrapper.eq("TENANTID",tenantId);
queryWrapper.orderByDesc("CREATEDATE");
List<OcrBooknote> list = ocrBooknoteService.list(queryWrapper); List<OcrBooknote> list = ocrBooknoteService.list(queryWrapper);
if(null == list || list.isEmpty()){ if(null == list || list.isEmpty()){

@ -215,6 +215,7 @@ public class OcrPictureController extends BaseController {
String search_month = req.getParameter("search_month"); String search_month = req.getParameter("search_month");
String ordertype = req.getParameter("ordertype"); String ordertype = req.getParameter("ordertype");
queryWrapper.eq("suspiciousfile","0");
if (StringUtils.isNotBlank(ordertype)) { if (StringUtils.isNotBlank(ordertype)) {
if (ordertype.equals("0")) { if (ordertype.equals("0")) {
queryWrapper.orderByAsc("similarity_score"); queryWrapper.orderByAsc("similarity_score");

@ -131,40 +131,40 @@ public class OcrSUserTController {
return ResultVoUtil.success(ResultVo.SUCCESS,list); return ResultVoUtil.success(ResultVo.SUCCESS,list);
}else { }else {
// return new ResponseEntity<Object>("验证码错误!",HttpStatus.OK); // return new ResponseEntity<Object>("验证码错误!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"验证码错误!"); return ResultVoUtil.error(ResultVo.ERROR,"验证码错误!");
} }
}else { }else {
// return new ResponseEntity<Object>("手机号错误!",HttpStatus.OK); // return new ResponseEntity<Object>("手机号错误!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"手机号错误!"); return ResultVoUtil.error(ResultVo.ERROR,"手机号错误!");
} }
}else { }else {
// return new ResponseEntity<Object>("账号不存在!",HttpStatus.OK); // return new ResponseEntity<Object>("账号不存在!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"账号不存在!"); return ResultVoUtil.error(ResultVo.ERROR,"账号不存在!");
} }
}else { }else {
// return new ResponseEntity<Object>("企业编码错误!",HttpStatus.OK); // return new ResponseEntity<Object>("企业编码错误!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"企业编码错误!"); return ResultVoUtil.error(ResultVo.ERROR,"企业编码错误!");
} }
}else { }else {
// return new ResponseEntity<Object>("请输入企业编码!",HttpStatus.OK); // return new ResponseEntity<Object>("请输入企业编码!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入企业编码!"); return ResultVoUtil.error(ResultVo.ERROR,"请输入企业编码!");
} }
}else { }else {
// return new ResponseEntity<Object>("请输入验证码!",HttpStatus.OK); // return new ResponseEntity<Object>("请输入验证码!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入验证码!"); return ResultVoUtil.error(ResultVo.ERROR,"请输入验证码!");
} }
}else { }else {
// return new ResponseEntity<Object>("请输入手机号!",HttpStatus.OK); // return new ResponseEntity<Object>("请输入手机号!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入手机号!"); return ResultVoUtil.error(ResultVo.ERROR,"请输入手机号!");
} }
}else { }else {
// return new ResponseEntity<Object>("请输入账号!",HttpStatus.OK); // return new ResponseEntity<Object>("请输入账号!",HttpStatus.OK);
return ResultVoUtil.error(ResultVo.SUCCESS,"请输入账号!"); return ResultVoUtil.error(ResultVo.ERROR,"请输入账号!");
} }

@ -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<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
dubiouswrapper.eq("userid",userToken.getUserid());
List<OcrTaskchildDubiousFile> list = ocrTaskchildDubiousFileService.list(dubiouswrapper);
// for (OcrTaskchildDubiousFile ocrtaskchilddubiousfile:list){
// ocrtaskchilddubiousfile.getPictureId()
// }
IPage<OcrPicture> iPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize));
QueryWrapper<OcrPicture> wrapper = new QueryWrapper<>();
wrapper.in("ID",list.stream().map(i->i.getPictureId()).collect(Collectors.toList()));
//执行查询方法
IPage<OcrPicture> 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<OcrPicture> saveList = new ArrayList<>();
List<OcrTaskchildDubiousFile> 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<OcrTaskchildDubiousFile> 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>(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<OcrTaskchildDubiousFile>(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<OcrTaskchildDubiousFile> 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<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
wrapper.select("PICTUREID as pictureid").eq("ID",asd);
OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
ocrtaskchilddubiousfile.setPictureId(one.getPictureid());
UpdateWrapper<OcrPicture> 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);
}
}

@ -1,6 +1,7 @@
package cn.jyjz.xiaoyao.ocr.controller; package cn.jyjz.xiaoyao.ocr.controller;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -56,6 +57,7 @@ public class OcrTaskchildPictureController extends BaseController {
@Resource @Resource
private UserService userService; private UserService userService;
/** /**
* jsondto * jsondto
* mail.zhangyong@gmail.com * mail.zhangyong@gmail.com
@ -169,9 +171,18 @@ public class OcrTaskchildPictureController extends BaseController {
jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString()); jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString());
return jsonObject; return jsonObject;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
List<JSONObject> collect1=new ArrayList<>();
for (JSONObject asd:collect){
QueryWrapper<OcrPicture> imgWrapper = new QueryWrapper<>();
imgWrapper.eq("id",asd.get("pictureid"));
OcrPicture one = ocrPictureService.getOne(imgWrapper);
if (one.getSuspiciousfile()==0){
collect1.add(asd);
}
}
IPage<JSONObject> objects = new Page<>(); IPage<JSONObject> objects = new Page<>();
BeanUtils.copyProperties(page, objects); BeanUtils.copyProperties(page, objects);
objects.setRecords(collect); objects.setRecords(collect1);
return ResultVoUtil.success(objects); return ResultVoUtil.success(objects);
} }

@ -19,11 +19,11 @@ import java.util.Map;
*/ */
@Mapper @Mapper
public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> { public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
List<Map<String,String>> selectsearch1(@Param("search")String search); List<Map<String,String>> selectsearch1(@Param("userid")String userid,@Param("search")String search);
List<Map<String,String>> selectsearch2(@Param("search")String search); List<Map<String,String>> selectsearch2(@Param("userid")String userid,@Param("search")String search);
List<Map<String,String>> selectsearch3(@Param("search")String search); List<Map<String,String>> selectsearch3(@Param("userid")String userid,@Param("search")String search);

@ -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;
/**
* <p>
* Mapper
* </p>
*
* @author 123
* @since 2024-03-21
*/
@Mapper
public interface OcrTaskchildDubiousFileMapper extends BaseMapper<OcrTaskchildDubiousFile> {
}

@ -338,6 +338,16 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
@TableField(value = "server_thumbnail_url") @TableField(value = "server_thumbnail_url")
private String serverThumbnailUrl; 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) @TableField(exist = false)
private OcrPictureclass ocrPictureclass; private OcrPictureclass ocrPictureclass;
@ -347,10 +357,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
@JsonIgnore @JsonIgnore
private SearchQuery searchQueryrolesShowleave; private SearchQuery searchQueryrolesShowleave;
@ApiModelProperty(value = "提报日期时间戳")
@TableField(value = "submit_date_timestamp")
private Long submitDateTimestamp;
@TableField(exist = false) @TableField(exist = false)
@JsonIgnore @JsonIgnore
private final Map<String, String> query = Stream.of( private final Map<String, String> query = Stream.of(
@ -419,7 +425,8 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
new SimpleEntry<>("localpictrueurl", "localpictrueurl"), new SimpleEntry<>("localpictrueurl", "localpictrueurl"),
new SimpleEntry<>("imgHash", "imgHash"), new SimpleEntry<>("imgHash", "imgHash"),
new SimpleEntry<>("serverThumbnailUrl", "serverThumbnailUrl"), new SimpleEntry<>("serverThumbnailUrl", "serverThumbnailUrl"),
new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl") new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl"),
new SimpleEntry<>("suspiciousfile", "suspiciousfile")
) )
.collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)); .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));

@ -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;
/**
* <p>
*
* </p>
*
* @author 123
* @since 2024-03-21
*/
@TableName("ocr_taskchild_dubious_file")
public class OcrTaskchildDubiousFile extends Model<OcrTaskchildDubiousFile> {
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 +
"}";
}
}

@ -163,10 +163,18 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
@TableField(value = "FROMUSERID") @TableField(value = "FROMUSERID")
private String fromuserid; private String fromuserid;
@ApiModelProperty(value = "提报人名称")
@TableField(value = "FROMUSERNAME")
private String fromusername;
@ApiModelProperty(value = "所属项目") @ApiModelProperty(value = "所属项目")
@TableField(value = "FROMPROJECTID") @TableField(value = "FROMPROJECTID")
private String fromprojectid; private String fromprojectid;
@ApiModelProperty(value = "所属项目名称")
@TableField(value = "FROMPROJECTNAME")
private String fromprojectname;
@ApiModelProperty(value = "所属计划") @ApiModelProperty(value = "所属计划")
@TableField(value = "FROMPLANID") @TableField(value = "FROMPLANID")
private String fromplanid; private String fromplanid;
@ -187,6 +195,10 @@ public class OcrTaskchildPicture implements BaseDto, java.io.Serializable {
@TableField(value = "TASKNAME") @TableField(value = "TASKNAME")
private String taskname; private String taskname;
@Schema(description = "完成时间")
@TableField(value = "FINISHTIME")
private Long finishtime;
@ApiModelProperty(value = "项目对象") @ApiModelProperty(value = "项目对象")
@TableField(exist = false) @TableField(exist = false)
private Category categoryDto; private Category categoryDto;

@ -0,0 +1,17 @@
package cn.jyjz.xiaoyao.ocr.service;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
*
* </p>
*
* @author 123
* @since 2024-03-21
*/
public interface IOcrTaskchildDubiousFileService extends IService<OcrTaskchildDubiousFile> {
}

@ -754,7 +754,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper(); QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper();
queryWrapper.eq("suspiciousfile","0");
for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) { for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
this.formattingSearchChild(queryWrapper, usersearchchild); this.formattingSearchChild(queryWrapper, usersearchchild);

@ -15,6 +15,7 @@ import cn.jyjz.xiaoyao.ocr.dataDao.OcrSearchHistoryMapper;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* <p> * <p>
@ -38,9 +39,12 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
@Override @Override
public Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee) { public Map<Object, List<Map<String,String>>> selectsearch(String search, String assignee) {
List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(search);
List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(search);
List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(search);
List<Map<String,String>> strings1 = ocrsearchhistorymapper.selectsearch1(assignee,search);
List<Map<String,String>> strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search);
List<Map<String,String>> strings3 = ocrsearchhistorymapper.selectsearch3(assignee,search);
// List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>(); // List<Map<Object,List<Map<String,String>>>> list = new ArrayList<>();
@ -119,6 +123,14 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
} }
// List<OcrPicture> 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(); return this.ocrPictureService.updateBatchById(saveList) ? ResultVoUtil.success() : ResultVoUtil.error();
} }
} }

@ -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;
/**
* <p>
*
* </p>
*
* @author 123
* @since 2024-03-21
*/
@Service
public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl<OcrTaskchildDubiousFileMapper, OcrTaskchildDubiousFile> implements IOcrTaskchildDubiousFileService {
}

@ -488,6 +488,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
ocrTaskchildPicture.setFromplanid(ocrPicture.getPlanid()); ocrTaskchildPicture.setFromplanid(ocrPicture.getPlanid());
ocrTaskchildPicture.setFromprojectid(ocrPicture.getProjectid()); ocrTaskchildPicture.setFromprojectid(ocrPicture.getProjectid());
ocrTaskchildPicture.setFromuserid(ocrPicture.getUpuserid()); ocrTaskchildPicture.setFromuserid(ocrPicture.getUpuserid());
ocrTaskchildPicture.setFromprojectname(ocrPicture.getProjectidname());
ocrTaskchildPicture.setFromusername(ocrPicture.getUpname());
// StringBuffer pcid = new StringBuffer(); // StringBuffer pcid = new StringBuffer();
// StringBuffer result = new StringBuffer(); // StringBuffer result = new StringBuffer();

@ -74,4 +74,7 @@ public class OcrTaskchildPictureApproVo implements java.io.Serializable {
@ApiModelProperty(value = "厂商") @ApiModelProperty(value = "厂商")
private String manufacturer; private String manufacturer;
@ApiModelProperty(value ="任务包主键")
private String packageid;
} }

@ -29,6 +29,22 @@
<result column="USERDISTIONARYID" property="userdistionaryid" jdbcType="BIGINT"/> <result column="USERDISTIONARYID" property="userdistionaryid" jdbcType="BIGINT"/>
<result column="userOsudType" property="userOsudType" jdbcType="INTEGER"/> <result column="userOsudType" property="userOsudType" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<resultMap id="resultMap" type="cn.jyjz.xiaoyao.oa.from.vo.RepeatedContentVo">
<id column="id" property="id"/>
<result column="content" property="content"/>
<result column="count" property="count"/>
<result column="imgUrl" property="imgUrl"/>
<collection property="repeatedTaskList" ofType="cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo">
<result column="taskId" property="taskId"/>
<result column="taskName" property="taskName"/>
<result column="nodeName" property="nodeName"/>
<result column="states" property="states"/>
<result column="similarityScore" property="similarityScore"/>
<result column="fromTime" property="fromTime"/>
<result column="updateTime" property="updateTime"/>
</collection>
</resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID AS formid, ID AS formid,
BUESSINESSNO AS buessinessno, BUESSINESSNO AS buessinessno,
@ -182,12 +198,23 @@
<include refid="Base_Where_union"></include> <include refid="Base_Where_union"></include>
</select> </select>
<select id="repetitionTask" resultType="java.util.Map"> <select id="repetitionTask" resultMap="resultMap">
SELECT REPETITION,count(1) count SELECT t1.count,
FROM t1.content,
OA_SUMMARY_VIEW t1.id,
GROUP BY REPETITION t1.imgUrl,
HAVING count(1)>1 t3.similarity_score similarityScore,
t2.STATES,
</select> t3.remark taskId,
t3.taskName,
t2.TASKNAME nodeName,
t2.FROMUPTIME fromTime,
t2.UPDATETIME updateTime
from (select count(field8) count, field8 content, ID id, imgUrl
FROM ocr_picture
GROUP BY field8
HAVING count(field8) > 1) t1
LEFT JOIN ocr_taskchild_picture t2 ON t1.ID = t2.PICTUREID
LEFT JOIN ocr_picture t3 on t1.content = t3.field8
</select>
</mapper> </mapper>

@ -64,6 +64,7 @@
<result column="field16" property="field16" jdbcType="VARCHAR"/> <result column="field16" property="field16" jdbcType="VARCHAR"/>
<result column="field17" property="field17" jdbcType="VARCHAR"/> <result column="field17" property="field17" jdbcType="VARCHAR"/>
<result column="field18" property="field18" jdbcType="VARCHAR"/> <result column="field18" property="field18" jdbcType="VARCHAR"/>
<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
ID AS id, ID AS id,
@ -127,7 +128,8 @@
field15 AS field15, field15 AS field15,
field16 AS field16, field16 AS field16,
field17 AS field17, field17 AS field17,
field18 AS field18 field18 AS field18,
suspiciousfile AS suspiciousfile
</sql> </sql>
<sql id="Base_Where"> <sql id="Base_Where">
@ -195,6 +197,7 @@
<if test="field16 != null"> and field16 ${field16.dataOp} ${field16.likestar}#{field16.value}${field16.likeend}</if> <if test="field16 != null"> and field16 ${field16.dataOp} ${field16.likestar}#{field16.value}${field16.likeend}</if>
<if test="field17 != null"> and field17 ${field17.dataOp} ${field17.likestar}#{field17.value}${field17.likeend}</if> <if test="field17 != null"> and field17 ${field17.dataOp} ${field17.likestar}#{field17.value}${field17.likeend}</if>
<if test="field18 != null"> and field18 ${field18.dataOp} ${field18.likestar}#{field18.value}${field18.likeend}</if> <if test="field18 != null"> and field18 ${field18.dataOp} ${field18.likestar}#{field18.value}${field18.likeend}</if>
<if test="suspiciousfile != null"> and suspiciousfile ${suspiciousfile.dataOp} ${suspiciousfile.likestar}#{suspiciousfile.value}${suspiciousfile.likeend}</if>
</trim> </trim>
</where> </where>
<if test="page != null"> <if test="page != null">

@ -16,35 +16,25 @@
</sql> </sql>
<select id="selectsearch1" resultType="map"> <select id="selectsearch1" resultType="map">
SELECT
r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name
FROM
ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"
(r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%"
OR img.field3 LIKE "%"#{search}"%")
ORDER BY
r.CREATEDATE DESC
LIMIT 3
</select> </select>
<select id="selectsearch2" resultType="map"> <select id="selectsearch2" resultType="map">
SELECT SELECT
r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name r.ID as id,CONCAT_WS( "-", t.packagename, img.planName ) AS name
FROM FROM
ocr_taskchild_picture r ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID) LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE WHERE
r.ASSIGNEE = #{userid} AND
r.STATES IN ('1','2') AND
r.taskName IN ( '一级审批', '二级审批' ) r.taskName IN ( '一级审批', '二级审批' )
AND (r.PACKAGEID LIKE "%"#{search}"%" AND (r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%" OR t.packagename LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%"
OR img.field3 LIKE "%"#{search}"%") OR img.field3 LIKE "%"#{search}"%")
ORDER BY ORDER BY
@ -53,16 +43,18 @@
</select> </select>
<select id="selectsearch3" resultType="map"> <select id="selectsearch3" resultType="map">
SELECT SELECT
r.ID as id,CONCAT_WS( "-", img.taskName, img.planName ) AS name r.ID as id,CONCAT_WS( "-", t.packagename, img.planName ) AS name
FROM FROM
ocr_taskchild_picture r ocr_taskchild_picture r
LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID LEFT JOIN ocr_packagetask t ON r.PACKAGEID = t.ID
LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID) LEFT JOIN ocr_picture img ON FIND_IN_SET(img.ID,r.OCPICTUREID)
WHERE WHERE
r.ASSIGNEE = #{userid} AND
r.STATES = '3' AND
r.taskName = '最终审批' r.taskName = '最终审批'
AND (r.PACKAGEID LIKE "%"#{search}"%" AND (r.PACKAGEID LIKE "%"#{search}"%"
OR img.taskName LIKE "%"#{search}"%" OR t.packagename LIKE "%"#{search}"%"
OR img.field1 LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%"
OR img.field3 LIKE "%"#{search}"%") OR img.field3 LIKE "%"#{search}"%")
ORDER BY ORDER BY

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskchildDubiousFileMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildDubiousFile">
<id column="id" property="id" />
<result column="taskchild_id" property="taskchildId" />
<result column="picture_id" property="pictureId" />
<result column="tenantid" property="tenantid" />
<result column="userid" property="userid" />
<result column="createdate" property="createdate" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, taskchild_id AS taskchildId, picture_id AS pictureId, tenantid, userid, createdate
</sql>
</mapper>
Loading…
Cancel
Save