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 b2ca51e0..0732359c 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 00000000..e8fd14bb --- /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 00000000..0d6fdeb9 --- /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 00000000..4fcef9db --- /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 00000000..43a496a7 --- /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 00000000..e58b1dbf --- /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 00000000..15508281 --- /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 + + +