From 20fc17912e3aa8cabed8fa6538cc3d9d0c9c7234 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 12 Apr 2024 14:20:52 +0800 Subject: [PATCH 01/48] =?UTF-8?q?fix:=E6=89=93=E5=BC=80=E5=85=A8=E6=96=87?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=EF=BC=8C=E4=B8=8D=E8=BE=93=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E5=92=8C=E4=BB=BB=E5=8A=A1=E7=BB=88=E5=AE=A1=E7=9A=84=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E7=9A=84=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E4=B8=89=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OcrSearchHistoryController.java | 15 ++++++++------- .../service/impl/OcrSearchHistoryServiceImpl.java | 11 +++++++---- .../mapper/oa/OcrSearchHistoryMapper.xml | 10 +++++++--- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java index f16c0ffb..69eeeaf4 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java @@ -55,13 +55,14 @@ public class OcrSearchHistoryController { //执行查询方法 Map>> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getLoginname(),userToken.getUserid(),tenantId); - OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); - ocrsearchhistory.setHistoryname(search); - ocrsearchhistory.setTenantId(Long.valueOf(tenantId)); - ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); - ocrsearchhistory.setCreatedate(System.currentTimeMillis()); - ocrSearchHistoryService.save(ocrsearchhistory); - + if(StringUtils.isNotBlank(search)){ + OcrSearchHistory ocrsearchhistory =new OcrSearchHistory(); + ocrsearchhistory.setHistoryname(search); + ocrsearchhistory.setTenantId(Long.valueOf(tenantId)); + ocrsearchhistory.setUserid(Long.valueOf(userToken.getUserid())); + ocrsearchhistory.setCreatedate(System.currentTimeMillis()); + ocrSearchHistoryService.save(ocrsearchhistory); + } // return new ResponseEntity(selectsearch, HttpStatus.OK); return ResultVoUtil.success(selectsearch); 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 88749d65..b6e1472b 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 @@ -84,8 +84,10 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl frontmenuTList = isFrontmenuTService.queryUserMenuById(assignee); if(CollUtil.isNotEmpty(frontmenuTList)){ for (SFrontmenuT sFrontmenuT : frontmenuTList) { - if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){ - strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId); + if(StringUtils.isNotBlank(search)){ + if(sFrontmenuT.getResKey().equals(FrontMenuEnum.WORKSHEETMAIN.getResKey())){ + strings1 = ocrsearchhistorymapper.selectsearch1(userId,search,tenantId); + } } if(sFrontmenuT.getResKey().equals(FrontMenuEnum.TASKMAIN.getResKey())){ strings2 = ocrsearchhistorymapper.selectsearch2(assignee,search,tenantId); @@ -98,12 +100,13 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl>>> list = new ArrayList<>(); Map>> map=new HashMap<>(); - map.put("ai",strings1); + if(StringUtils.isNotBlank(search)){ + map.put("ai",strings1); + } map.put("preliminary",strings2); map.put("final",strings3); // list.add(map); - return map; } 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 93e5def9..f0b3fe59 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 @@ -31,9 +31,11 @@ r.ASSIGNEE = #{userid} AND r.STATES IN ('1','2') AND r.TASKNAME IN ( '一级审批', '二级审批' ) - AND (r.FROMTASKNAME LIKE "%"#{search}"%" + + AND (r.FROMTASKNAME LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%" OR img.field3 LIKE "%"#{search}"%") + AND r.TENANTID = #{tenantId} ORDER BY r.CREATEDATE DESC @@ -49,10 +51,12 @@ r.ASSIGNEE = #{userid} AND r.STATES = '3' AND r.TASKNAME = '最终审批' - AND (r.FROMTASKNAME LIKE "%"#{search}"%" + + AND (r.FROMTASKNAME LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%" OR img.field3 LIKE "%"#{search}"%") - AND r.TENANTID = #{tenantId} + + AND r.TENANTID = #{tenantId} ORDER BY r.CREATEDATE DESC LIMIT 3 From c57e6b1a4872188f673a6174df571ff717b7fa1a Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Fri, 12 Apr 2024 16:12:36 +0800 Subject: [PATCH 02/48] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9B=B8=E5=BA=94=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OcrPictureclassController.java | 154 ++++++++++++++++++ .../OcrPictureclassHtmlController.java | 75 +++++++++ .../dataDao/OcrPictureclassMybatisDao.java | 11 ++ .../ocr/dataobject/OcrPictureclass.java | 115 +++++++++++++ .../ocr/service/OcrPictureclassService.java | 22 +++ .../impl/OcrPictureclassServiceImpl.java | 43 +++++ 6 files changed, 420 insertions(+) create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java new file mode 100644 index 00000000..021811ff --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java @@ -0,0 +1,154 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import java.io.IOException; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import cn.jyjz.xiaoyao.admin.service.TenantService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +@Api(tags="ocr-分类管理") +@RestController +@RequestMapping("/ocr/ocrPictureclass") +public class OcrPictureclassController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Resource + private OcrPictureclassService ocrPictureclassService; + @Resource + private TenantService tenantService; + @Resource + private UserTokenService userTokenService; + @Resource + private UserService userService; + + /** + * 分页列表查询 + + * @return + */ + //@AutoLog(value = "ocr_pictureclass-分页列表查询") + @ApiOperation(value="分类列表", notes="分类列表，无分页") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true) + }) + @GetMapping(value = "/rootList") + public ResultVo> rootList(HttpServletRequest request, HttpServletResponse response) { + //租户主键，由前端页面传送 + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + + SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); + OcrPictureclass ocrpictureclass = new OcrPictureclass(); + QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass); + queryWrapper.eq("TENANTID",tenantId); + queryWrapper.orderByDesc("REORDER"); + + List page = this.ocrPictureclassService.queryListNoPage(queryWrapper);; + return ResultVoUtil.success(page); + } + + /** + *方法描述：返回json字符串，接受参数，dto名称以及分页信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/list") + public ResultVo> listOcrPictureclass(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{ + SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); + OcrPictureclass ocrpictureclass = new OcrPictureclass(); + QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass); + IPage page = this.ocrPictureclassService.selectSearchListPage(paramterPage,queryWrapper); + for(OcrPictureclass ocrPictureclass:page.getRecords()){ + ocrPictureclass.setTenant(tenantService.selectDtoById(ocrPictureclass.getTenantid())); + } + return ResultVoUtil.success(page); + } + + /** + *方法描述：保存添加数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @PostMapping("/save") + public ResultVo saveOcrPictureclass(HttpServletResponse response,HttpServletRequest request,OcrPictureclass tab) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + tab.setCreateby(userToken.getLoginname()); + tab.setCreatetime(System.currentTimeMillis()); + this.ocrPictureclassService.save(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：根据页面form传来的对象修改数据 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @PostMapping("/edit") + public ResultVo editOcrPictureclass(HttpServletResponse response,HttpServletRequest request,OcrPictureclass tab) throws IOException{ + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + + tab.setUpdateby(userToken.getLoginname()); + tab.setUpdatetime(System.currentTimeMillis()); + this.ocrPictureclassService.updateById(tab); + return ResultVoUtil.success(); + } + + /** + *方法描述：通过主键获得对象信息 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/getdata/{id}") + @ResponseBody + public ResultVo getdateOcrPictureclass(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{ + OcrPictureclass dto = this.ocrPictureclassService.selectDtoById(id); + if(null != dto){ + return ResultVoUtil.success(dto); + }else{ + return ResultVoUtil.error(); + } + } + + /** + *方法描述：根据id字符串组删除对象方法，例如1,2,3 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/delmore") + @ResponseBody + public ResultVo delMoreOcrPictureclass(HttpServletResponse response,HttpServletRequest request) throws IOException{ + String ids = request.getParameter("id"); + this.ocrPictureclassService.deleteByIdMore(ids); + return ResultVoUtil.success(); + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java new file mode 100644 index 00000000..af9784f1 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java @@ -0,0 +1,75 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService; +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import cn.jyjz.xiaoyao.admin.service.UserService; +import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.controller.BaseController; +import cn.jyjz.xiaoyao.common.base.param.ParamterPage; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +@Controller +@RequestMapping("/backstage/oa/ocrpictureclassHtml") +public class OcrPictureclassHtmlController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private OcrPictureclassService ocrPictureclassService; + + @Autowired + private UserTokenService userTokenService; + @Autowired + private UserService userService; + /** + *方法描述：跳转到列表页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/toList") + public String toListOcrPictureclass(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr/ocrpictureclass/list"; + } + + /** + *方法描述：跳转到保存页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/toSave") + public String toSaveOcrPictureclass(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr/ocrpictureclass/add"; + } + + /** + *方法描述：根据ID跳转到修改页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/toEdit/{id}") + public String toEditOcrPictureclass(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") String id){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + request.setAttribute("id", id); + return "/backstage/oa/ocr/ocrpictureclass/edit"; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java new file mode 100644 index 00000000..7af2abed --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java @@ -0,0 +1,11 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +/** +* 数据持久化 +*/ +@Mapper +public interface OcrPictureclassMybatisDao extends BaseMapper { +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java new file mode 100644 index 00000000..7c06a5e0 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureclass.java @@ -0,0 +1,115 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import cn.jyjz.xiaoyao.admin.dataobject.Tenant; +import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer; +import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto; +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Map; +import java.util.AbstractMap.SimpleEntry; +import java.util.stream.Stream; +import java.util.stream.Collectors; + + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "图片分类表", title = "图片分类表") +@TableName(value = "ocr_pictureclass") +public class OcrPictureclass implements BaseDto,java.io.Serializable { + + private static final long serialVersionUID = -2826818582872L; + @Schema(description = "主键") + @TableId(value = "id",type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) + @TableField(value="ID") + private Long id; + + @Schema(description = "创建人") + @TableField(value="CREATEBY") + private String createby; + + @Schema(description = "创建时间") + @TableField(value="CREATETIME") + private Long createtime; + + @Schema(description = "修改人") + @TableField(value="UPDATEBY") + private String updateby; + + @Schema(description = "修改时间") + @TableField(value="UPDATETIME") + private Long updatetime; + + @Schema(description = "租户ID") + @JsonSerialize(using = ToStringSerializer.class) + @TableField(value="TENANTID") + private Long tenantid; + + @Schema(description = "父节点，默认为0，表示根") + @JsonSerialize(using = ToStringSerializer.class) + @TableField(value="PID") + private Long pid; + + @Schema(description = "是否有子节点") + @TableField(value="HASCHILD") + private String haschild; + + @Schema(description = "分类名称") + @TableField(value="CLASSNAME") + private String classname; + + @Schema(description = "排序字段") + @TableField(value="REORDER") + private Integer reorder; + + //租户对象 + @TableField(exist = false) + private Tenant tenant; + + //保存当前登录用户的数据权限范围的搜索条件 + @TableField(exist = false) + @JsonIgnore + private SearchQuery searchQueryrolesShowleave; + + @TableField(exist = false) + @JsonIgnore + private final Map query = Stream.of( + new SimpleEntry<>("ID","id"), + new SimpleEntry<>("CREATEBY","createby"), + new SimpleEntry<>("CREATETIME","createtime"), + new SimpleEntry<>("UPDATEBY","updateby"), + new SimpleEntry<>("UPDATETIME","updatetime"), + new SimpleEntry<>("TENANTID","tenantid"), + new SimpleEntry<>("PID","pid"), + new SimpleEntry<>("HASCHILD","haschild"), + new SimpleEntry<>("CLASSNAME","classname"), + new SimpleEntry<>("REORDER","reorder") + ) + .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue)); + @Override + public String getQueryFiled(String filedname){ + String obj = null; + if(null != query && query.size() > 0){ + obj = query.get(filedname); + } + return obj; + } +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java new file mode 100644 index 00000000..f75b65f9 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureclassService.java @@ -0,0 +1,22 @@ +package cn.jyjz.xiaoyao.ocr.service; + +import java.util.List; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** +* 业务层 +*/ +public interface OcrPictureclassService extends BaseService { + + /** + * 查询所有数据，无分页 + * + * @param queryWrapper + * @return List + */ + List queryListNoPage(QueryWrapper queryWrapper); +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java new file mode 100644 index 00000000..2431e367 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureclassServiceImpl.java @@ -0,0 +1,43 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureclassMybatisDao; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService; +import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; +import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +/** +* 业务层实现 +*/ +@Service +@Slf4j +public class OcrPictureclassServiceImpl extends BaseServiceImpl implements OcrPictureclassService { + @Autowired + private OcrPictureclassMybatisDao ocrpictureclassmybatisdao; + + + @Override + public List queryListNoPage(QueryWrapper queryWrapper) { + + Long count = ocrpictureclassmybatisdao.selectCount(queryWrapper); + + Page page = new Page(1,count); + page.setMaxLimit(count); + + IPage iPage = this.page(page,queryWrapper); + return iPage.getRecords(); + } + +} From 3c7b41abae19fd5c458d82fc967755e7333d46dd Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 12 Apr 2024 18:32:56 +0800 Subject: [PATCH 03/48] =?UTF-8?q?fix:ai=E7=BB=9F=E8=AE=A1=E5=BC=B9?= =?UTF-8?q?=E7=AA=97-=E9=87=8D=E5=A4=8D=E5=9B=BE=E7=89=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/dataobject/OcrCheckDuplicateResult.java | 4 ++++ .../jyjz/xiaoyao/ocr/dataobject/OcrPicture.java | 4 ++++ .../ocr/dataobject/OcrTaskchildPictureAppro.java | 3 +++ .../impl/OcrCheckDuplicateServiceImpl.java | 16 ++++++++++++++++ .../impl/OcrSearchHistoryServiceImpl.java | 5 +++++ .../mapper/oa/OcrTaskchildPictureMapper.xml | 6 ++++-- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java index 0dba40bc..fef242f0 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java @@ -54,4 +54,8 @@ public class OcrCheckDuplicateResult implements Serializable { @ApiModelProperty(value = "阈值分组排序值，数值越低排序越靠前，") private Integer similarityGroupOrder; + @ApiModelProperty(value = "是否重复，0.不重复 1.重复 (历史比对中阈值存在100的会显示此值)") + @TableField(exist = false) + private Integer isRepeat; + } 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 f1aef307..a48cba8a 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 @@ -346,6 +346,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable { @TableField(value = "submit_date_timestamp") private Long submitDateTimestamp; + @ApiModelProperty(value = "是否重复，0.不重复 1.重复 (历史比对中阈值存在100的会显示此值)") + @TableField(value = "is_repeat") + private Integer isRepeat; + @ApiModelProperty(value = "任务状态") @TableField(exist = false) private Integer states; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java index e642345c..2330f05d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPictureAppro.java @@ -195,4 +195,7 @@ public class OcrTaskchildPictureAppro implements java.io.Serializable { @ApiModelProperty(value = "提交时间") private Long finishTime; + @ApiModelProperty(value = "是否重复") + private Integer isRepeat; + } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java index dfa6beef..7f69cbcb 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java @@ -286,6 +286,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl saveList) throws Exception { List updateList = new ArrayList<>(); + List updateList1 = new ArrayList<>(); for (OcrCheckDuplicateResult ocrCheckDuplicateResult : saveList) { OcrPicture picture = pictureService.selectDtoById(ocrCheckDuplicateResult.getPictureId()); OcrPicture ocrPicture = new OcrPicture(); + if(ocrCheckDuplicateResult.getIsRepeat()==1){ + OcrPicture ocrPicture1 = new OcrPicture(); + if(picture.getIsRepeat() == null || picture.getIsRepeat() != 1){ + ocrPicture1.setId(picture.getId()); + ocrPicture1.setIsRepeat(1); + updateList1.add(ocrPicture1); + } + } + pictureService.updateBatchById(updateList1); //如果当前图片没有历史阈值，直接更新上阈值 if (picture.getSimilarityscore() == null) { ocrPicture.setId(picture.getId()); 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 b6e1472b..a65dbec1 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 @@ -138,7 +138,11 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl Date: Sat, 13 Apr 2024 00:08:01 +0800 Subject: [PATCH 04/48] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/modules.xml | 8 - .../web/backstage/system/information/add.html | 279 +++++++++++++++ .../backstage/system/information/edit.html | 319 ++++++++++++++++++ .../backstage/system/information/list.html | 226 +++++++++++++ 4 files changed, 824 insertions(+), 8 deletions(-) delete mode 100644 .idea/modules.xml create mode 100644 htmlweb/web/backstage/system/information/add.html create mode 100644 htmlweb/web/backstage/system/information/edit.html create mode 100644 htmlweb/web/backstage/system/information/list.html diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9f540ed7..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/htmlweb/web/backstage/system/information/add.html b/htmlweb/web/backstage/system/information/add.html new file mode 100644 index 00000000..845d5097 --- /dev/null +++ b/htmlweb/web/backstage/system/information/add.html @@ -0,0 +1,279 @@ +<#include "/common/taglibs.html" /> + + + + + 信息字段管理添加 + + + +<#include "/head/headaddedit.html" /> + + + +
+
+
+
+
+
信息字段新增
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ +<#include "/head/footadd.html" /> + + + + + + diff --git a/htmlweb/web/backstage/system/information/edit.html b/htmlweb/web/backstage/system/information/edit.html new file mode 100644 index 00000000..8844cf3b --- /dev/null +++ b/htmlweb/web/backstage/system/information/edit.html @@ -0,0 +1,319 @@ +<#include "/common/taglibs.html" /> + + + + + 岗位信息 + + + +<#include "/head/headaddedit.html" /> + + + +
+
+
+
+
+
信息字段编辑
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+ +<#include "/head/footadd.html" /> + + + + + + diff --git a/htmlweb/web/backstage/system/information/list.html b/htmlweb/web/backstage/system/information/list.html new file mode 100644 index 00000000..bfdefe61 --- /dev/null +++ b/htmlweb/web/backstage/system/information/list.html @@ -0,0 +1,226 @@ +<#include "/common/taglibs.html" /> + + + + + 信息字段管理 + + + +<#include "/head/headlist.html" /> + + +
+
+
+
+
+ +
+ +
+
+ +
+ +
+  搜索 +  重置 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<#include "/head/footlist.html" /> + + + + From 92d3993ef71ff31cb5f2c45dbd7ce7958402cf54 Mon Sep 17 00:00:00 2001 From: guanzheng <17633119157@163.com> Date: Sat, 13 Apr 2024 01:16:40 +0800 Subject: [PATCH 05/48] init --- .idea/compiler.xml | 8 +- .idea/encodings.xml | 23 ++ .idea/jarRepositories.xml | 30 +- .../web/backstage/oa/ocr/information/add.html | 279 +++++++++++++++ .../backstage/oa/ocr/information/edit.html | 319 ++++++++++++++++++ .../backstage/oa/ocr/information/list.html | 226 +++++++++++++ .../backstage/system/information/list.html | 2 +- .../ocr/controller/OcrFieldController.java | 45 ++- .../controller/OcrFieldHtmlController.java | 55 +++ .../jyjz/xiaoyao/ocr/dataobject/OcrField.java | 4 + .../cn/jyjz/xiaoyao/ocr/dto/OcrFieldDto.java | 4 + .../xiaoyao/ocr/service/OcrFieldService.java | 4 +- .../ocr/service/impl/OcrFieldServiceImpl.java | 39 +-- .../cn/jyjz/xiaoyao/ocr/vo/OcrFieldVo.java | 12 + .../src/main/resources/application-dev.yml | 10 +- 15 files changed, 1009 insertions(+), 51 deletions(-) create mode 100644 htmlweb/web/backstage/oa/ocr/information/add.html create mode 100644 htmlweb/web/backstage/oa/ocr/information/edit.html create mode 100644 htmlweb/web/backstage/oa/ocr/information/list.html create mode 100644 jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldHtmlController.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 5a9d7818..41c17930 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -31,18 +31,18 @@