Merge pull request 'feature: 20240403演示版本合并' (#66) from test into master

Reviewed-on: #66

.gitignore

@@ -2,3 +2,4 @@
 **/.idea/
 *.iml
 rebel.xml
+*.log

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java

@@ -22,6 +22,14 @@ public interface UserTokenService {
      * @return 返回用户数据库对象
      */
     User findByLoginname(String loginname);
+
+    /**
+     * 查询用户对象
+     * @param phone 登录手机号
+     * @return 返回用户数据库对象
+     */
+    User findByPhone(String phone);
+
     /**
      * 查询用户对象
      * @param userid 用户主键
@@ -124,6 +132,22 @@ public interface UserTokenService {
      */
     public Long listCount(String otherno,String loginname);
 
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @return
+     */
+    public Long listOthernoCount(String otherno);
+
+
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @param loginname 登录账号
+     * @return
+     */
+    public Long listLoginNameCount(String otherno,String loginname);
+    
     /**
      * 查询用户是否存在
      * @param otherno 企业编码
@@ -131,4 +155,11 @@ public interface UserTokenService {
      * @return
      */
     public Long listMobileCount(String otherno,String mobile);
+
+
+    /**
+     * 查询租户状态是否禁用
+     * @return
+     */
+    boolean getTenantStatus(String agentcode);
 }

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java

@@ -69,6 +69,9 @@ public class SearchQuery implements java.io.Serializable{
     public void addIn(String field,List<String> value){
         addQuery(field,value, SearchQueryConstant.SEARCH_IN);
     }
+    public void addIn(String field,String value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_IN);
+    }
     public void addInLong(String field,List<Long> value){
         addQuery(field,value, SearchQueryConstant.SEARCH_IN);
     }
@@ -92,6 +95,13 @@ public class SearchQuery implements java.io.Serializable{
     public void addGreater(String field,Integer value){
         addQuery(field,value, SearchQueryConstant.SEARCH_GREATER);
     }
+    public void addGreater(String field,String value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_GREATER);
+    }
+
+    public void addGreater(String field,Long value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_GREATER);
+    }
 
     public void addGreater(String field,BigDecimal value){
         addQuery(field,value, SearchQueryConstant.SEARCH_GREATER);
@@ -104,6 +114,9 @@ public class SearchQuery implements java.io.Serializable{
     public void addGreaterEqual(String field,Integer value){
         addQuery(field,value, SearchQueryConstant.SEARCH_GREATER_EQUAL);
     }
+    public void addGreaterEqual(String field,String value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_GREATER_EQUAL);
+    }
 
     public void addGreaterEqual(String field,BigDecimal value){
         addQuery(field,value, SearchQueryConstant.SEARCH_GREATER_EQUAL);
@@ -114,7 +127,13 @@ public class SearchQuery implements java.io.Serializable{
     public void addLess(String field,Integer value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS);
     }
+    public void addLess(String field,String value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_LESS);
+    }
 
+    public void addLess(String field,Long value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_LESS);
+    }
     public void addLess(String field,BigDecimal value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS);
     }
@@ -124,6 +143,9 @@ public class SearchQuery implements java.io.Serializable{
     public void addLessEqual(String field,Integer value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
     }
+    public void addLessEqual(String field,String value){
+        addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
+    }
 
     public void addLessEqual(String field,BigDecimal value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
@@ -132,6 +154,17 @@ public class SearchQuery implements java.io.Serializable{
     public void addLessEqual(String field,Date value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
     }
+
+    public void addRulesOp(String field,String rulesOp){
+        SearchQueryForm searchQueryForm = new SearchQueryForm();
+        if(query.get(field)!=null){
+            searchQueryForm = (SearchQueryForm) query.get(field);
+            searchQueryForm.setRulesOp(rulesOp);
+            return;
+        }
+        searchQueryForm.setRulesOp(rulesOp);
+        query.put(field,searchQueryForm);
+    }
     /**
      *
      * @param field 字段名称
@@ -155,11 +188,15 @@ public class SearchQuery implements java.io.Serializable{
             log.error("【添加搜索条件】对象-value-错误，value不能为空");
             return;
         }
-        if(null != query.get(field)){
+//        if(null != query.get(field)){
-            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
+//            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
-            return;
+//            return;
-        }
+//        }
         SearchQueryForm lf = new SearchQueryForm();
+        if(query.get(field)!=null){
+            lf = (SearchQueryForm) query.get(field);
+        }
+
         lf.setField(field);
         lf.setDataOp(SearchQueryUtil.filterMap.get(filter));
         lf.setOp(filter);

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java

@@ -8,10 +8,10 @@ import java.io.Serializable;
  */
 public class SearchQueryForm implements Serializable {
     private static final long serialVersionUID = 1L;
-    private String field;// 字段名称
+    private String field;// 字段名称 username and  t1.username = %111%(vachar)
-    private String op;// 比对条件
+    private String op;// 比对条件  =
-    private Object value;// 比对内容
+    private Object value;// 比对内容 111
-    private String type;// 类型
+    private String type;// 类型 ()
     private String rulesOp;// 搜索条件的关联方式，或/与（and/or）
     private String tablenameother = "";// 数据表别名
     private String dataOp;// 数据库中的比较条件,根据op属性获取
@@ -78,7 +78,10 @@ public class SearchQueryForm implements Serializable {
     public String getLikestar() {
         if(SearchQueryUtil.filterMap.get(this.getOp()).equals(SearchQueryConstant.SEARCH_LIKE)){
             this.setLikestar("CONCAT('%',");
+        }else  if(SearchQueryUtil.filterMap.get(this.getOp()).equals(SearchQueryConstant.SEARCH_IN)){
+            this.setLikestar("(");
         }
+
         return likestar;
     }
 
@@ -89,6 +92,8 @@ public class SearchQueryForm implements Serializable {
     public String getLikeend() {
         if(SearchQueryUtil.filterMap.get(this.getOp()).equals(SearchQueryConstant.SEARCH_LIKE)){
             this.setLikeend(",'%')");
+        }else  if(SearchQueryUtil.filterMap.get(this.getOp()).equals(SearchQueryConstant.SEARCH_IN)){
+            this.setLikeend(")");
         }
         return likeend;
     }

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/User.java

@@ -86,6 +86,9 @@ public class User implements java.io.Serializable {
 	//密码最后更新时间
 	private Long psdupdatetime;
 
+	//用户审批节点
+	private Integer nodeType;
+
 	//用户对应的角色信息，映射文件中对应的字段信息
 	@JsonIgnore
 	private List roleslist = new ArrayList(0);
@@ -129,6 +132,9 @@ public class User implements java.io.Serializable {
 	//存放其他平台关联用户的对象信息
 	private List oauthUserList = new ArrayList(0);
 
+	//前端菜单展示列表权限
+	private List<Object> frontmenuTList = new ArrayList<>();
+
 	public UserToken getFormatUserToken(){
 
 		//初始化登录用户信息

jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/vo/UserToken.java

@@ -43,4 +43,7 @@ public class UserToken implements java.io.Serializable {
     //用户登录后的签名信息，目前使用userid签名
     private String signUser;
 
+    //用户审批节点
+    private Integer nodeType;
+
 }

jyjz-common/jyjz-common-redis/src/main/java/cn/jyjz/xiaoyao/common/redis/cache/constants/CacheConstants.java

@@ -20,6 +20,12 @@ public interface CacheConstants {
     //缓存超时时间，单位：秒,目前验证码使用
     int CACHE_TIME = 300;//300;
 
+    //缓存超时时间，单位：秒,目前ai统计使用 24小时,获取验证码在使用
+    int TOOLSCOUNT_TENANTID_CACHE_TIME = 86400;
+
+    //保存ai统计租户id对象
+    String TOOLSCOUNT_TENANTID_MODEL_NAME = "toolscountmodel_tenantid";
+
     //缓存中验证码存放的关键字
     String CACHE_CODE = "CODEKAP";
 

jyjz-framework/jyjz-framework-securityweb/pom.xml

@@ -55,6 +55,18 @@
       <artifactId>jyjz-framework-security</artifactId>
     </dependency>
 
+    <!--  阿里云短信依赖  -->
+    <dependency>
+      <groupId>com.aliyun</groupId>
+      <artifactId>aliyun-java-sdk-core</artifactId>
+      <version>4.5.16</version>
+    </dependency>
+    <dependency>
+      <groupId>com.aliyun</groupId>
+      <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+      <version>2.1.0</version>
+    </dependency>
+
     <!-- 验证码 -->
     <dependency>
       <groupId>com.github.penggle</groupId>

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java

@@ -5,6 +5,7 @@ import cn.jyjz.xiaoyao.common.base.exception.CommonExceptionCodeEnum;
 import cn.jyjz.xiaoyao.common.base.exception.ServiceException;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
+import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.common.base.util.UserUtils;
 import cn.jyjz.xiaoyao.common.base.vo.User;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
@@ -27,6 +28,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.servlet.HandlerExceptionResolver;
 
 /**
  * https://blog.csdn.net/zkc7441976/article/details/111034574
@@ -58,7 +60,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         String[] excludespath = systemopenurlService.getOpenUrl();
 
         //不需要过滤的url
-        String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid"};
+        String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid","/doc.html","/swagger-ui.html","/swagger-resources","/webjars/**","/v2/api-docs"};
 
         String[] urls =  ArrayUtils.addAll(excludespath, excludesOther);
 
@@ -143,6 +145,12 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
                 }
             }
+            else{
+                //抛出filter异常到全局处理异常
+                HandlerExceptionResolver hadoopHandlerExceptionResolver = SpringUtils.getBean("handlerExceptionResolver");
+                hadoopHandlerExceptionResolver.resolveException(request,response,null, new ServiceException(CommonExceptionCodeEnum.DATA_TOKEN_NULL));
+                return;
+            }
         }
 
         filterChain.doFilter(request, response);

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/MyAuthenticationProvider.java

@@ -17,8 +17,12 @@ import cn.jyjz.xiaoyao.framework.security.captcha.utile.CaptchUtil;
 import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel;
 import cn.jyjz.xiaoyao.framework.security.service.FlowableUserLoginService;
 import cn.jyjz.xiaoyao.framework.security.service.OnlineUserService;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
@@ -88,8 +92,16 @@ public class MyAuthenticationProvider implements AuthenticationProvider {
 //        //从缓存中删除验证码
 //        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("密码错误!");
         }
 
         //判断验证码不能为空
@@ -103,15 +115,36 @@ public class MyAuthenticationProvider implements AuthenticationProvider {
 //        }
     
         //判断手机号与企业编码是否存在
-        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("企业编码错误！");
+//        }
+
+        //企业编码是否存在
+        if(!"admin".equals(loginname) && userTokenService.listOthernoCount(agentcode).intValue() <= 0){
+            throw new AuthenticationServiceException("企业编码错误！");
         }
 
+        boolean tenantStatus = userTokenService.getTenantStatus(agentcode);
+        if (!"admin".equals(loginname) && !tenantStatus) {
+            throw new AuthenticationServiceException("该租户已被冻结！");
+        }
+
+        //判断账号是否存在
+        if(!"admin".equals(loginname) && userTokenService.listLoginNameCount(agentcode,loginname).intValue() <= 0){
+            throw new AuthenticationServiceException("账号不存在！");
+        }
 
         //数据库查询用户对象
         User user = userTokenService.findByLoginname(loginname);
         if(null == user){
             throw new AuthenticationServiceException("账号密码不正确");
+        }else if(user.getEnabled() == 0){
+            throw new AuthenticationServiceException("该账号被禁用");
         }
 
         //TODO 处理同一个用户，多次登录
@@ -153,7 +186,7 @@ public class MyAuthenticationProvider implements AuthenticationProvider {
         }
 
         //userTokenService.savePasswordMaxRetry(user.getLoginname());
-        throw new AuthenticationServiceException("账号密码不正确");
+        throw new AuthenticationServiceException("密码错误");
     }
 
     @Override

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/controller/SmsLoginController.java

@@ -29,7 +29,7 @@ public class SmsLoginController {
         String agentcode = request.getParameter("agentcode");
         
         //判断手机号与企业编码是否存在
-        if(userTokenService.listCount(agentcode,phone).intValue() <= 0){
+        if(userTokenService.listMobileCount(agentcode,phone).intValue() <= 0){
             return ResultVoUtil.error("企业编码或手机号错误。");
         }
         

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/service/impl/SmsLoginServiceImpl.java

@@ -2,7 +2,6 @@ package cn.jyjz.xiaoyao.framework.security.service.impl;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.jyjz.xiaoyao.common.base.config.XiaoyaoConfig;
-import cn.jyjz.xiaoyao.common.base.constant.RequestParameterConstans;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenOnlineService;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.validator.PhoneNumberValidator;
@@ -14,10 +13,10 @@ import cn.jyjz.xiaoyao.common.redis.cache.constants.CacheConstants;
 import cn.jyjz.xiaoyao.framework.security.authentication.sms.SmsProvider;
 import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel;
 import cn.jyjz.xiaoyao.framework.security.service.SmsLoginService;
+import cn.jyjz.xiaoyao.framework.security.sms.MsmService;
 import cn.jyjz.xiaoyao.framework.security.utils.JwtUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
@@ -26,6 +25,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.regex.Matcher;
 
@@ -46,6 +48,9 @@ public class SmsLoginServiceImpl implements SmsLoginService {
     private SmsProvider smsProvider;
     @Resource
     private XiaoyaoConfig xiaoyaoConfig;
+
+    @Resource
+    private MsmService msmservice;
     @Override
     public ResultVo sendCode(String phone) {
         //校验手机号
@@ -53,13 +58,34 @@ public class SmsLoginServiceImpl implements SmsLoginService {
         if (!isPhone) {
             return ResultVoUtil.error("请输入正确的手机号。");
         }
+
+        // 检查手机号当天获取验证码的次数
+        // 获取今天的日期，用于计算当天的发送次数
+        LocalDate today = LocalDate.now();
+        String cacheKey = "verification_count_" + phone + "_" + today;
+        Integer count = iCacheManager.get(CacheConstants.USER_PHONE_MODEL_NAME, cacheKey);
+        if (count == null) {
+            count = 0;
+        }
+        if (count >= 10) {
+            return ResultVoUtil.error("获取验证码次数超限，请明天再试！");
+        }
+
+
         //生成验证码
-        String code = RandomUtil.randomNumbers(6);
+        String code = RandomUtil.randomNumbers(4);
 
         //TODO 发送短信
+        Map<String,Object> map=new HashMap<>();
+        map.put("code",code);
+        msmservice.send(map,phone);
+
         //用户登录信息写入缓存
         iCacheManager.put(CacheConstants.USER_PHONE_MODEL_NAME,phone,code,CacheConstants.CACHE_TIME);
 
+        // 更新手机号当天获取验证码的次数
+        iCacheManager.put(CacheConstants.USER_PHONE_MODEL_NAME, cacheKey, count + 1, CacheConstants.TOOLSCOUNT_TENANTID_CACHE_TIME);
+
         //保存验证码到 缓存中
         return ResultVoUtil.success(code);
     }
@@ -88,7 +114,7 @@ public class SmsLoginServiceImpl implements SmsLoginService {
         }
     
         //数据库查询用户对象
-        User user = userTokenService.findByLoginname(phone);
+        User user = userTokenService.findByPhone(phone);
         if(null == user){
             return ResultVoUtil.error("用户错误。");
         }

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/sms/MsmService.java

@@ -0,0 +1,8 @@
+package cn.jyjz.xiaoyao.framework.security.sms;
+
+import java.util.Map;
+
+public interface MsmService {
+    //发送验证码
+    boolean send(Map<String, Object> param, String phone);
+}

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/sms/MsmServiceImpl.java

@@ -0,0 +1,46 @@
+package cn.jyjz.xiaoyao.framework.security.sms;
+
+import cn.jyjz.xiaoyao.common.base.util.StringUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.profile.DefaultProfile;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class MsmServiceImpl implements MsmService{
+    @Override
+    public boolean send(Map<String, Object> param, String phone) {
+        if(StringUtils.isEmpty(phone)) return false;
+
+        //default 地域节点， 后面是 阿里云的 id和秘钥
+        DefaultProfile profile = DefaultProfile.getProfile("default", "LTAI5t764kWdwYXDGYzDnRuJ", "iI2HiElIzbNiyGw1h4UdRE6Fw8159f");
+        IAcsClient client = new DefaultAcsClient(profile);
+
+        //这里不能修改
+        CommonRequest request = new CommonRequest();
+        //request.setProtocol(ProtocolType.HTTPS);
+//        request.setMethod(MethodType.POST);
+        request.setDomain("dysmsapi.aliyuncs.com");
+        request.setVersion("2017-05-25");
+        request.setAction("SendSms");
+
+        request.putQueryParameter("PhoneNumbers", phone);                    //手机号
+        request.putQueryParameter("SignName", "北京码城科技");    //申请阿里云 签名名称（用的也是阿里云和模板配套的服务器配置好）
+        request.putQueryParameter("TemplateCode", "SMS_465342327"); //申请阿里云 模板code（用的也是阿里云和签名配套的服务器配置好）
+        request.putQueryParameter("TemplateParam", JSONObject.toJSONString(param));
+
+        try {
+            CommonResponse response = client.getCommonResponse(request);
+            System.out.println(response.getData());
+            return response.getHttpResponse().isSuccess();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+}

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/SFrontmenuTDao.java

@@ -0,0 +1,20 @@
+package cn.jyjz.xiaoyao.admin.dataDao;
+
+import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 前端菜单表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-25
+ */
+@Mapper
+public interface SFrontmenuTDao extends BaseMapper<SFrontmenuT> {
+
+    List<SFrontmenuT>  queryUserMenuById(String loginName);
+}

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataDao/UserTenantMybatisDao.java

@@ -19,6 +19,20 @@ public interface UserTenantMybatisDao extends BaseMapper<UserTenant> {
      */
     Long listCount(Map<String, Object> query);
 
+    /**
+     * 查询企业编码是否存在
+     * @param query （otherno是否能够命中）
+     * @return
+     */
+    Long listOthernoCount(Map<String, Object> query);
+
+    /**
+     * 查询用户是否存在
+     * @param query （otherno、loginname是否同时能够命中）
+     * @return
+     */
+    Long listLoginNameCount(Map<String, Object> query);
+    
     /**
      * 查询用户是否存在
      * @param query （otherno、mobile是否同时能够命中）

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/SFrontmenuT.java

@@ -0,0 +1,61 @@
+package cn.jyjz.xiaoyao.admin.dataobject;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 前端菜单表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("s_frontmenu_t")
+@ApiModel(value="SFrontmenuT对象", description="前端菜单表")
+public class SFrontmenuT implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.NONE)
+    private Long id;
+
+    @ApiModelProperty(value = "菜单名")
+    private String name;
+
+    @ApiModelProperty(value = "父级菜单ID")
+    private Integer parentId;
+
+    @ApiModelProperty(value = "资源标识唯一KEY")
+    private String resKey;
+
+    @ApiModelProperty(value = "菜单地址")
+    private String resUrl;
+
+    @ApiModelProperty(value = "菜单级别")
+    private Integer level;
+
+    @ApiModelProperty(value = "菜单图标")
+    private String icon;
+
+    @ApiModelProperty(value = "菜单排序")
+    private Integer orderNum;
+
+    @ApiModelProperty(value = "菜单是否隐藏（0:否,1:是）")
+    private Integer ishide;
+
+    @ApiModelProperty(value = "菜单描述")
+    private String description;
+
+}

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/dataobject/User.java

@@ -124,6 +124,9 @@ public class User implements BaseDto,java.io.Serializable {
 	@TableField(value="PSDUPDATETIME")
 	@JsonSerialize(using = DateSerializer.class)
 	private Long psdupdatetime;
+	@Schema(description = "用户审批节点")
+	@TableField(value="NODETYPE")
+	private Integer nodeType;
 
 	//用户对应的角色信息，映射文件中对应的字段信息
 	@JsonIgnore
@@ -178,6 +181,10 @@ public class User implements BaseDto,java.io.Serializable {
 	@TableField(exist = false)
 	private List<Department> deptlist = new ArrayList<Department>(0);
 
+	//前端菜单展示列表权限
+	@TableField(exist = false)
+	private List<SFrontmenuT> frontmenuTList = new ArrayList<>();
+
 	public UserToken getUserToken(){
 
 		UserToken userToken = BeanUtil.copyProperties(this,UserToken.class);

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/ISFrontmenuTService.java

@@ -0,0 +1,19 @@
+package cn.jyjz.xiaoyao.admin.service;
+
+import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端菜单表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-25
+ */
+public interface ISFrontmenuTService extends IService<SFrontmenuT> {
+
+    List<SFrontmenuT> queryUserMenuById(String loginName);
+
+}

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserService.java

@@ -24,6 +24,13 @@ public interface UserService extends BaseService<User>  {
      */
     public User findByLoginname(String loginname);
 
+    /**
+     * 根据登录手机号查询用户信息
+     * @param phone 登录手机号
+     * @return 用户对象
+     */
+    public User findByPhone(String phone);
+    
     /**
      * 根据主键查询用户信息
      * @param userid

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/UserTenantService.java

@@ -41,6 +41,23 @@ public interface UserTenantService extends BaseService<UserTenant>  {
      */
     public Long listCount(String otherno,String loginname);
 
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @return
+     */
+    public Long listOthernoCount(String otherno);
+
+
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @param loginname 登录账号
+     * @return
+     */
+    public Long listLoginNameCount(String otherno,String loginname);
+
+    
     /**
      * 查询用户是否存在
      * @param otherno 企业编码

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/SFrontmenuTServiceImpl.java

@@ -0,0 +1,34 @@
+package cn.jyjz.xiaoyao.admin.service.impl;
+import cn.jyjz.xiaoyao.admin.dataDao.SFrontmenuTDao;
+import cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT;
+import cn.jyjz.xiaoyao.admin.service.ISFrontmenuTService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import javax.annotation.Resource;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 前端菜单表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-25
+ */
+@Service
+@Slf4j
+public class SFrontmenuTServiceImpl extends ServiceImpl<SFrontmenuTDao, SFrontmenuT> implements ISFrontmenuTService {
+
+    @Resource
+    private SFrontmenuTDao sFrontmenuTDao;
+
+    @Override
+    public List<SFrontmenuT> queryUserMenuById(String loginName){
+        List<SFrontmenuT> sFrontmenuTList = sFrontmenuTDao.queryUserMenuById(loginName);
+
+        return sFrontmenuTList;
+    }
+
+}

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@ import cn.jyjz.xiaoyao.admin.dataDao.UserobjectMybatisDao;
 import cn.jyjz.xiaoyao.admin.dataDao.UserpostMybatisDao;
 import cn.jyjz.xiaoyao.admin.dataDao.UserrolesMybatisDao;
 import cn.jyjz.xiaoyao.admin.dataobject.*;
+import cn.jyjz.xiaoyao.admin.service.ISFrontmenuTService;
 import cn.jyjz.xiaoyao.admin.service.UserService;
 import cn.jyjz.xiaoyao.admin.service.UserTenantService;
 import cn.jyjz.xiaoyao.common.base.config.XiaoyaoConfig;
@@ -77,6 +78,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMybatisDao,User>  imple
 
 	@Resource
 	private UserTenantService userTenantService;
+
+	@Resource
+	private ISFrontmenuTService isFrontmenuTService;
+
 	/**
 	 * 根据登录账号查询用户信息
 	 * @param loginname 登录账号
@@ -102,8 +107,43 @@ public class UserServiceImpl extends BaseServiceImpl<UserMybatisDao,User>  imple
 		user.formatDeptlist(departmentList);
 		user.setTenantList(this.userTenantService.listUserTenant(user.getId()));
 
+		//返回用户前端菜单权限列表
+		List<SFrontmenuT> frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname());
+		user.setFrontmenuTList(frontmenuTList1);
 		return user;
 	}
+
+	/**
+	 * 根据登录手机号查询用户信息
+	 * @param phone 登录手机号
+	 * @return 用户对象
+	 */
+	@Override
+	public User findByPhone(String phone){
+
+		if(StringUtils.isBlank(phone)){
+			throw new ServiceException(CommonExceptionCodeEnum.PARAM_NOTVALID);
+		}
+
+		QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("MOBILE",phone);
+
+		User user = this.usermybatisdao.selectOne(queryWrapper);
+
+		if(null == user){
+			return null;
+		}
+
+		List<Department> departmentList = this.departmentMybatisDao.selectDeptByUserid(user.getId());
+		user.formatDeptlist(departmentList);
+		user.setTenantList(this.userTenantService.listUserTenant(user.getId()));
+
+		//返回用户前端菜单权限列表
+		List<SFrontmenuT> frontmenuTList1 = isFrontmenuTService.queryUserMenuById(user.getLoginname());
+		user.setFrontmenuTList(frontmenuTList1);
+		return user;
+	}
+
 	/**
 	 * 根据主键查询用户信息
 	 * @param userid

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTenantServiceImpl.java

@@ -97,6 +97,32 @@ public class UserTenantServiceImpl extends BaseServiceImpl<UserTenantMybatisDao,
 		return this.userTenantMybatisDao.listCount(query);
 	}
 
+	/**
+	 * 查询用户是否存在
+	 * @param otherno 企业编码
+	 * @return
+	 */
+	public Long listOthernoCount(String otherno){
+		Map<String, Object> query = new HashMap<>();
+		query.put("otherno",otherno);
+		return this.userTenantMybatisDao.listOthernoCount(query);
+	}
+
+
+	/**
+	 * 查询用户是否存在
+	 * @param otherno 企业编码
+	 * @param loginname 登录账号
+	 * @return
+	 */
+	public Long listLoginNameCount(String otherno,String loginname){
+		Map<String, Object> query = new HashMap<>();
+		query.put("otherno",otherno);
+		query.put("loginname",loginname);
+		return this.userTenantMybatisDao.listLoginNameCount(query);
+	}
+
+	
 	/**
 	 * 查询用户是否存在
 	 * @param otherno 企业编码

jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.jyjz.xiaoyao.admin.dataobject.Department;
 import cn.jyjz.xiaoyao.admin.dataobject.Oauthuser;
 import cn.jyjz.xiaoyao.admin.dataobject.Roles;
+import cn.jyjz.xiaoyao.admin.dataobject.Tenant;
 import cn.jyjz.xiaoyao.admin.service.*;
 import cn.jyjz.xiaoyao.common.base.config.XiaoyaoConfig;
 import cn.jyjz.xiaoyao.common.base.exception.CommonExceptionCodeEnum;
@@ -34,6 +35,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.auth0.jwt.exceptions.TokenExpiredException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,6 +82,9 @@ public class UserTokenServiceImpl implements UserTokenService {
     @Resource
     private UserTokenOnlineService userTokenOnlineService;
 
+    @Autowired
+    private TenantService tenantService;
+    
     public User findByLoginname(String loginname) {
 
         cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByLoginname(loginname);
@@ -96,6 +101,24 @@ public class UserTokenServiceImpl implements UserTokenService {
         User user = BeanUtil.copyProperties(userData,User.class);
         return user;
     }
+
+    public User findByPhone(String phone) {
+
+        cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByPhone(phone);
+
+        if(null == userData){
+            return null;
+        }
+        Department department = this.departmentService.selectRootDepartid(userData.getDepartment());
+        if(null != department){
+            //userData.setDepartname(department.getDepartname());
+            userData.setDepartmentRootId(department.getId());
+        }
+
+        User user = BeanUtil.copyProperties(userData,User.class);
+        return user;
+    }
+
     public User findByUserid(Long userid) {
         
         cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findById(userid);
@@ -371,6 +394,27 @@ public class UserTokenServiceImpl implements UserTokenService {
         return userTenantService.listCount(otherno,loginname);
     }
 
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @return
+     */
+    public Long listOthernoCount(String otherno){
+        return userTenantService.listOthernoCount(otherno);
+    }
+
+
+    /**
+     * 查询用户是否存在
+     * @param otherno 企业编码
+     * @param loginname 登录账号
+     * @return
+     */
+    public Long listLoginNameCount(String otherno,String loginname){
+        return userTenantService.listLoginNameCount(otherno,loginname);
+    }
+
+    
     /**
      * 查询用户是否存在
      * @param otherno 企业编码
@@ -380,4 +424,17 @@ public class UserTokenServiceImpl implements UserTokenService {
     public Long listMobileCount(String otherno,String mobile){
         return userTenantService.listMobileCount(otherno,mobile);
     }
+
+
+    /**
+     * 查询租户状态是否禁用
+     * @return
+     */
+    @Override
+    public boolean getTenantStatus(String agentcode){
+        LambdaQueryWrapper<Tenant> tenantLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tenantLambdaQueryWrapper.eq(Tenant::getOtherno,agentcode);
+        Tenant tenant = tenantService.getOne(tenantLambdaQueryWrapper);
+        return tenant != null && tenant.getStatus() == 0;
+    }
 }

jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/SFrontmenuTMapper.xml

@@ -0,0 +1,32 @@
+<?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.admin.dataDao.SFrontmenuTDao">
+  <resultMap id="BaseResultMap" type="cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT">
+
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="parentId" jdbcType="INTEGER" property="parentId" />
+    <result column="resKey" jdbcType="VARCHAR" property="resKey" />
+    <result column="resUrl" jdbcType="VARCHAR" property="resKey" />
+    <result column="level" jdbcType="INTEGER" property="level" />
+    <result column="icon" jdbcType="VARCHAR" property="icon" />
+    <result column="orderNum" jdbcType="INTEGER" property="orderNum" />
+    <result column="ishide" jdbcType="INTEGER" property="ishide" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, `name`, parentId, resKey, resUrl, `level`, icon, orderNum, ishide, description
+  </sql>
+
+  <select id="queryUserMenuById" resultType="cn.jyjz.xiaoyao.admin.dataobject.SFrontmenuT">
+    SELECT
+      T3.*
+    FROM
+      s_user_frontmenu_t T1
+        LEFT JOIN s_user_t T2 ON T1.userId = T2.ID
+        LEFT JOIN s_frontmenu_t T3 on T3.id = T1.menuId
+    WHERE
+      T2.LOGINNAME = #{loginname}
+    ORDER BY T3.orderNum asc
+  </select>
+</mapper>

jyjz-system/jyjz-system-admin/src/main/resources/mapper/admin/UserTenantMapper.xml

@@ -62,6 +62,33 @@
 			)
 
 	</select>
+
+	<select id="listOthernoCount" resultType="java.lang.Long" parameterType="java.util.Map">
+		select
+			count(ten.ID)
+		from
+			S_TENANT_T ten
+		where
+			ten.OTHERNO = #{otherno}
+	</select>
+
+	<select id="listLoginNameCount" resultType="java.lang.Long" parameterType="java.util.Map">
+		select
+			count(ten.ID)
+		from
+			S_TENANT_T ten
+		where
+			ten.OTHERNO = #{otherno}
+		  and
+				ten.ID in (
+				select ue.TENANTID from
+									   S_USER_T us,
+									   S_USER_TENANT_T ue where us.LOGINNAME = #{loginname}
+			)
+
+	</select>
+
+
 	<select id="listMobileCount" resultType="java.lang.Long" parameterType="java.util.Map">
 		select
 			count(ten.ID)

jyjz-system/jyjz-system-oa/pom.xml

@@ -27,7 +27,11 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.14</version> <!-- 或者最新版本 -->
+        </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/common/ProcessConstant.java

@@ -1,5 +1,8 @@
 package cn.jyjz.flowable.common;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 流程相关的常量
  */
@@ -9,4 +12,13 @@ public class ProcessConstant {
     public static final String BPMN_FILE_SUFFIX = ".bpmn";
 
     public static final String FORM_FILE_SUFFIX = ".form";
+
+    public static Map<Integer, String> userNodeType;
+
+    static {
+        userNodeType = new HashMap<>();
+        userNodeType.put(1, "一级审批");
+        userNodeType.put(2, "二级审批");
+        userNodeType.put(3, "最终审批");
+    }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/common/SystemConstantsOa.java

@@ -59,6 +59,11 @@ public interface SystemConstantsOa extends SystemConstants {
     Integer OA_STATUS_TYPE_REFUSE = 5;
     String OA_BUSSINRSS_NO_FIX = "TTZZ";
 
+    //无量云回传任务状态
+    Integer OCR_STATUS_SUCCESS = 0;
+    //无量云回传任务状态
+    Integer OCR_STATUS_FAILURE = 1;
+    
     //上传参考图存放的文件夹名称
     String OCR_IMG_UP_PATH = File.separator + "upload" + File.separator + "ocr" + File.separator;
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java

@@ -2,10 +2,10 @@ package cn.jyjz.flowable.controller;
 
 import cn.jyjz.flowable.common.SystemConstantsOa;
 import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto;
-import cn.jyjz.flowable.domain.vo.FlowTaskVO;
+import cn.jyjz.flowable.entity.FlowApprove;
+import cn.jyjz.flowable.entity.FlowTaskInfo;
 import cn.jyjz.flowable.service.IFlowTaskService;
 import cn.jyjz.flowable.utils.PageUtils;
-import cn.jyjz.flowable.utils.SysConstant;
 import cn.jyjz.xiaoyao.abase.service.SeqManageService;
 import cn.jyjz.xiaoyao.admin.dataobject.User;
 import cn.jyjz.xiaoyao.admin.service.UserService;
@@ -15,38 +15,38 @@ import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery;
+import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQueryForm;
 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.common.mybatisplus.util.SearchQueryFormat;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
-import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
 import cn.jyjz.xiaoyao.oa.from.service.UserapproveService;
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
+import cn.jyjz.xiaoyao.ocr.service.OcrSearchmanagerService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
+import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.alanpoi.common.util.StringUtils;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.*;
-import org.flowable.ui.common.model.RemoteUser;
+import org.apache.commons.collections4.CollectionUtils;
-import org.flowable.ui.common.service.idm.RemoteIdmService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
-import java.math.BigDecimal;
+import java.text.ParseException;
-import java.util.Date;
+import java.text.SimpleDateFormat;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Api(tags = "ocr_流程接口")
@@ -71,7 +71,7 @@ public class FlowTaskController extends BaseController {
     private OcrTaskchildPictureService ocrTaskchildPictureService;
 
     @Resource
-    private UserapproveService userapproveService;
+    private OcrUsersearchchildService usersearchchildService;
 //    /**
 //     * 查询我的待办任务
 //     * @return
@@ -86,6 +86,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 查看过程流程图
+     *
      * @param processId
      * @return
      * @throws Exception
@@ -101,6 +102,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 查看已办流程图
+     *
      * @param processId
      * @return
      * @throws Exception
@@ -116,6 +118,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 查看表单主键
+     *
      * @return
      */
     @PostMapping("/viewFormid")
@@ -132,82 +135,41 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 完成任务
+     *
      * @return
      */
     @ApiOperation(value = "任务审批", notes = "任务审批")
     @PostMapping("/completeFlow")
     @ResponseBody
-    public ResultVo complete(FlowTaskVO taskVO,HttpServletRequest request){
+    public ResultVo complete(@RequestBody FlowApprove approve, HttpServletRequest request) {
-        Boolean flag = flowTaskService.complete(taskVO,request);
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-        return flag?ResultVoUtil.success():ResultVoUtil.error();
+        Integer flag = flowTaskService.complete(approve, userToken, Arrays.asList(approve.getFlowTaskInfoList().get(0).getFormId()));
+        return flag > 0 ? ResultVoUtil.success() : ResultVoUtil.error();
     }
 
     /**
      * 批量任务审批
+     *
      * @return
      */
     @ApiOperation(value = "任务审批", notes = "任务审批")
     @PostMapping("/completeBatchFlow")
     @ResponseBody
-    public ResultVo completeBatch(HttpServletRequest request){
+    public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) {
-    
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-    
         //任务ID
-        String[] taskId = request.getParameterValues("taskId");
+        List<FlowTaskInfo> flowTaskInfoList = approve.getFlowTaskInfoList();
-        //审批的任务主键
+        if (CollectionUtils.isNotEmpty(flowTaskInfoList)) {
-        String[] formid = request.getParameterValues("formid");
+            List<String> formIdList = flowTaskInfoList.stream().map(FlowTaskInfo::getFormId).collect(Collectors.toList());
-    
-        String[] taskname = request.getParameterValues("taskname");
-        
-        //是否同意，true：同意，false：拒绝
-        boolean approvd = Boolean.valueOf(request.getParameter("approvd"));
-    
-        //审批意见")
-        String taskComment = request.getParameter("taskComment");
-    
             //判断当前任务审批人是否一致
-        if(!this.ocrTaskchildPictureService.validateAssignee(formid,userToken)){
+            List<String> formIds = ocrTaskchildPictureService.validateAssignee(formIdList, userToken);
-            return ResultVoUtil.error("审批人不一致，请到任务审批中处理。");
+            // 判断当前任务是否审批完毕
-        }
+            if (CollectionUtils.isNotEmpty(formIds)) {
-        
+                Integer success = flowTaskService.complete(approve, userToken, formIds);
-        //TODO  判断当前任务是否审批完毕
+                return ResultVoUtil.success("审批成功" + success + "条，" + "无权审核" + (flowTaskInfoList.size() - success) + "条", "");
-        if(!this.ocrTaskchildPictureService.validateApprove(formid)){
-            return ResultVoUtil.error("存在已经审批的任务。");
-        }
-        
-        //TODO  判断taskid是否为非法，空置、taskid是否存在
-        
-        //判断当前任务是否存在历史任务--暂时不做，生成任务时直接保存历史任务的审批工具中
-
-        StringBuffer smg = new StringBuffer();
-        for(int i = 0;i < taskId.length;i++){
-            String ti = taskId[i];
-            String fi = formid[i];
-            FlowTaskVO taskVO = new FlowTaskVO();
-            taskVO.setTaskId(ti);
-            taskVO.setFormid(fi);
-            taskVO.setApprovd(approvd);
-            taskVO.setTaskComment(taskComment);
-    
-            Boolean flag = flowTaskService.complete(taskVO,request);
-            
-            if(!flag){
-                if(StringUtils.isNotBlank(smg.toString())){
-                    smg.append("，");
-                    smg.append(taskname[i]);
-                    smg.append("审批失败");
-                }else{
-                    smg.append(taskname[i]);
-                    smg.append("审批失败");
-                }
-
             }
         }
-        
+        return ResultVoUtil.success("审核成功0条，" + "无权审核" + flowTaskInfoList.size() + "条", "");
-        
-        
-        return (StringUtils.isNotBlank(smg.toString()))?ResultVoUtil.error(smg.toString()):ResultVoUtil.success();
     }
 
     @GetMapping("/listhistore")
@@ -217,9 +179,11 @@ public class FlowTaskController extends BaseController {
         List<HistoricTaskInstanceDto> list = flowTaskService.listHistoriceTask(processInstanceId);
         return ResultVoUtil.success(list);
     }
+
     /**
      * 我的已办
      * 查询我发起的已经完成的任务
+     *
      * @return
      */
     @GetMapping("/finishedList")
@@ -239,9 +203,11 @@ public class FlowTaskController extends BaseController {
 
         return ResultVoUtil.success(pageUtils);
     }
+
     /**
      * 我的发起
      * 查询我发起的已经完成的任务
+     *
      * @return
      */
     @ApiOperation(value = "待办任务", notes = "待办任务")
@@ -318,9 +284,11 @@ public class FlowTaskController extends BaseController {
         }
         return ResultVoUtil.success(pageUtils);
     }
+
     /**
      * 我的任务
      * 查询我的待办、已经办理任务
+     *
      * @return
      */
     @ApiOperation(value = "我的任务", notes = "查询我的待办、已经办理任务")
@@ -331,21 +299,27 @@ public class FlowTaskController extends BaseController {
     @ResponseBody
     public ResultVo listAlldata(PageUtils pageUtils, HttpServletRequest request) {
         SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-        
         //租户主键，由前端页面传送
         String tenantId = request.getHeader("X-Tenant-Id");
 
+        String taskName = request.getParameter("keyword");
         if (org.apache.commons.lang3.StringUtils.isBlank(tenantId)) {
             return ResultVoUtil.error("租户主键不能为空");
         }
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) {
+            searchQuery.addLike("fromtaskname", taskName);
+        }
+
+        //获取用户预设检索条件id
+        String userSearchId = request.getParameter("userSearchId");
+
 
         User user = this.userService.getSessionUser(request);
         if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
-            
             flowTaskService.getMyProcessInstances(searchQuery.getQuery(), pageUtils);
         } else {
 
-            flowTaskService.getMyProcessInstances(user,tenantId,searchQuery.getQuery(),pageUtils);
+            flowTaskService.getMyProcessInstances(user, tenantId, searchQuery.getQuery(), pageUtils,userSearchId);
 
             //待办信息，增加是否查看标记
 //            if(StringUtils.isNotBlank(assigneeId) && assigneeId.equals(user.getId().toString())){
@@ -364,8 +338,33 @@ public class FlowTaskController extends BaseController {
         }
         return ResultVoUtil.success(pageUtils);
     }
+
+    private void disSearchQuery(SearchQuery query, OcrUsersearchchild userSearch) {
+        if (userSearch.getSearchtype().equals("eq")) {
+            if (userSearch.getSearchvalue().contains(",")) {
+                String[] userIds = userSearch.getSearchvalue().split(",");
+                List<String> arrayData = Arrays.asList(userIds);
+                query.addIn(userSearch.getSearchfield(), arrayData);
+            } else {
+                query.addEqual(userSearch.getSearchfield(), userSearch.getSearchvalue());
+            }
+        }
+        if (userSearch.getSearchtype().equals("noteq")) {
+            if (userSearch.getSearchvalue().contains(",")) {
+                String[] userIds = userSearch.getSearchvalue().split(",");
+                List<String> arrayData = Arrays.asList(userIds);
+                query.addNotIn(userSearch.getSearchfield(), arrayData);
+            } else {
+                query.addNotEqual(userSearch.getSearchfield(), userSearch.getSearchvalue());
+            }
+        }
+
+    }
+
+
     /**
      * 终审列表
+     *
      * @return
      */
     @ApiOperation(value = "我的终审列表", notes = "我的终审列表")
@@ -375,29 +374,94 @@ public class FlowTaskController extends BaseController {
     @GetMapping("/listfinal")
     @ResponseBody
     public ResultVo<OcrTaskchildPicture> listFinalData(PageUtils<OcrTaskchildPicture> pageUtils,
-                                                       @RequestParam(name="search_fromuserid", defaultValue="",required = false) String searchFromuserid,
+                                                       @RequestParam(name = "izupuser", defaultValue = "", required = false) String izupuser,
-                                                       @RequestParam(name="search_fromprojectid", defaultValue="",required = false) String searchFromprojectid,
+                                                       @RequestParam(name = "taskName", defaultValue = "", required = false) String taskName,
-                                                       @RequestParam(name="search_fromplanid", defaultValue="",required = false) String searchFromplanid,
+                                                       @RequestParam(name = "izproject", defaultValue = "", required = false) String izproject,
-                                                       @RequestParam(name="search_states", defaultValue="",required = false) String searchStates,
+                                                       @RequestParam(name = "izplan", defaultValue = "", required = false) String izplan,
-                                                       @RequestParam(name="search_fromsourceid", defaultValue="",required = false) String searchFromsourceid,
+                                                       @RequestParam(name = "izstatus", defaultValue = "", required = false) String izstatus,
-                                                       @RequestParam(name="fromuptime_start", defaultValue="",required = false) BigDecimal fromuptimeStart,
+                                                       @RequestParam(name = "iztaskrrom", defaultValue = "", required = false) String iztaskrrom,
-                                                       @RequestParam(name="fromuptime_end", defaultValue="",required = false) BigDecimal fromuptimeEnd,
+                                                       @RequestParam(name = "izuptime", defaultValue = "", required = false) String izuptime,
                                                        HttpServletRequest request) {
         SearchQuery searchQuery = new SearchQuery();
-        if(org.springframework.util.StringUtils.hasText(searchFromuserid)){
+        if (org.springframework.util.StringUtils.hasText(izupuser)) {
-            searchQuery.addEqual("fromuserid",searchFromuserid);
+//            searchQuery.addEqual("fromuserid",izupuser);
+            if (izupuser.contains(",")) {
+                String[] userIds = izupuser.split(",");
+                List<String> arrayData = Arrays.asList(userIds);
+                searchQuery.addIn("fromuserid", arrayData);
+            } else {
+                searchQuery.addEqual("fromuserid", izupuser);
+            }
         }
-        if(org.springframework.util.StringUtils.hasText(searchFromprojectid)){
+        if(StringUtils.isNotBlank(taskName)){
-            searchQuery.addEqual("fromprojectid",searchFromprojectid);
+            searchQuery.addLike("fromtaskname",taskName);
+        }
+        if (org.springframework.util.StringUtils.hasText(izproject)) {
+            if (izproject.contains(",")) {
+                String[] projectIds = izproject.split(","); // 以逗号拆分字符串
+                List<String> arrayData = Arrays.asList(projectIds);
+                SearchQueryForm searchQueryForm = new SearchQueryForm();
+                searchQuery.addIn("fromprojectname", arrayData);
+            } else {
+                searchQuery.addEqual("fromprojectname", izproject);
+            }
+        }
+        if (org.springframework.util.StringUtils.hasText(izplan)) {
+            if (izplan.contains(",")) {
+                String[] planIds = izplan.split(","); // 以逗号拆分字符串
+                List<String> arrayData = Arrays.asList(planIds);
+                SearchQueryForm searchQueryForm = new SearchQueryForm();
+                searchQuery.addIn("fromplanid", arrayData);
+            } else {
+                searchQuery.addEqual("fromplanid", izplan);
             }
-        if(org.springframework.util.StringUtils.hasText(searchFromplanid)){
-            searchQuery.addEqual("fromplanid",searchFromplanid);
         }
-        if(org.springframework.util.StringUtils.hasText(searchStates)){
+        if (org.springframework.util.StringUtils.hasText(izstatus)) {
-            searchQuery.addEqual("states",searchStates);
+            if (izstatus.contains(",")) {
+                String[] statusIds = izstatus.split(","); // 以逗号拆分字符串
+                List<String> arrayData = Arrays.asList(statusIds);
+                SearchQueryForm searchQueryForm = new SearchQueryForm();
+                searchQuery.addIn("states", arrayData);
+            } else {
+                searchQuery.addEqual("states", izstatus);
+            }
+        }
+        if (org.springframework.util.StringUtils.hasText(iztaskrrom)) {
+            if (iztaskrrom.contains(",")) {
+                String[] taskrromIds = iztaskrrom.split(","); // 以逗号拆分字符串
+                List<String> arrayData = Arrays.asList(taskrromIds);
+                SearchQueryForm searchQueryForm = new SearchQueryForm();
+                searchQuery.addIn("fromsourceid", arrayData);
+            } else {
+                searchQuery.addEqual("fromsourceid", iztaskrrom);
+            }
+        }
+
+        if (org.springframework.util.StringUtils.hasText(izuptime)) {
+            String[] dateRange = izuptime.split("-");
+            if (dateRange.length == 2) {
+                try {
+                    SimpleDateFormat sdfInput = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+
+                    // 解析开始时间
+                    Long startTimeStamp = sdfInput.parse(dateRange[0].trim() + " 00:00:00").getTime();
+
+                    // 解析结束时间
+                    Long endTimeStamp = sdfInput.parse(dateRange[1].trim() + " 23:59:59").getTime();
+
+                    // 如果开始时间不为空，则将其放入查询条件中
+                    if (startTimeStamp != null) {
+                        searchQuery.addGreater("createdateStart", startTimeStamp);
+                    }
+                    // 如果结束时间不为空，则将其放入查询条件中
+                    if (endTimeStamp != null) {
+                        searchQuery.addLess("createdateEnd", endTimeStamp);
+                    }
+                } catch (ParseException e) {
+                    // 处理日期解析异常
+                    e.printStackTrace();
+                }
             }
-        if(org.springframework.util.StringUtils.hasText(searchFromsourceid)){
-            searchQuery.addEqual("fromsourceid",searchFromsourceid);
         }
         //租户主键，由前端页面传送
         String tenantId = request.getHeader("X-Tenant-Id");
@@ -411,22 +475,57 @@ public class FlowTaskController extends BaseController {
             searchQuery.addEqual("thisLoginUserid", user.getId().toString());
             searchQuery.addEqual("tenantid", tenantId);
         }
+        String searchId = request.getParameter("searchId");
 
-        Map<String,Object> query = searchQuery.getQuery();
+        if (StringUtils.isNotBlank(searchId)) {
-        if(fromuptimeStart != null){
+            List<OcrUsersearchchild> list = usersearchchildService.list(new LambdaQueryWrapper<OcrUsersearchchild>().eq(OcrUsersearchchild::getUsersearchid, searchId).orderByAsc(OcrUsersearchchild::getOrderNum));
-            query.put("fromuptimeStart",fromuptimeStart);
+            for (OcrUsersearchchild userSearch : list) {
+                disSearchQuery(searchQuery, userSearch);
             }
-        if(fromuptimeEnd != null) {
-            query.put("fromuptimeEnd", fromuptimeEnd);
         }
+
+        Map<String, Object> query = searchQuery.getQuery();
+
+
         flowTaskService.getFinalProcessInstances(query, pageUtils);
         return ResultVoUtil.success(pageUtils);
     }
 
+
+    /**
+     * 终审列表(高级检索)
+     *
+     * @return
+     */
+    @ApiOperation(value = "图片分页列表查询-根据用户预设检索条件查询", notes = "")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
+            @ApiImplicitParam(paramType = "path", name = "userSearchId", value = "预设检索条件id", required = true),
+    })
+    @GetMapping(value = "/listfinalAdvanced")
+    public ResultVo<IPage<OcrTaskchildPicture>> queryPageByUserSearchId(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+            HttpServletRequest req) {
+
+        //租户主键，由前端页面传送
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if (org.apache.commons.lang3.StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        //获取用户预设检索条件id
+        String userSearchId = req.getParameter("userSearchId");
+        IPage<OcrTaskchildPicture> pageList = flowTaskService.queryPageByUserSearchId(pageNo, pageSize, userSearchId);
+        return ResultVoUtil.success(pageList);
+    }
+
+
     /**
      * 我的发起
      * 查询我发起的已经完成的任务
      * （CATEGORYID）流程类型为必填项
+     *
      * @return
      */
     @GetMapping("/listdataall")
@@ -462,8 +561,10 @@ public class FlowTaskController extends BaseController {
         }
         return ResultVoUtil.success(flowUnionVoList);
     }
+
     /**
      * 抄送给我的
+     *
      * @param pageUtils
      * @param request
      * @return
@@ -480,9 +581,11 @@ public class FlowTaskController extends BaseController {
 
         return ResultVoUtil.success(pageUtils);
     }
+
     /**
      * 抄送我的
      * 查询我发起的已经完成的任务
+     *
      * @return
      */
     @GetMapping("/mylistcc")
@@ -495,8 +598,10 @@ public class FlowTaskController extends BaseController {
 
         return ResultVoUtil.success(flowableccIPage);
     }
+
     /**
      * 撤销流程
+     *
      * @return
      */
     @GetMapping("/cancelTask")
@@ -511,6 +616,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 重置流程流程
+     *
      * @return
      */
     @ApiOperation(value = "重置流程流程", notes = "重置流程流程")
@@ -530,6 +636,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 审批历史记录
+     *
      * @return
      */
     @ApiOperation(value = "重置流程流程", notes = "重置流程流程")
@@ -549,6 +656,7 @@ public class FlowTaskController extends BaseController {
 
     /**
      * 重复任务
+     *
      * @return
      */
     @ApiOperation(value = "重复流程", notes = "重复流程")
@@ -557,7 +665,24 @@ public class FlowTaskController extends BaseController {
     })
     @GetMapping("/repetitionTask")
     @ResponseBody
-    public ResultVo repetitionTask(HttpServletRequest request){
+    public ResultVo repetitionTask() {
         return flowTaskService.repetitionTask();
     }
+
+    /**
+     * 重复任务
+     *
+     * @return
+     */
+    @ApiOperation(value = "重复流程", notes = "重复流程")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
+    })
+    @GetMapping("/repetitionTaskList")
+    @ResponseBody
+    public ResultVo repetitionTaskList(@RequestParam(name = "pageNo") Integer pageNo,
+                                       @RequestParam(name = "pageSize") Integer pageSize) {
+        Page<OcrTaskchildPicture> result = flowTaskService.repetitionTaskList(pageNo, pageSize);
+        return ResultVoUtil.success(result);
+    }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/entity/FlowApprove.java

@@ -0,0 +1,46 @@
+package cn.jyjz.flowable.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * ClassName： FlowApprove$.java
+ * Description:
+ * Author： scl.
+ * Date： 2024/3/28 17:04
+ */
+@Data
+public class FlowApprove {
+
+    /**
+     * 备注
+     */
+    private String comment;
+    /**
+     * 审批结果
+     */
+    private Boolean result;
+    /**
+     * 失败原因
+     */
+    private String failCauseName;
+    /**
+     * 失败原因id
+     */
+    private String failCauseId;
+
+    /**
+     * 处理方式
+     */
+    private String disposeType;
+
+    /**
+     * 处理方式id
+     */
+    private String disposeTypeId;
+    /**
+     * 任务id集合
+     */
+    private List<FlowTaskInfo> flowTaskInfoList;
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/entity/FlowTaskInfo.java

@@ -0,0 +1,25 @@
+package cn.jyjz.flowable.entity;
+
+import lombok.Data;
+
+/**
+ * ClassName： FlowTaskInfo$.java
+ * Description:
+ * Author： scl.
+ * Date： 2024/3/28 20:09
+ */
+@Data
+public class FlowTaskInfo {
+    /**
+     * 流程任务id
+     */
+    private String formId;
+    /**
+     * 任务id
+     */
+    private String taskId;
+    /**
+     * 任务名称
+     */
+    private String taskName;
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFlowTaskService.java

@@ -3,8 +3,8 @@ package cn.jyjz.flowable.service;
 
 import cn.jyjz.flowable.domain.dto.HistoricTaskInstanceDto;
 import cn.jyjz.flowable.domain.vo.FlowTaskCompleteVO;
-import cn.jyjz.flowable.domain.vo.FlowTaskVO;
 import cn.jyjz.flowable.domain.vo.WorkFlowNodeVO;
+import cn.jyjz.flowable.entity.FlowApprove;
 import cn.jyjz.flowable.utils.PageUtils;
 import cn.jyjz.xiaoyao.admin.dataobject.User;
 import cn.jyjz.xiaoyao.common.base.param.ParamterPage;
@@ -13,8 +13,13 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.task.api.Task;
 
@@ -32,7 +37,8 @@ public interface IFlowTaskService {
 
     Category viewForm(String processId, HttpServletRequest request);
 
-    Boolean complete(FlowTaskVO taskVO, HttpServletRequest request);
+    Integer complete(FlowApprove approve, UserToken userToken, List<String> formIds);
+
 
     /**
      * 获取当前任务的可回退的流程集合
@@ -49,7 +55,7 @@ public interface IFlowTaskService {
      * @param processDefinition
      */
     public void updateAssignee(String processInstanceId, String processDefinitionId, ProcessDefinition processDefinition);
-
+    void sendMsg(OcrTaskchildPicture model, UserToken userToken);
     void finishedList(PageUtils pageUtils, HttpServletRequest request);
 
     /**
@@ -68,7 +74,16 @@ public interface IFlowTaskService {
      * @param tenantId
      * @param pageUtils
      */
-    public void getMyProcessInstances(User user,String tenantId, Map<String, Object> query,PageUtils pageUtils);
+    public void getMyProcessInstances(User user,String tenantId, Map<String, Object> query,PageUtils pageUtils,String userSearchId);
+
+    /**
+     * 查询我的待办、已经办理任务
+     *
+     * @param user
+     * @param tenantId
+     * @param pageUtils
+     */
+    public List<OcrTaskchildPictureAppro> getMyProcessInstancesNew(User user, String tenantId, Map<String, Object> query, PageUtils pageUtils);
     
     /**
      * 查询最终审批数据
@@ -79,6 +94,17 @@ public interface IFlowTaskService {
      */
     public void getFinalProcessInstances(Map<String, Object> query, PageUtils<OcrTaskchildPicture> pageUtils);
 
+
+    /**
+     * 根本预设检索条件id，分页查询任务信息
+     * @param pageNo
+     * @param pageSize
+     * @param userSearchId
+     * @return
+     */
+    IPage<OcrTaskchildPicture> queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId);
+
+
     /**
      * 查询我发起的流程实例
      * 不做分类
@@ -152,4 +178,6 @@ public interface IFlowTaskService {
      * @return
      */
     ResultVo repetitionTask();
+
+    Page<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/IFormCustomService.java

@@ -1,6 +1,7 @@
 package cn.jyjz.flowable.service;
 
 import cn.jyjz.flowable.domain.vo.FlowModelVO;
+import org.flowable.task.api.Task;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -36,7 +37,7 @@ public interface IFormCustomService<T> {
      * @param deploymentid
      * @param processdefinitionid
      */
-    public boolean updateForm(String fromid,String deploymentid,String processdefinitionid,String assignee,String taskId,String processInstanceId,String tasknme);
+    public boolean updateForm(String fromid, String deploymentid, String processdefinitionid, String assignee, String taskId, String processInstanceId, Task task);
     /**
      * 表单流程状态修改
      * @param fromid 表单主键

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowInstanceServiceImpl.java

@@ -93,12 +93,12 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
                     throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey);
                 }
                 List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
-                String taskname = "";
+                Task task = null;
                 if (null != list && !list.isEmpty()) {
-                    taskname = list.get(0).getName();
+                    task = list.get(0);
                 }
                 //保存instanceId到数据库，需要根据流程分类进行，判断更新
-                boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname);
+                boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), task);
                 if (isupdate) {
                     FlowModelVO flowModelVO = iFormCustomService.getForm(formid);
                     //增加未查看记录
@@ -165,12 +165,12 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
                     throw new ServiceException("没有审批人，请联系管理员，流程定义：" + businessKey);
                 }
                 List<Task> list = this.flowTaskService.nowRunTask(processInstance.getProcessInstanceId(), processInstance.getProcessDefinitionId());
-                String taskname = "";
+                Task task = null;
                 if (null != list && !list.isEmpty()) {
-                    taskname = list.get(0).getName();
+                    task = list.get(0);
                 }
                 //保存instanceId到数据库，需要根据流程分类进行，判断更新
-                boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), taskname);
+                boolean isupdate = iFormCustomService.updateForm(formid, processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstance.getProcessInstanceId(), task);
                 if (isupdate) {
                     FlowModelVO flowModelVO = iFormCustomService.getForm(formid);
                     //增加未查看记录

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1,12 +1,15 @@
 package cn.jyjz.flowable.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.jyjz.flowable.common.SystemConstantsOa;
 import cn.jyjz.flowable.config.CustomProcessDiagramGenerator;
 import cn.jyjz.flowable.domain.vo.*;
+import cn.jyjz.flowable.entity.FlowApprove;
+import cn.jyjz.flowable.entity.FlowTaskInfo;
 import cn.jyjz.flowable.service.IFlowInstanceService;
 import cn.jyjz.xiaoyao.common.base.language.SystemMessage;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
-import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 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;
@@ -27,18 +30,23 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
 
 import cn.jyjz.xiaoyao.oa.from.dataobject.Flowablecc;
-import cn.jyjz.xiaoyao.oa.from.dataobject.UserFinal;
 import cn.jyjz.xiaoyao.oa.from.service.*;
 
 import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
+import cn.jyjz.xiaoyao.oa.from.vo.RepeatedTaskVo;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.dataobject.*;
-import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.service.*;
+import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskchildPictureApproVo;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.ObjectUtils;
 import org.flowable.bpmn.constants.BpmnXMLConstants;
 import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
@@ -46,10 +54,8 @@ import org.flowable.engine.ProcessEngineConfiguration;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.history.HistoricProcessInstanceQuery;
-import org.flowable.engine.impl.persistence.entity.ActivityInstanceEntity;
 import org.flowable.engine.impl.util.ExecutionGraphUtil;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.task.Comment;
@@ -62,7 +68,6 @@ import org.flowable.task.api.history.HistoricTaskInstance;
 import org.flowable.task.api.history.HistoricTaskInstanceQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -100,6 +105,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     private IRunFlowableActinstDao runFlowableActinstDao;
     @Resource
     private IHisFlowableActinstDao hisFlowableActinstDao;
+
+    @Resource
+    private OcrUsersearchService ocrUsersearchService;
+
+    @Resource
+    private OcrPictureService ocrPictureService;
+
+    @Resource
+    private IOcrMsgService ocrMsgService;
+
     @Override
     public void myTodoTaskList(PageUtils vo, HttpServletRequest request) {
 
@@ -304,6 +319,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         category.setFormid(busskey[1]);
         return category;
     }
+
     /**
      * 获取已办流程过程图
      *
@@ -419,98 +435,96 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * 完成任务
      */
     @Override
-    public Boolean complete(FlowTaskVO taskVO,HttpServletRequest request) {
+    public Integer complete(FlowApprove approve, UserToken userToken, List<String> formIds) {
+        Integer successCount = 0;
         try {
+            if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(approve.getFlowTaskInfoList())) {
+                List<FlowTaskInfo> flowTaskInfoList = approve.getFlowTaskInfoList();
+                for (FlowTaskInfo flowTaskInfo : flowTaskInfoList) {
+                    if (!formIds.contains(flowTaskInfo.getFormId())) {
+                        continue;
+                    }
                     // 当前要处理的任务
-            Task task = taskService.createTaskQuery().taskId(taskVO.getTaskId()).singleResult();
+                    Task task = taskService.createTaskQuery().taskId(flowTaskInfo.getTaskId()).singleResult();
                     // 查询流程定义的信息
                     ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery()
                             .processDefinitionId(task.getProcessDefinitionId())
                             .singleResult();
                     // 对任务添加对应的审批意见
-            taskService.addComment(task.getId(),task.getProcessInstanceId(),taskVO.getTaskComment());
+                    taskService.addComment(task.getId(), task.getProcessInstanceId(), approve.getComment());
-            
                     Map<String, Object> variables = new HashMap<>();
-            if(null != taskVO.getTaskApprovd() && StringUtils.isNotBlank(taskVO.getTaskApprovd().toString())){
+                    variables.put("approvd", approve.getResult());
-                variables.put("taskApprovd",taskVO.getTaskApprovd().intValue());
+                    OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(flowTaskInfo.getFormId()));
-            }
+                    if (approve.getResult()) {
-            variables.put("approvd",taskVO.getApprovd());
+                        disposeSucceedTask(task, processDefinition, variables, model, flowTaskInfo.getFormId(), userToken);
-            
+                    } else {
-            //只有同意，再进行候选人设置
+                        disposeFailureTask(task, flowTaskInfo.getFormId(), variables);
-            if(taskVO.getApprovd()){
-                //进入下一个节点
-                taskService.complete(task.getId(),variables);
-
-                
-                //判断是否存在表单二次提交
-                if(StringUtils.isNotBlank(taskVO.getDocumentation()) && taskVO.getDocumentation().equals(SystemConstantsOa.OA_TASK_COMPLETE_FORM)){
-                    //获取流程类型
-                    String category = processDefinition.getCategory();
-                    if(StringUtils.isNotBlank(category)){
-                        Category categoryDto = this.categoryService.getCategory(category);
-                        //解析页面请求，并持久化
-                        IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-                        
-                        //TODO 如果更新失败，需要撤销流程
-                        if(null == iFormCustomService.editForm(request,taskVO.getFormid())){
-                            //撤销审批
-                            
-                        }
                     }
+                    userapproveService.save(userToken, approve, task, flowTaskInfo.getFormId());
+                    successCount++;
                 }
-                //判断是否存在表单三次提交
-                if(StringUtils.isNotBlank(taskVO.getDocumentation()) && taskVO.getDocumentation().equals(SystemConstantsOa.OA_TASK_COMPLETE_THREE_FORM)){
-                    //获取流程类型
-                    String category = processDefinition.getCategory();
-                    if(StringUtils.isNotBlank(category)){
-                        Category categoryDto = this.categoryService.getCategory(category);
-                        //解析页面请求，并持久化
-                        IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-                        
-                        //TODO 如果更新失败，需要撤销流程
-                        if(null == iFormCustomService.editForm(request,taskVO.getFormid())){
-                            //撤销审批
-                            
             }
+            //保存当前审批用户与业务表的关系
+            return successCount;
+        } catch (Exception e) {
+            log.error("e={}", e);
         }
+        return successCount;
     }
-                updateAssignee(task.getProcessInstanceId(),task.getProcessDefinitionId(),processDefinition);
 
+    /**
+     * 处理审批成功任务
+     */
+    private void disposeSucceedTask(Task task, ProcessDefinition processDefinition, Map<String, Object> variables, OcrTaskchildPicture model, String formId, UserToken userToken) {
+        //进入下一个节点
+        taskService.complete(task.getId(), variables);
+        updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition);
         String category = processDefinition.getCategory();
         Category categoryDto = this.categoryService.getCategory(category);
         IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-    
+        FlowModelVO formData = iFormCustomService.getForm(formId);
-                FlowModelVO formData = iFormCustomService.getForm(taskVO.getFormid());
-    
         List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid());
         Task taskData = null;
         if (null != taskList && !taskList.isEmpty()) {
             taskData = taskList.get(0);
         }
+        if (ObjectUtils.isEmpty(taskData)) {
+            model.setFinishtime(System.currentTimeMillis());
+            model.setStates(SystemConstantsOa.OA_STATUS_TYPE_END);
+            ocrTaskchildPictureService.updateById(model);
+        } else {
             //判断节点上的描述字段，是否伟finale_judgment,如果是，记录到终审表中，如果终审表已经存在，不再重复记录
-                if(null != taskData && StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)){
+            if (StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) {
-                    UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
                 User user = userService.findByLoginname(formData.getAssignee());
-                    userFinalService.save(user.getId().toString(),taskVO.getFormid());
+                userFinalService.save(user.getId().toString(), formId);
+            }
+            OcrTaskchildPicture childPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId));
+            this.sendMsg(childPicture, userToken);
+            childPicture.setTaskId(taskData.getId());
+            childPicture.setTaskname(taskData.getName());
+            ocrTaskchildPictureService.updateById(childPicture);
         }
-                
         //增加未查看记录
         userViewApproeService.saveUserViewApproe(formData.getAssignee(), formData.getFormid().toString(), formData.getTenantid().toString());
-            }else{
+
+    }
+
+    /**
+     * 处理失败任务
+     */
+    private void disposeFailureTask(Task task, String formId, Map<String, Object> variables) {
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
         //我这里以 流程定义key(oa_category_t定义的关键字，逻辑唯一) + 业务表主键（请假表、调岗表等） + 业务表对应的servicename
         String businesskey = processInstance.getBusinessKey();
         //3、修改业务表状态
         //判断业务key是否存在
         if (StringUtils.isNotBlank(businesskey)) {
-                    
             String assignee = "";
             BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
             //传节点定义key获取当前节点
             FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey());
             if (flowElement instanceof UserTask) {
                 UserTask userTask = (UserTask) flowElement;
-                        
                 //如果审批不存在，需要在候选组中查询
                 if (StringUtils.isBlank(userTask.getAssignee())) {
                     assignee = userTask.getAssignee();
@@ -521,33 +535,47 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             //设置流程结束状态
             iFormCustomService.endForm(busskey[1], SystemConstantsOa.OA_STATUS_TYPE_REFUSE, assignee, task.getProcessInstanceId(), task.getName());
         }
-                
         //1、获取终止节点
         List<EndEvent> endNodes = findEndFlowElement(task.getProcessDefinitionId());
-                String endId = endNodes.get(0).getId();
         //2、执行终止
         List<Execution> executions = runtimeService.createExecutionQuery().parentId(task.getProcessInstanceId()).list();
         List<String> executionIds = new ArrayList<>();
         executions.forEach(execution -> executionIds.add(execution.getId()));
-                runtimeService.createChangeActivityStateBuilder().moveExecutionsToSingleActivityId(executionIds, endId).processVariables(variables).changeState();
+        OcrTaskchildPicture taskchildPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId));
-                
+        taskchildPicture.setFinishtime(System.currentTimeMillis());
-            }
+        ocrTaskchildPictureService.updateById(taskchildPicture);
-
+    }
-            
+
-            UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+    //发送消息
-            //保存当前审批用户与业务表的关系
+    public void sendMsg(OcrTaskchildPicture model, UserToken userToken) {
-            userapproveService.save(userToken.getUserid(),taskVO,task);
+        cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee());
-
+        OcrMsg msg = new OcrMsg();
-            
+        msg.setCreateTime(System.currentTimeMillis());
-            return true;
+        msg.setSendTime(System.currentTimeMillis());
-        }catch (Exception e){
+        msg.setReceiveUserIds(byLoginname.getId().toString());
-            log.error("e={}",e);
+        msg.setTitile(model.getFromtaskname());
-        }
+        msg.setSender(Long.valueOf(userToken.getUserid()));
-        return false;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("taskId", model.getFromtaskid());
+        jsonObject.put("nodeName", model.getTaskname());
+        jsonObject.put("states", 1);
+        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("pictureId", model.getPictureid());
+        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);
     }
 
     /**
      * 更新当前节点处理人信息
+     *
      * @param processDefinition
      */
     public void updateAssignee(String processInstanceId, String processDefinitionId, ProcessDefinition processDefinition) {
@@ -568,11 +596,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             if (StringUtils.isNotBlank(businesskey)) {
                 String[] busskey = businesskey.split(SystemConstantsOa.OA_BUSSINESS_KEY_SPLIT);
                 iFormCustomService = SpringUtils.getBean(busskey[2]);
-                iFormCustomService.updateForm(busskey[1],processDefinition.getDeploymentId(),processDefinition.getId(),flowTaskCompleteVO.getAssignee(),flowTaskCompleteVO.getTaskId(),processInstanceId,task.getName());
+                iFormCustomService.updateForm(busskey[1], processDefinition.getDeploymentId(), processDefinition.getId(), flowTaskCompleteVO.getAssignee(), flowTaskCompleteVO.getTaskId(), processInstanceId, task);
             }
         }
 
     }
+
     public List findEndFlowElement(String processDefId) {
         Process mainProcess = repositoryService.getBpmnModel(processDefId).getMainProcess();
         Collection<FlowElement> list = mainProcess.getFlowElements();
@@ -581,8 +610,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         return list.stream().filter(f -> f instanceof EndEvent).collect(Collectors.toList());
     }
+
     /**
      * 查看当前执行人列表
+     *
      * @param processInstanceId
      * @return
      */
@@ -636,6 +667,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     /**
      * 设置当前审批节点的审批人
      * 目前只多候选组和多个候选人起作用
+     *
      * @param processInstanceId
      */
     public FlowTaskCompleteVO updateNowTaskAssignee(String processInstanceId, String processDefinitionId) {
@@ -703,6 +735,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         return flowTaskCompleteVO;
     }
+
     /**
      * 设置当前审批节点的
      */
@@ -713,8 +746,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .list();
         return taskList;
     }
+
     /**
      * 获取下一个节点审批人信息
+     *
      * @param userTaskList
      * @param bpmnModel
      * @param currentId
@@ -755,6 +790,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
     /**
      * 查询我的已办信息
+     *
      * @param pageUtils
      */
     @Override
@@ -879,6 +915,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
     /**
      * 查看任务的流程记录
+     *
      * @return
      */
     public List<HistoricTaskInstanceDto> listHistoriceTask(String processInstanceId) {
@@ -943,7 +980,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         if (StringUtils.isNotBlank(pageUtils.getSortname())) {
             paramterPage.setSortname(pageUtils.getSortname());
         } else {
-            paramterPage.setSortname("CREATEDATE");
+            paramterPage.setSortname("submit_date_timestamp");
         }
 
         if (StringUtils.isNotBlank(pageUtils.getSortorder())) {
@@ -1048,6 +1085,49 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         pageUtils.setList(list);
     }
 
+
+    @Override
+    public IPage<OcrTaskchildPicture> queryPageByUserSearchId(Integer pageNo, Integer pageSize, String userSearchId) {
+        OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId);
+        List<OcrUsersearchchild> ocrUsersearchchildList = ocrUsersearch.getOcrUsersearchchildList();
+        for (OcrUsersearchchild ocrUsersearchchild : ocrUsersearchchildList) {
+            String searchfield = ocrUsersearchchild.getSearchfield();
+            switch (searchfield) {
+                case "izupuser":
+                    ocrUsersearchchild.setSearchfield("FROMUSERID");
+                    break;
+                case "izproject":
+                    ocrUsersearchchild.setSearchfield("FROMPROJECTID");
+                    break;
+                case "izplan":
+                    ocrUsersearchchild.setSearchfield("FROMPLANID");
+                    break;
+                case "izstatus":
+                    ocrUsersearchchild.setSearchfield("STATES");
+                    break;
+                case "iztaskrrom":
+                    ocrUsersearchchild.setSearchfield("FROMSOURCEID");
+                    break;
+                case "izuptime":
+                    ocrUsersearchchild.setSearchfield("FROMUPTIME");
+                    break;
+
+                default:
+                    break;
+            }
+            ocrUsersearch.setOcrUsersearchchildList(ocrUsersearchchildList);
+        }
+        QueryWrapper<OcrTaskchildPicture> queryWrapper = new QueryWrapper();
+        for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
+            this.formattingSearchChild(queryWrapper, usersearchchild);
+        }
+        //分页查询并组装子集数据
+        Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
+        IPage<OcrTaskchildPicture> pageList = ocrTaskchildPictureService.page(page, queryWrapper);
+        return pageList;
+    }
+
+
     /**
      * 查询我发起的流程实例
      *
@@ -1086,6 +1166,32 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //        flowableccIPage.setRecords(list);
         for (FlowUnionVo flowUnionVo : list) {
 
+            if (flowUnionVo.getStates() != null) {
+                String stateText;
+                switch (flowUnionVo.getStates()) {
+                    case 1:
+                        stateText = "撤销";
+                        break;
+                    case 2:
+                        stateText = "审批中";
+                        break;
+                    case 3:
+                        stateText = "审批通过";
+                        break;
+                    case 5:
+                        stateText = "审批未通过";
+                        break;
+                    default:
+                        stateText = "未知状态";
+                        break;
+                }
+                // 将中文状态赋值给 flowUnionVo 的状态属性
+                flowUnionVo.setStatesText(stateText);
+
+            } else {
+                //暂定，后期会修改
+                flowUnionVo.setStatesText("审批中");
+            }
             //查询对应的流程分类
             Category category = categoryService.selectDtoById(flowUnionVo.getCategoryid());
             flowUnionVo.setCategoryDto(category);
@@ -1186,7 +1292,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @param tenantId
      * @param pageUtils
      */
-    public void getMyProcessInstances(User user,String tenantId,Map<String, Object> searchQuery, PageUtils pageUtils){
+    public void getMyProcessInstances(User user, String tenantId, Map<String, Object> searchQuery, PageUtils pageUtils, String userSearchId) {
         ParamterPage paramterPage = new ParamterPage();
         paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize());
         paramterPage.setPagesize(pageUtils.getPageSize());
@@ -1211,14 +1317,33 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         query.put("searchassignee", user.getLoginname());
         query.putAll(searchQuery);
 
+//        if (!StringUtils.isBlank(userSearchId)) {
+//            OcrUsersearch ocrUsersearch = ocrUsersearchService.selectByUserSearchId(userSearchId);
+//            SearchQuery additionalQuery = new SearchQuery();
+//            for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
+//                this.formattingSearchChild1(additionalQuery, usersearchchild);
+//            }
+//            query.putAll(additionalQuery.getQuery());
+//        }
+
         Long count = ocrTaskchildPictureService.listmytaskCount(query);
 
         query.put("page", paramterPage);
         List<OcrTaskchildPictureAppro> list = ocrTaskchildPictureService.listmytask(query);
-    
         for (OcrTaskchildPictureAppro taskchildPicture : list) {
+
+            if (taskchildPicture.getPictureid() != null && !taskchildPicture.getPictureid().isEmpty()) {
+                Long pictureId = Long.parseLong(taskchildPicture.getPictureid());
+                LambdaQueryWrapper<OcrPicture> ocrPictureLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                ocrPictureLambdaQueryWrapper.eq(OcrPicture::getId, pictureId);
+                OcrPicture ocrPictureOne = ocrPictureService.getOne(ocrPictureLambdaQueryWrapper);
+                taskchildPicture.setFromUserName(ocrPictureOne.getField1());
+                taskchildPicture.setPicture(ocrPictureOne);
+                taskchildPicture.setFinishTime(ocrPictureOne.getSubmitDateTimestamp());
+            }
+
             //查询对应的流程分类
-            Category category = categoryService.selectDtoById(taskchildPicture.getCategoryid());
+            Category category = categoryService.selectDtoById(Long.parseLong(taskchildPicture.getCategoryid()));
             taskchildPicture.setCategoryDto(category);
 
             if (StringUtils.isNotBlank(taskchildPicture.getProcessdefinitionid())) {
@@ -1304,9 +1429,109 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
 
         pageUtils.setTotalCount(count.intValue());
-        pageUtils.setList(list);
+
+        //补充历史状态名称，检查补充节点信息
+        for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : list) {
+            //审批节点 当前如果没有历史操作，则将当前节点赋值到历史审批节点中.
+            if (StringUtils.isBlank(ocrTaskchildPictureAppro.getTasknamehis())) {
+                ocrTaskchildPictureAppro.setTasknamehis(ocrTaskchildPictureAppro.getTaskname());
+            }
+
+            if (ocrTaskchildPictureAppro.getStatshis() != null) {
+                String stateText;
+                switch (ocrTaskchildPictureAppro.getStatshis()) {
+                    case 1:
+                        stateText = "待审批";
+                        break;
+                    case 2:
+                        stateText = "通过";
+                        break;
+                    case 3:
+                        stateText = "不通过";
+                        break;
+                    default:
+                        stateText = "未知状态";
+                        break;
+                }
+                // 将中文状态赋值给 flowUnionVo 的状态属性
+                ocrTaskchildPictureAppro.setStatshisText(stateText);
+
+            } else {
+                //暂定，后期修改
+                ocrTaskchildPictureAppro.setStatshisText("待审批");
+            }
+        }
+
+        List<OcrTaskchildPictureApproVo> listNew = new ArrayList<>();
+        for (OcrTaskchildPictureAppro one : list) {
+            OcrTaskchildPictureApproVo ocrTaskchildPictureApproVo = new OcrTaskchildPictureApproVo();
+            ocrTaskchildPictureApproVo.setId(one.getId()); //任务id
+            ocrTaskchildPictureApproVo.setFromtaskname(one.getFromtaskname()); //任务名称
+            ocrTaskchildPictureApproVo.setStatshisText(one.getStatshisText()); //历史-审批状态中文
+            ocrTaskchildPictureApproVo.setTasknamehis(one.getTasknamehis());//历史-审批节点名称
+            ocrTaskchildPictureApproVo.setFinishTime(one.getFinishTime()); //完成时间
+            ocrTaskchildPictureApproVo.setReleaseProvince(one.getPicture().getReleaseprovince()); //省份
+            ocrTaskchildPictureApproVo.setFromprojectid(one.getFromprojectid()); //项目id
+            ocrTaskchildPictureApproVo.setProductName(one.getPicture().getField9()); //产品
+            ocrTaskchildPictureApproVo.setCategory(one.getCategory());  //类型
+            ocrTaskchildPictureApproVo.setFromsourceid(one.getFromsourceid()); //原始任务id
+            ocrTaskchildPictureApproVo.setCustomerType(one.getPicture().getField2()); //客户类型
+            ocrTaskchildPictureApproVo.setCustomerName(one.getPicture().getField3()); //客户名称
+            ocrTaskchildPictureApproVo.setItemCategory(one.getPicture().getField17());//项目类别
+            ocrTaskchildPictureApproVo.setFromUserName(one.getFromUserName()); //提报人
+            ocrTaskchildPictureApproVo.setManufacturer(one.getPicture().getField5()); //manufacturer
+            ocrTaskchildPictureApproVo.setPackageid(one.getPackageid()); //任务包id
+            ocrTaskchildPictureApproVo.setProjectName(one.getFromprojectname());//项目名称
+            ocrTaskchildPictureApproVo.setCustomerLevel(one.getFromCustomerLevel());//客户级别
+            ocrTaskchildPictureApproVo.setReleaseArea(one.getFromCity());//拜访城市
+
+            listNew.add(ocrTaskchildPictureApproVo);
         }
 
+        pageUtils.setList(listNew);
+    }
+
+
+    /**
+     * 查询我的待办、已经办理任务
+     *
+     * @param user
+     * @param tenantId
+     * @param pageUtils
+     */
+    public List<OcrTaskchildPictureAppro> getMyProcessInstancesNew(User user, String tenantId, Map<String, Object> searchQuery, PageUtils pageUtils) {
+        ParamterPage paramterPage = new ParamterPage();
+        paramterPage.setStart((pageUtils.getCurrPage() - 1) * pageUtils.getPageSize());
+        paramterPage.setPagesize(pageUtils.getPageSize());
+
+        if (StringUtils.isNotBlank(pageUtils.getSortname())) {
+            paramterPage.setSortname(pageUtils.getSortname());
+        } else {
+            paramterPage.setSortname("CREATEDATE");
+        }
+
+        if (StringUtils.isNotBlank(pageUtils.getSortorder())) {
+            paramterPage.setSortorder(pageUtils.getSortorder());
+        } else {
+            paramterPage.setSortorder("DESC");
+        }
+        Map<String, Object> query = new HashMap<>();
+        query.put("page", paramterPage);
+
+        query.put("thisLoginUserid", user.getId().toString());
+        query.put("searchtenantid", tenantId);
+        //我的待办数据
+        query.put("searchassignee", user.getLoginname());
+        query.putAll(searchQuery);
+
+        Long count = ocrTaskchildPictureService.listmytaskCount(query);
+
+        query.put("page", paramterPage);
+        List<OcrTaskchildPictureAppro> list = ocrTaskchildPictureService.listmytask(query);
+        return list;
+    }
+
+
     /**
      * 查询我发起的流程实例
      *
@@ -1413,6 +1638,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
         return list;
     }
+
     /**
      * 抄送给我的
      *
@@ -1462,7 +1688,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 }
 
 
-                
                 //查询历史
                 List<HistoricTaskInstanceDto> historicTaskInstanceDtos = new ArrayList<>();
                 // 查询当前任务的流转信息
@@ -1509,6 +1734,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         flowableccIPage.setRecords(list);
         return flowableccIPage;
     }
+
     public void cancelTask(String taskId, String reason) {
         // 获取当前任务
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -1593,4 +1819,266 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         return ResultVoUtil.success(flowableccMybatisDao.repetitionTask());
     }
 
+    @Override
+    public Page<OcrTaskchildPicture> repetitionTaskList(Integer pageNo, Integer pageSize) {
+        Page<OcrTaskchildPicture> page = new Page<>(pageNo, pageSize);
+        Page<OcrTaskchildPicture> result = flowableccMybatisDao.repetitionTaskList(page);
+        return result;
+    }
+
+    /**
+     * 格式化筛选关系
+     *
+     * @param queryWrapper
+     * @param usersearchchild
+     * @return
+     */
+    private QueryWrapper<OcrTaskchildPicture> formattingSearchChild(QueryWrapper<OcrTaskchildPicture> queryWrapper, OcrUsersearchchild usersearchchild) {
+        switch (usersearchchild.getSearchRelationType()) {
+            case "where":
+                this.formattingSearchType(queryWrapper, usersearchchild);
+                break;
+            case "and":
+                queryWrapper.and(wrapper -> this.formattingSearchType(wrapper, usersearchchild));
+                break;
+            case "or":
+                queryWrapper.or(wrapper -> this.formattingSearchType(wrapper, usersearchchild));
+                break;
+            default:
+                return queryWrapper;
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * 格式化查询类型
+     *
+     * @param queryWrapper
+     * @param usersearchchild
+     * @return
+     */
+    private QueryWrapper<OcrTaskchildPicture> formattingSearchType(QueryWrapper<OcrTaskchildPicture> queryWrapper, OcrUsersearchchild usersearchchild) {
+        //查询类型 相等true 不相等fase
+        boolean queryType = "eq".equals(usersearchchild.getSearchtype());
+
+        //1.获取检查数据，确定数据类型
+        String valueType = SearchParaFormatting.clickSearchValue(usersearchchild.getSearchvalue());
+        List<String> arrayData = null; //集合型数据
+        List<Integer> sectionInts = null; //纯数字区间型数据
+        String[] sections = null;    //字符串区间型数据
+        DateTime beginTime = null; //日期时间区间型数据
+        DateTime endTime = null;  //日期时间区间型数据
+
+        //2.根据数据类型，解构数据
+        switch (valueType) {
+            case "array":
+                //处理多文件
+                String[] datas = usersearchchild.getSearchvalue().split(",");
+                arrayData = Arrays.asList(datas);
+                break;
+            case "section":
+                //格式化数据,仅在做区间的时候去除空格，其他地方不进行空格去除.
+                sections = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
+                //校验是否纯数字,纯数字的话，要转成int,否则比对时会有问题
+                sectionInts = new ArrayList<>();
+                for (String data : sections) {
+                    if (data.matches("\\d+")) {
+                        sectionInts.add(Integer.parseInt(data));
+                    }
+                }
+                break;
+            case "time":
+                //格式化时间数据
+                String[] times = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
+                beginTime = DateUtil.parse(times[0], "yyyy/MM/dd");
+                endTime = DateUtil.parse(times[1], "yyyy/MM/dd");
+                break;
+            default:
+        }
+
+        //3.根据查询类型 组装查询条件 相等
+        switch (valueType) {
+            case "array":
+                //集合数据
+                //相等
+                if (queryType) {
+                    queryWrapper.in(usersearchchild.getSearchfield(), arrayData);
+                    break;
+                }
+                //不相等
+                queryWrapper.notIn(usersearchchild.getSearchfield(), arrayData);
+                break;
+
+            case "section":
+                //数字区间查询
+                if (sectionInts != null && sectionInts.size() == 2) {
+                    if (queryType) {
+                        //相等
+                        queryWrapper.between(usersearchchild.getSearchfield(), sectionInts.get(0), sectionInts.get(1));
+                        break;
+                    }
+                    //不相等
+                    queryWrapper.notBetween(usersearchchild.getSearchfield(), sectionInts.get(0), sectionInts.get(1));
+                    break;
+                }
+
+                //字符串区间查询
+                if (queryType) {
+                    //相等
+                    queryWrapper.between(usersearchchild.getSearchfield(), sections[0], sections[1]);
+                    break;
+                }
+                //不相等
+                queryWrapper.notBetween(usersearchchild.getSearchfield(), sections[0], sections[1]);
+                break;
+
+            case "time":
+                //时间区间数据
+                //相等
+                if (queryType) {
+                    queryWrapper.between(usersearchchild.getSearchfield(), beginTime.getTime(), endTime.getTime());
+                    break;
+                }
+                //不相等
+                queryWrapper.notBetween(usersearchchild.getSearchfield(), beginTime.getTime(), endTime.getTime());
+                break;
+
+            default:
+                if (queryType) {
+                    queryWrapper.eq(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
+                    break;
+                }
+                queryWrapper.ne(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
+        }
+        return queryWrapper;
+    }
+
+//    private SearchQuery formattingSearchChild1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) {
+//        switch (usersearchchild.getSearchRelationType()) {
+//            case "where":
+//                // 添加 "where" 查询条件
+//                this.formattingSearchType1(searchQuery, usersearchchild);
+//                break;
+//            case "and":
+//                // 添加 "and" 查询条件
+//                searchQuery.addRulesOp(usersearchchild.getSearchfield(),"and");
+//                SearchQuery andQuery = this.formattingSearchType1(searchQuery, usersearchchild);
+//                searchQuery.setSearchQuery(andQuery);
+//                break;
+//            case "or":
+//                // 添加 "or" 查询条件
+//                searchQuery.addRulesOp(usersearchchild.getSearchfield(),"or");
+//                SearchQuery orQuery = this.formattingSearchType1(searchQuery, usersearchchild);
+//                searchQuery.setSearchQuery(orQuery);
+//                break;
+//            default:
+//                break;
+//        }
+//        return searchQuery;
+//    }
+//
+//    private SearchQuery formattingSearchType1(SearchQuery searchQuery, OcrUsersearchchild usersearchchild) {
+//        //查询类型 相等true 不相等fase
+//        boolean queryType = "eq".equals(usersearchchild.getSearchtype());
+//
+//        // 1.获取检查数据，确定数据类型
+//        String valueType = SearchParaFormatting.clickSearchValue(usersearchchild.getSearchvalue());
+//        List<String> arrayData = null; //集合型数据
+//        List<Integer> sectionInts = null; //纯数字区间型数据
+//        String[] sections = null;    //字符串区间型数据
+//        DateTime beginTime = null; //日期时间区间型数据
+//        DateTime endTime = null;  //日期时间区间型数据
+//
+//        // 2.根据数据类型，解构数据
+//        switch (valueType) {
+//            case "array":
+//                //处理多文件
+//                String[] datas = usersearchchild.getSearchvalue().split(",");
+//                arrayData = Arrays.asList(datas);
+//                break;
+//            case "section":
+//                //格式化数据,仅在做区间的时候去除空格，其他地方不进行空格去除.
+//                sections = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
+//                //校验是否纯数字,纯数字的话，要转成int,否则比对时会有问题
+//                sectionInts = new ArrayList<>();
+//                for (String data : sections) {
+//                    if (data.matches("\\d+")) {
+//                        sectionInts.add(Integer.parseInt(data));
+//                    }
+//                }
+//                break;
+//            case "time":
+//                //格式化时间数据
+//                String[] times = usersearchchild.getSearchvalue().trim().replaceAll("\\s+", "").split("-");
+//                beginTime = DateUtil.parse(times[0], "yyyy/MM/dd");
+//                endTime = DateUtil.parse(times[1], "yyyy/MM/dd");
+//                break;
+//            default:
+//        }
+//
+//        // 3.根据查询类型 组装查询条件 相等
+//        switch (valueType) {
+//            case "array":
+//                //集合数据
+//                //相等
+//                if (queryType) {
+//                    searchQuery.addIn(usersearchchild.getSearchfield(), arrayData);
+//                    break;
+//                }
+//                //不相等
+//                searchQuery.addNotIn(usersearchchild.getSearchfield(), arrayData);
+//                break;
+//
+//            case "section":
+//                //数字区间查询
+//                if (sectionInts != null && sectionInts.size() == 2) {
+//                    if (queryType) {
+//                        //相等
+//                        searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sectionInts.get(0));
+//                        searchQuery.addLessEqual(usersearchchild.getSearchfield(), sectionInts.get(1));
+//                        break;
+//                    }
+//                    //不相等
+//                    searchQuery.addLess(usersearchchild.getSearchfield(), sectionInts.get(0));
+//                    searchQuery.addGreater(usersearchchild.getSearchfield(), sectionInts.get(1));
+//                    break;
+//                }
+//
+//                //字符串区间查询
+//                if (queryType) {
+//                    //相等
+//                    searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), sections[0]);
+//                    searchQuery.addLessEqual(usersearchchild.getSearchfield(), sections[1]);
+//                    break;
+//                }
+//                //不相等
+//                searchQuery.addLess(usersearchchild.getSearchfield(), sections[0]);
+//                searchQuery.addGreater(usersearchchild.getSearchfield(), sections[1]);
+//                break;
+//
+//
+//            case "time":
+//                //时间区间数据
+//                //相等
+//                if (queryType) {
+//                    searchQuery.addGreaterEqual(usersearchchild.getSearchfield(), beginTime);
+//                    searchQuery.addLessEqual(usersearchchild.getSearchfield(), endTime);
+//                    break;
+//                }
+//                //不相等
+//                searchQuery.addLess(usersearchchild.getSearchfield(), beginTime);
+//                searchQuery.addGreater(usersearchchild.getSearchfield(), endTime);
+//                break;
+//
+//            default:
+//                if (queryType) {
+//                    searchQuery.addEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
+//                    break;
+//                }
+//                searchQuery.addNotEqual(usersearchchild.getSearchfield(), usersearchchild.getSearchvalue());
+//        }
+//        return searchQuery;
+//    }
+
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/controller/CategoryController.java

@@ -62,7 +62,7 @@ public class CategoryController extends BaseController{
 		QueryWrapper<Category> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,category);
 		IPage<Category> page = this.categoryService.selectSearchListPage(paramterPage,queryWrapper);
 		for(Category category1:page.getRecords()){
-			category1.setTenant(tenantService.selectDtoById(category1.getTenantid()));
+			category1.setTenant(tenantService.selectDtoById(Long.parseLong(category1.getTenantid())));
 		}
 		return ResultVoUtil.success(page);
 	}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataDao/FlowableccMybatisDao.java

@@ -2,8 +2,11 @@ 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 cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -36,5 +39,7 @@ public interface FlowableccMybatisDao extends BaseMapper<Flowablecc> {
      */
     List<UserDistionaryVo> selectUserByFromid(String fromid);
 
-    List<Map<String,Object>> repetitionTask();
+    List<RepeatedContentVo> repetitionTask();
+
+    Page<OcrTaskchildPicture> repetitionTaskList(Page<OcrTaskchildPicture> page);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Category.java

@@ -100,7 +100,7 @@ public class Category implements BaseDto,java.io.Serializable {
 
 	@Schema(description = "租户主键")
 	@TableField(value="TENANTID")
-	private Long tenantid;
+	private String tenantid;
 
 	//租户对象
 	@TableField(exist = false)

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/dataobject/Userapprove.java

@@ -66,6 +66,21 @@ public class Userapprove implements BaseDto,java.io.Serializable {
 	@Schema(description = "节点编号")
 	@TableField(value="TASKNO")
 	private String taskno;
+	@Schema(description = "用户名称")
+	@TableField(value="USERNAME")
+	private String username;
+	@Schema(description = "创建时间")
+	@TableField(value="CREATEDATE")
+	private Long createdate;
+	@Schema(description = "审批意见")
+	@TableField(value="TASKCOMMENT")
+	private String taskcomment;
+	@Schema(description = "审批不通过原因")
+	@TableField(value="REASON")
+	private String reason;
+	@Schema(description = "审批不通过处理方式")
+	@TableField(value="PROCESSMETHOD")
+	private String processMethod;
 
 	//保存当前登录用户的数据权限范围的搜索条件
 	@TableField(exist = false)

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserapproveService.java

@@ -1,6 +1,8 @@
 package cn.jyjz.xiaoyao.oa.from.service;
 
 import cn.jyjz.flowable.domain.vo.FlowTaskVO;
+import cn.jyjz.flowable.entity.FlowApprove;
+import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
 import org.flowable.task.api.Task;
@@ -12,11 +14,11 @@ public interface UserapproveService extends BaseService<Userapprove>  {
     
     /**
      * 保存审批人员于业务表单的关联
-     * @param userid 当前审批用户的主键
+     * @param approve 当前审批用户的主键
-     * @param formid 业务表单主键
+     * @param formId 业务表单主键
      * @return 成功返回true，否则返回false
      */
-    public boolean save(String userid, FlowTaskVO taskVO, Task task );
+    public boolean save(UserToken userToken, FlowApprove approve, Task task,String formId);
     
     /**
      * 删除审批人员于业务表单的关联

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserapproveServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.jyjz.xiaoyao.oa.from.service.impl;
 
 import cn.jyjz.flowable.domain.vo.FlowTaskVO;
+import cn.jyjz.flowable.entity.FlowApprove;
+import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
 import cn.jyjz.xiaoyao.oa.from.dataDao.UserapproveMybatisDao;
 import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove;
@@ -21,19 +23,21 @@ public class UserapproveServiceImpl extends BaseServiceImpl<UserapproveMybatisDa
     private UserapproveMybatisDao userapprovemybatisdao;
 
     @Override
-	public boolean save(String userid,  FlowTaskVO taskVO, Task taskd) {
+    public boolean save(UserToken userToken, FlowApprove approve, Task taskd,String formId) {
-		
         Userapprove userapprove = new Userapprove();
-		userapprove.setUserid(Long.parseLong(userid));
+        userapprove.setUserid(Long.parseLong(userToken.getUserid()));
-		userapprove.setFormid(Long.parseLong(taskVO.getFormid()));
+        userapprove.setFormid(Long.parseLong(formId));
         userapprove.setTaskname(taskd.getName());
-		if(taskVO.getApprovd()){
+        userapprove.setTaskcomment(approve.getComment());
+        userapprove.setCreatedate(System.currentTimeMillis());
+        userapprove.setUsername(userToken.getUsername());
+        userapprove.setReason(approve.getFailCauseName());
+        userapprove.setReason(approve.getDisposeType());
+        if (approve.getResult()) {
             userapprove.setStatshis(2);
         } else {
             userapprove.setStatshis(3);
         }
-		
-
         return this.save(userapprove);
     }
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/FlowUnionVo.java

@@ -45,6 +45,9 @@ public class FlowUnionVo {
     @ApiModelProperty(value ="状态，审批状态 1:撤销 2:审批中 3:审批通过 5：审批未通过 ")
     private Integer states;
 
+    @ApiModelProperty(value ="状态，审批状态 1:撤销 2:审批中 3:审批通过 5：审批未通过 ")
+    private String statesText;
+
     @ApiModelProperty(value ="流程定义id")
     private String processdefinitionid;
     

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedContentVo.java

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

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/vo/RepeatedTaskVo.java

@@ -0,0 +1,31 @@
+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 formId;
+
+    private String fromTaskId;
+
+    private String taskName;
+
+    private String nodeName;
+
+    private Integer states;
+
+    private String similarityScore;
+
+    private String fromTime;
+
+    private String updateTime;
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/entity/PictureSourceResult.java

@@ -155,9 +155,13 @@ public class PictureSourceResult {
     Map<String,Object>  productName;
 
     /**
-     * 生产基地
+     * 拜访部门
      */
-    String  manufacturer;
+    String  companyDepartment;
+    /**
+     * 厂商
+     */
+    Map<String,Object>  manufacturer;
 
     /**
      * 拜访小节
@@ -195,5 +199,9 @@ public class PictureSourceResult {
      */
     Map<String,Object> extendedField;
 
+    /**
+     * 任务提交时间（提报日期时间戳）
+     */
+    Long submitTime;
 
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -80,11 +80,15 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         //加密请求参数
         String tenantNo = pictureSourceParameter.getTenantNo().toString();
         String json = JSONObject.toJSONString(queryParam);
+        System.out.println(json);
         RequestData requestData = ApiHelper.buildRequest(tenantNo, apiConfig.getAccessKey(), apiConfig.getAccessCode(),json);
 
         //组装请求参数
         String url = apiConfig.getInterfaceDomain()+pictureSourceUrl;
         String requestBodyJson = JSONObject.toJSONString(requestData);
+//        String requestBodyJson = "{\"accessKey\":\"7390F0221A1A73D8E13F8C8BB96F33B0\",\"data\":\"gzUtN5Mt24_fbDDMK3wLop8Tgu68xLCVy3Wzp9BcXnkxnCiPg_D2TNEXnQ68-Y-GhGYYcD7Iwg8juZTx1m5v4NkDvKvEwdvjQvZnMDTRYbqtHrwgVLAvUGotIMTckDY67yo2Ku52vWedjYpzzDseHwiIGVcIl-u1CljEbyjLzJzIf6oXfD7qKjOYnxKjfjp11k0IlvsPdS-mgNXTHcBei5jOFrYmZrE2y4v9bI5n1QE\",\"signature\":\"0bmIbhhybDcGeyX4ao5gSPZQeaY8G2JRh3nRt7NC7qw\",\"tenantCode\":\"1673196576094806016\",\"timestamp\":1711971774448}";
+        //入参
+        System.out.println("入参数据:"+requestBodyJson);
         HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);
         httpParamers.setJsonParamer(requestBodyJson);
         //发起请求

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java

@@ -37,18 +37,18 @@ public class ApiTestController {
         String pageNo = request.getParameter("pageNo");
 
         PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
-//        DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
+        DateTime dateTime = DateUtil.parse(beginStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
-        DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss");
+//        DateTime dateTime = DateUtil.parse("2024-03-31 07:00:000","yyyy-MM-dd HH:mm:ss");
         Instant binstant = dateTime.toInstant();
-//        DateTime dateTime1 = DateUtil.parse(" 00:00:00","yyyy-MM-dd HH:mm:ss");
+        DateTime dateTime1 = DateUtil.parse(endStr+" 00:00:00","yyyy-MM-dd HH:mm:ss");
-        DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss");
+//        DateTime dateTime1 = DateUtil.parse("2024-03-31 09:00:00","yyyy-MM-dd HH:mm:ss");
         Instant einstant = dateTime1.toInstant();
         pictureSourceParameter.setStartTime(Date.from(binstant));
         pictureSourceParameter.setEndTime(Date.from(einstant));
         pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
         pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
         pictureSourceParameter.setTenantNo(1714548920583360512L);
-        pictureSourceParameter.setAccountNo(1714559587755397120L);
+        pictureSourceParameter.setAccountNo(1714887674875514880L);
         try {
             ApiPage<PictureSourceResult> apiPage  =  prevailCloudApi.pullPictureSource(pictureSourceParameter);
             List<PictureSourceResult> listResult= apiPage.getRecords();

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java

@@ -0,0 +1,87 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+import cn.jyjz.flowable.service.IFlowTaskService;
+import cn.jyjz.flowable.utils.PageUtils;
+import cn.jyjz.xiaoyao.admin.dataobject.User;
+import cn.jyjz.xiaoyao.admin.service.UserService;
+import cn.jyjz.xiaoyao.common.base.controller.BaseController;
+import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
+import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
+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 cn.jyjz.xiaoyao.common.base.vo.UserToken;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
+import cn.jyjz.xiaoyao.framework.security.sms.MsmService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ocr控制器
+ *
+ * @author 你的肉
+ * AI审批工单
+ * @Date 2024-03-17 19:53:30
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/ocr/aitools")
+public class OcrAiApprovalTools {
+
+
+    @Autowired
+    private UserTokenService userTokenService;
+
+    @Autowired
+    IOcrSearchHistoryService iocrsearchhistoryservice;
+
+
+    /**
+     * 统计
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/toolsCount", method = RequestMethod.GET)
+    public ResultVo toolsCount(HttpServletRequest request) {
+
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+
+        ResultVo toolscount = iocrsearchhistoryservice.toolscount(tenantId,userToken.getUserid(),request);
+
+        return toolscount;
+    }
+
+    /*
+    ai审批工单
+     */
+    @RequestMapping(value = "/aiApprovaltools", method = RequestMethod.GET)
+    public ResultVo aiApprovaltools(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+
+        Map<Object, Object> selectaisp = iocrsearchhistoryservice.selectaisp(userToken.getUserid(), taskid,userToken.getNodeType());
+        return ResultVoUtil.success(selectaisp);
+    }
+
+    @RequestMapping(value = "/aiApprovaltoolsClearmark", method = RequestMethod.GET)
+    public ResultVo aiApprovaltoolsClearmark(HttpServletRequest request,@RequestParam(value = "taskid", required = true) String taskid) {
+
+        ResultVo clearmark = iocrsearchhistoryservice.clearmark(taskid);
+        return clearmark;
+    }
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaController.java

@@ -1,156 +0,0 @@
-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.oa.from.dataobject.Category;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
-import cn.jyjz.xiaoyao.ocr.service.OcrAreaService;
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import liquibase.pro.packaged.S;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-@RestController
-@RequestMapping("/ocr/ocrarea")
-public class OcrAreaController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Resource
-	private OcrAreaService ocrAreaService;
-
-	@Resource
-	private TenantService tenantService;
-	@Resource
-	private UserTokenService userTokenService;
-	@Resource
-	private UserService userService;
-	
-	/**
-	 *方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	 *创建人：mail.zhangyong@gmail.com
-	 *创建时间：2024-01-14 10:27:02
-	 **/
-	@ApiOperation(value="ocr_任务计划列表查询", notes="ocr_任务计划列表查询，无分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
-	})
-	@GetMapping("/listall")
-	public ResultVo<List<OcrArea>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		
-		//租户主键，由前端页面传送
-		String tenantId = request.getHeader("X-Tenant-Id");
-		if(StringUtils.isBlank(tenantId)){
-			return ResultVoUtil.error("租户主键不能为空");
-		}
-		
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-		OcrArea ocrArea = new OcrArea();
-		QueryWrapper<OcrArea> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrArea);
-		queryWrapper.eq("TENANTID",tenantId);
-		queryWrapper.orderByDesc("REORDER");
-		List<OcrArea> page = this.ocrAreaService.queryListNoPage(queryWrapper);;
-		return ResultVoUtil.success(page);
-	}
-	
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/list")
-	public ResultVo<IPage<OcrArea>> listOcrArea(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-		OcrArea ocrarea = new OcrArea();
-		QueryWrapper<OcrArea> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrarea);
-		IPage<OcrArea> page = this.ocrAreaService.selectSearchListPage(paramterPage,queryWrapper);
-		for(OcrArea ocrArea:page.getRecords()){
-			ocrArea.setTenant(tenantService.selectDtoById(ocrArea.getTenantid()));
-		}
-		return ResultVoUtil.success(page);
-	}
-
-	/**
-	*方法描述：保存添加数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/save")
-	public ResultVo saveOcrArea(HttpServletResponse response,HttpServletRequest request,OcrArea tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setCreateby(userToken.getLoginname());
-		tab.setCreatetime(System.currentTimeMillis());
-		this.ocrAreaService.save(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：根据页面form传来的对象修改数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/edit")
-	public ResultVo editOcrArea(HttpServletResponse response,HttpServletRequest request,OcrArea tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setUpdateby(userToken.getLoginname());
-		tab.setUpdatetime(System.currentTimeMillis());
-		this.ocrAreaService.updateById(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：通过主键获得对象信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/getdata/{id}")
-	@ResponseBody
-	public ResultVo getdateOcrArea(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
-		OcrArea dto = this.ocrAreaService.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:02
-	**/
-	@GetMapping("/delmore")
-	@ResponseBody
-	public ResultVo delMoreOcrArea(HttpServletResponse response,HttpServletRequest request) throws IOException{
-		String ids = request.getParameter("id");
-		this.ocrAreaService.deleteByIdMore(ids);
-		return ResultVoUtil.success();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAreaHtmlController.java

@@ -1,75 +0,0 @@
-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.OcrAreaService;
-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/ocrareaHtml")
-public class OcrAreaHtmlController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrAreaService ocrAreaService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	/**
-	*方法描述：跳转到列表页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toList")
-	public String toListOcrArea(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrarea/list";
-	}
-
-	/**
-	*方法描述：跳转到保存页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toSave")
-	public String toSaveOcrArea(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrarea/add";
-	}
-
-	/**
-	*方法描述：根据ID跳转到修改页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toEdit/{id}")
-	public String toEditOcrArea(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/ocrarea/edit";
-	}
-
-}

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<OcrBooknote> list = ocrBooknoteService.list(queryWrapper);
 		if(null == list || list.isEmpty()){

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java

@@ -0,0 +1,188 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+import cn.hutool.core.collection.CollUtil;
+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.OcrCheckDuplicate;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
+import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
+import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateService;
+import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
+import cn.jyjz.xiaoyao.ocr.util.DataUtil;
+import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
+import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 一键查重 功能
+ *
+ * @author hugh(shuli.yao) 1397940314@qq.com
+ * @version 1.0
+ * @date 2024/3/25 1:31
+ */
+@RestController
+@RequestMapping("/ocr/checkDuplicate")
+public class OcrCheckDuplicateController {
+
+    @Resource
+    private UserTokenService userTokenService;
+    @Resource
+    private IOcrCheckDuplicateService ocrCheckDuplicateService;
+    @Resource
+    private OcrPictureService ocrPictureService;
+
+    @ApiOperation(value = "一键查重", notes = "一键查重")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
+    })
+    @GetMapping(value = "/openCheckDuplicate")
+    public ResultVo checkDuplicate(OcrPicture ocrPicture, HttpServletRequest req) {
+
+        //获取当前登录人
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+
+        //租户主键，由前端页面传送
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper<>();
+
+        //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map
+        Map<String, Object> paraMap = new HashMap<>();
+        for (SearchConfigEnum config : SearchConfigEnum.values()) {
+            String searchvalue = req.getParameter(config.getId());
+            if (StringUtils.isNotBlank(searchvalue)) {
+                paraMap.put(config.getMeaning(), searchvalue);
+            }
+        }
+        //调用查询参数解析方法，解析为queryWrapper
+        queryWrapper = SearchParaFormatting.searchParaParse(queryWrapper, paraMap);
+
+        queryWrapper.eq("tenant_id", tenantId);
+        queryWrapper.eq("suspiciousfile", "0");
+        queryWrapper.orderBy(true,true,"submit_date_timestamp");
+        List<OcrPicture> pageList = ocrPictureService.listPage(queryWrapper);
+        if (null != pageList && !pageList.isEmpty()) {
+            if (pageList.size() == 1) {
+                return ResultVoUtil.error("查重数据至少要有两条。");
+            } else {
+                return ocrCheckDuplicateService.duplicateCheck(pageList, tenantId, userToken, req, paraMap);
+            }
+        } else {
+            return ResultVoUtil.error("没有查重数据。");
+        }
+    }
+
+    @ApiOperation(value = "获取查重任务接口异步状态", notes = "获取查重任务接口异步状态")
+    @GetMapping("/getCheckDuplicateStatus")
+    @ResponseBody
+    public ResultVo getCheckDuplicateStatus(HttpServletResponse response, HttpServletRequest request,
+                                            @RequestParam(name = "checkDuplicateNo", required = true) String checkDuplicateNo) throws IOException {
+
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        if (StringUtils.isBlank(checkDuplicateNo)) {
+            return ResultVoUtil.error("查重编号不能为空");
+        }
+
+        OcrCheckDuplicate dto = this.ocrCheckDuplicateService.getCheckDuplicateStatus(checkDuplicateNo);
+        if (null != dto) {
+            return ResultVoUtil.success(dto);
+        } else {
+            return ResultVoUtil.error();
+        }
+    }
+
+    /**
+     * 获取查重复任务编号（获取当前用户最后一次执行中的查重任务的编号）
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/getLastCheckNo")
+    public ResultVo getLastCheckNo(HttpServletRequest request) {
+
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        String lastCheckNo = this.ocrCheckDuplicateService.getLastCheckNo(tenantId);
+
+        if (!StringUtils.isBlank(lastCheckNo)) {
+            return ResultVoUtil.success(lastCheckNo);
+        } else {
+            return ResultVoUtil.success();
+        }
+    }
+
+    /**
+     * 删除查重任务
+     *
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/removeCheckDuplicate")
+    public ResultVo removeCheckDuplicate(HttpServletRequest request, @RequestParam(name = "checkDuplicateNo", required = true) String checkDuplicateNo) {
+
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        Boolean result = this.ocrCheckDuplicateService.removeCheckDuplicate(checkDuplicateNo, tenantId);
+
+        if (result) {
+            return ResultVoUtil.success("取消查重任务成功!");
+        }
+        return ResultVoUtil.error("取消任务失败!");
+    }
+
+    @ApiOperation(value = "查重图片分页列表查询", notes = "根据查重任务编号，返回查重任务图片结果")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
+            @ApiImplicitParam(paramType = "path", name = "checkDuplicateNo", value = "查重任务编号",  dataType = "String", required = true)
+    })
+    @GetMapping(value = "/queryPageListByCheckNo")
+    public ResultVo<IPage<OcrPicture>> queryPageListByCheckNo(@RequestParam(name = "checkDuplicateNo") String checkDuplicateNo,
+                                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     HttpServletRequest req) {
+        //租户主键，由前端页面传送
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        IPage<OcrPicture> pageList = ocrCheckDuplicateService.queryPageListByCheckNo(checkDuplicateNo,tenantId,pageNo,pageSize);
+
+        return ResultVoUtil.success(pageList);
+    }
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrDictionaryController.java

@@ -4,8 +4,6 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionary;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrDictionaryGroup;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
 import cn.jyjz.xiaoyao.ocr.service.OcrDictionaryService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -61,4 +59,26 @@ public class OcrDictionaryController {
         }
         return new ResultVo<>(ResultVo.ERROR,"根据field查询不到字典组!");
     }
+
+
+    /**
+     *根据字典value获取对应lable值
+     *
+     *创建人：mail.zhangyong@gmail.com
+     *创建时间：2024-01-14 10:27:02
+     **/
+    @GetMapping("/getLabelByValue")
+    @ResponseBody
+    public ResultVo<IPage<OcrDictionary>> getLabelByValue(HttpServletResponse response,
+                                                               HttpServletRequest request,
+                                                               @RequestParam(name="field", defaultValue="upName",required = true) String field,
+                                                               @RequestParam(name="value", defaultValue="",required = true) String value) {
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        String result= ocrDictionaryService.queryLabelByValue(field,value,tenantId);
+        return new ResultVo<>(ResultVo.ERROR,result);
+    }
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java

@@ -74,7 +74,7 @@ public class OcrFieldController extends BaseController {
 	 */
 	@ApiOperation(value="字段新增和修改", notes="字段新增和修改")
 	@PostMapping(value = "/saveOrUpdate")
-	public ResultVo saveOrUpdate(@ApiParam(value = "字段信息", required = true) OcrFieldVo ocrFieldVo) {
+	public ResultVo saveOrUpdate(@ApiParam(value = "字段信息", required = true)  @RequestBody OcrFieldVo ocrFieldVo) {
 		try {
 			OcrField ocrField = new OcrField();
 			ocrField.setName(ocrFieldVo.getName());

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java

@@ -1,5 +1,6 @@
 package cn.jyjz.xiaoyao.ocr.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
@@ -9,6 +10,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsg;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrMsgRead;
 import cn.jyjz.xiaoyao.ocr.service.IOcrMsgService;
 import cn.jyjz.xiaoyao.ocr.util.PageRequest;
+import cn.jyjz.xiaoyao.ocr.vo.OcrMsgVO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiOperation;
@@ -19,9 +21,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 import cn.jyjz.xiaoyao.ocr.service.IOcrMsgReadService;
 
+import java.sql.Array;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * ocr控制器
@@ -67,7 +71,8 @@ public class OcrMsgReadController  {
         pageQuery.setPageSize(pageSize);
 
 
-        PageInfo<List<Map<Object, String>>> findPage = iocrmsgservice.selectPage(pageQuery,userToken.getUserid(),msgCategory);
+        PageInfo<OcrMsgVO> findPage = iocrmsgservice.selectPage(pageQuery,userToken.getUserid(),msgCategory);
+
 
         //执行查询方法
 //        return new ResponseEntity<Object>(findPage, HttpStatus.OK);
@@ -97,6 +102,15 @@ public class OcrMsgReadController  {
         return ResultVoUtil.success(selectone);
     }
 
+    @ApiOperation(value = "消息轮询", notes = "消息轮询")
+    @RequestMapping(value = "/msgPolling", method = RequestMethod.GET)
+    public ResultVo msgPolling(HttpServletRequest request) {
+
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        //获取当前用户所有未读消息
+        int count =  iocrmsgservice.queryUnreadMsgCount(userToken.getUserid());
+        return ResultVoUtil.success(count);
+    }
 
     /**
      * 添加
@@ -104,20 +118,21 @@ public class OcrMsgReadController  {
      * @return
      */
     @ApiOperation(value = "消除未读所有", notes = "消除未读所有")
-    @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.POST)
+    @RequestMapping(value = "eliminateUnreadfull", method = RequestMethod.GET)
-    public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = false)String msgCategory) {
+    public ResultVo eliminateUnreadfull(HttpServletRequest request, @RequestParam(value = "msgCategory", required = true)String msgCategory) {
 
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
         QueryWrapper<OcrMsg> wrapperlist = new QueryWrapper<>();
-        wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply(" FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)");
+        wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").and(wrapper->{
-
+            wrapper.eq("receive_user_type",2).or().apply(" FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)");
-        QueryWrapper<OcrMsgRead> wrapperone = new QueryWrapper<>();
+        });
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
 
         List<OcrMsg> list = iocrmsgservice.list(wrapperlist);
         for (OcrMsg msg:list){
+            QueryWrapper<OcrMsgRead> wrapperone = new QueryWrapper<>();
             wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUserid());
             OcrMsgRead one = ocrMsgReadService.getOne(wrapperone);
             if(null==one) {
@@ -136,15 +151,18 @@ public class OcrMsgReadController  {
     }
 
     @ApiOperation(value = "消除未读单个", notes = "消除未读单个")
-    @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.POST)
+    @RequestMapping(value = "eliminateUnreadone", method = RequestMethod.GET)
-    public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = false)String msgid) {
+    public ResultVo eliminateUnreadone(HttpServletRequest request, @RequestParam(value = "msgid", required = true)String msgid) {
 
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS");
 
-
+        QueryWrapper<OcrMsgRead> wrapperone = new QueryWrapper<>();
+        wrapperone.eq("msg_id", msgid).eq("user_id",userToken.getUserid());
+        OcrMsgRead one = ocrMsgReadService.getOne(wrapperone);
+        if(null==one) {
             OcrMsgRead ocrmsgread=new OcrMsgRead();
             ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis())));
             ocrmsgread.setMsgId(Long.valueOf(msgid));
@@ -152,10 +170,13 @@ public class OcrMsgReadController  {
             ocrmsgread.setReadFlag(1);
             ocrmsgread.setReadTime(System.currentTimeMillis());
 
-        boolean save = ocrMsgReadService.save(ocrmsgread);
+            ocrMsgReadService.save(ocrmsgread);
-        //此处需要手工处理 返回需要将修改后的数据返回
+            return ResultVoUtil.success(ResultVo.SUCCESS);
-//        return new ResponseEntity<Object>(save,HttpStatus.OK);
+        }
-        return ResultVoUtil.success(save);
+
+
+
+        return ResultVoUtil.success(ResultVo.SUCCESS);
     }
 
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java

@@ -1,8 +1,8 @@
 package cn.jyjz.xiaoyao.ocr.controller;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -24,9 +24,12 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPackagetaskService;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.vo.OcrPackagetaskVo;
 import cn.jyjz.xiaoyao.upload.upload.UploadSpringUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -37,7 +40,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
-
+import java.lang.reflect.Field;
 import cn.jyjz.xiaoyao.admin.service.UserService;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.common.base.controller.BaseController;
@@ -87,7 +90,7 @@ public class OcrPackagetaskController extends BaseController{
 			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
 	})
 	@GetMapping(value = "/list")
-	public ResultVo<IPage<OcrPackagetask>> queryPageList(OcrPackagetask ocrPackagetask,
+	public ResultVo<IPage<Map<String, Object>>> queryPageList(OcrPackagetask ocrPackagetask,
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													   HttpServletRequest request) {
@@ -109,7 +112,53 @@ public class OcrPackagetaskController extends BaseController{
 		}
 		Page<OcrPackagetask> page = new Page<OcrPackagetask>(pageNo, pageSize);
 		IPage<OcrPackagetask> pageList = ocrPackagetaskService.page(page, queryWrapper);
-		return ResultVoUtil.success(pageList);
+
+		List<Map<String, Object>> ocrPackagetaskVoList = new ArrayList<>();
+		for (OcrPackagetask one : pageList.getRecords()) {
+			Map<String, Object> resultMap = new HashMap<>();
+			OcrPackagetaskVo ocrPackagetaskVo = new OcrPackagetaskVo();
+			ocrPackagetaskVo.setId(one.getId().toString());
+			ocrPackagetaskVo.setCreateBy(one.getCreateBy());
+			ocrPackagetaskVo.setCreateTime(one.getCreateTime());
+			ocrPackagetaskVo.setUpdateBy(one.getUpdateBy());
+			ocrPackagetaskVo.setUpdateTime(one.getUpdateTime());
+			ocrPackagetaskVo.setTenantId(one.getTenantId());
+			ocrPackagetaskVo.setPackagename(one.getPackagename());
+			ocrPackagetaskVo.setPictureno(one.getPictureno());
+			ocrPackagetaskVo.setSimilaritys(one.getSimilaritys());
+			ocrPackagetaskVo.setSearchtimes(one.getSearchtimes());
+			ObjectMapper ocrMapper = new ObjectMapper();
+			resultMap = ocrMapper.convertValue(ocrPackagetaskVo, Map.class);
+			if(StringUtils.isNotBlank(one.getJson())){
+				ObjectMapper mapper = new ObjectMapper();
+				try {
+					Map<String, Object> jsonMap = mapper.readValue(one.getJson(), new TypeReference<Map<String, Object>>() {});
+					resultMap.putAll(jsonMap);
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			ocrPackagetaskVoList.add(resultMap);
+		}
+
+		IPage<Map<String, Object>> newPageList = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
+		newPageList.setRecords(ocrPackagetaskVoList);
+
+		return ResultVoUtil.success(newPageList);
+	}
+
+	public static Map<String, Object> convertObjectToMap(Object obj) {
+		Map<String, Object> result = new HashMap<>();
+		Field[] fields = obj.getClass().getDeclaredFields();
+		for (Field field : fields) {
+			field.setAccessible(true); // 允许访问私有字段
+			try {
+				result.put(field.getName(), field.get(obj));
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			}
+		}
+		return result;
 	}
 
 	/**

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java

@@ -13,9 +13,8 @@ import cn.jyjz.xiaoyao.admin.service.LogService;
 import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
-import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
 import cn.jyjz.xiaoyao.ocr.util.DataUtil;
 import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
@@ -49,8 +48,6 @@ public class OcrPictureController extends BaseController {
     @Resource
     private OcrPictureService ocrPictureService;
     @Resource
-    private OcrPictureclassService ocrPictureclassService;
-    @Resource
     private OcrTaskchildPictureService ocrTaskchildPictureService;
     @Resource
     private UserTokenService userTokenService;
@@ -121,12 +118,11 @@ public class OcrPictureController extends BaseController {
             @ApiImplicitParam(paramType = "path", name = "search_month", value = "搜索时间，21,一周内，22：两周内，1：进一个月，2:进两个月，3：近三个月、6：近六个月、9：近九个月、12：近12个月", required = true),
             @ApiImplicitParam(paramType = "path", name = "search_history", value = "是否查询历史记录，0：不查询，1：查询", required = true)
     })
-    @GetMapping(value = "/createorder")
+    @GetMapping(value = "/checkHeavy")
-    public ResultVo createorder(OcrPicture ocrPicture,
+    public ResultVo checkHeavy(OcrPicture ocrPicture, HttpServletRequest req) {
-                                HttpServletRequest req) {
 
         //获取当前登录人
-        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+        //UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
 
         //租户主键，由前端页面传送
         String tenantId = req.getHeader("X-Tenant-Id");
@@ -140,7 +136,7 @@ public class OcrPictureController extends BaseController {
         String search_history = req.getParameter("search_history");
 
         //任务包名称
-        String buessinessno = req.getParameter("buessinessno");
+        //String buessinessno = req.getParameter("buessinessno");
 
         //搜索时间段
 //		String search_month = req.getParameter("search_month");
@@ -176,14 +172,71 @@ public class OcrPictureController extends BaseController {
         if (null != pageList && !pageList.isEmpty()) {
             if (pageList.size() == 1) {
                 return ResultVoUtil.error("查重数据至少要有两条。");
-            } else {
-                return ocrPictureService.createPackageTask(pageList, tenantId, userToken, search_month, req, buessinessno);
             }
+        }
+        ocrPictureService.createTaskChild(pageList, pageList.get(0).getTenantId().toString(), req);
+
+        return ResultVoUtil.error("没有查重数据。");
+
+    }
+
+
+    /**
+     * 生成任务包
+     *
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "生成任务包", notes = "生成任务包")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
+            @ApiImplicitParam(paramType = "path", name = "search_month", value = "搜索时间，21,一周内，22：两周内，1：进一个月，2:进两个月，3：近三个月、6：近六个月、9：近九个月、12：近12个月", required = true)
+    })
+    @GetMapping(value = "/createorder")
+    public ResultVo createorder(OcrPicture ocrPicture, HttpServletRequest req) {
+
+        //获取当前登录人
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+
+        //租户主键，由前端页面传送
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper<>();
+
+
+        //任务包名称
+        String buessinessno = req.getParameter("buessinessno");
+
+
+        String search_month = req.getParameter("search_month");
+        if (StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0) {
+            queryWrapper.le("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
+        }
+
+        //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map
+        Map<String, Object> paraMap = new HashMap<>();
+        for (SearchConfigEnum config : SearchConfigEnum.values()) {
+            String searchvalue = req.getParameter(config.getId());
+            if (StringUtils.isNotBlank(searchvalue)) {
+                paraMap.put(config.getMeaning(), searchvalue);
+            }
+        }
+        //调用查询参数解析方法，解析为queryWrapper
+        queryWrapper = SearchParaFormatting.searchParaParse(queryWrapper, paraMap);
+
+        queryWrapper.eq("tenant_id", tenantId);
+        List<OcrPicture> pageList = ocrPictureService.listPage(queryWrapper);
+        if (null != pageList && !pageList.isEmpty()) {
+            return ocrPictureService.createTaskChild(pageList, tenantId, userToken, search_month, req, buessinessno);
         } else {
             return ResultVoUtil.error("没有查重数据。");
         }
     }
 
+
     /**
      * 分页列表查询
      *
@@ -211,18 +264,39 @@ public class OcrPictureController extends BaseController {
             return ResultVoUtil.error("租户主键不能为空");
         }
 
+
+
         QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper<>();
 
-        //是否查询历史记录
+        String search_month = req.getParameter("search_month");
-        String search_history = req.getParameter("search_history");
+        String ordertype = req.getParameter("ordertype");
-        //判断是否需要查询历史记录
+        queryWrapper.eq("suspiciousfile", "0");
-        if (search_history.equals("0")) {
+        if (StringUtils.isNotBlank(ordertype)) {
-            queryWrapper.eq("taskstatus", search_history);
+            if (ordertype.equals("asc")) {
+                queryWrapper.orderByAsc("similarity_score");
+            } else {
+                queryWrapper.orderByDesc("similarity_score");
+            }
+        }
+
+        //按时间排序
+        String orderByTime = req.getParameter("orderByTime");
+        if (StringUtils.isNotBlank(orderByTime)) {
+            if (orderByTime.equals("asc")) {
+                queryWrapper.orderByAsc("submit_date_timestamp");
+            } else {
+                queryWrapper.orderByDesc("submit_date_timestamp");
+            }
         }
 
-        String search_month = req.getParameter("search_month");
         if (StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0) {
-            queryWrapper.le("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
+            queryWrapper.ge("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
+        }
+
+        //提报人模糊搜索
+        String upUserName = req.getParameter("upUserName");
+        if(StringUtils.isNotBlank(upUserName)){
+            queryWrapper.like("upName",upUserName);
         }
 
         //根据参数枚举，获取检索参数，并映射为数据库的字段的key-v map
@@ -240,14 +314,6 @@ public class OcrPictureController extends BaseController {
         Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
         IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
 
-        for (OcrPicture ocrPicture1 : pageList.getRecords()) {
-            if (StringUtils.isNotBlank(ocrPicture1.getPictureclassid())) {
-                OcrPictureclass ocrPictureclass = this.ocrPictureclassService.getById(ocrPicture1.getPictureclassid());
-                ocrPicture1.setOcrPictureclass(ocrPictureclass);
-            }
-
-        }
-
         return ResultVoUtil.success(pageList);
     }
 
@@ -327,4 +393,29 @@ public class OcrPictureController extends BaseController {
         return ResultVoUtil.success();
     }
 
+    /**
+     * 获取任务包主图
+     *
+     * @return
+     */
+    @GetMapping(value = "/getPackagePicture")
+    public ResultVo getPackagePictureInfo(@RequestParam(name = "checkDuplicateId") String checkDuplicateId,
+                                          @RequestParam(name = "pictureId", required = false) String pictureId,
+                                          HttpServletRequest req) {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+        OcrPicture result = ocrPictureService.getPackagePictureInfo(checkDuplicateId, pictureId,userToken);
+        return ResultVoUtil.success(result);
+    }
+
+    /**
+     * 方法描述：根据id字符串组删除对象方法，例如1,2,3
+     * 创建人：mail.zhangyong@gmail.com
+     * 创建时间：2024-01-14 10:27:01
+     **/
+    @GetMapping("/getPictureDetail")
+    public ResultVo getPictureDetail(@RequestParam(value = "pictureId") String pictureId, HttpServletRequest request) throws IOException {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        return ResultVoUtil.success(ocrTaskchildPictureService.getPictureDetail(pictureId, userToken));
+    }
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassController.java

@@ -1,158 +0,0 @@
-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.OcrArea;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureclass;
-import cn.jyjz.xiaoyao.ocr.service.OcrPictureclassService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.beans.factory.annotation.Autowired;
-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<List<OcrPictureclass>> 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<OcrPictureclass> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass);
-		queryWrapper.eq("TENANTID",tenantId);
-		queryWrapper.orderByDesc("REORDER");
-		
-		List<OcrPictureclass> 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<IPage<OcrPictureclass>> listOcrPictureclass(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-		OcrPictureclass ocrpictureclass = new OcrPictureclass();
-		QueryWrapper<OcrPictureclass> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpictureclass);
-		IPage<OcrPictureclass> 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();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureclassHtmlController.java

@@ -1,75 +0,0 @@
-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";
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobController.java

@@ -1,113 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.controller;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.OcrPicturejob;
-import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService;
-import com.alibaba.fastjson.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-
-@RestController
-@RequestMapping("/backstage/jifen/ocrpicturejob")
-public class OcrPicturejobController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrPicturejobService ocrPicturejobService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/list")
-	public ResultVo<IPage<OcrPicturejob>> listOcrPicturejob(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-
-		OcrPicturejob ocrpicturejob = new OcrPicturejob();
-
-		QueryWrapper<OcrPicturejob> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturejob);
-		IPage<OcrPicturejob> page = this.ocrPicturejobService.selectSearchListPage(paramterPage,queryWrapper);;
-		return ResultVoUtil.success(page);
-	}
-
-	/**
-	*方法描述：保存添加数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@PostMapping("/save")
-	public ResultVo saveOcrPicturejob(HttpServletResponse response,HttpServletRequest request,OcrPicturejob tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		
-		this.ocrPicturejobService.save(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：根据页面form传来的对象修改数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@PostMapping("/edit")
-	public ResultVo editOcrPicturejob(HttpServletResponse response,HttpServletRequest request,OcrPicturejob tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		this.ocrPicturejobService.updateById(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：通过主键获得对象信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/getdata/{id}")
-	@ResponseBody
-	public ResultVo getdateOcrPicturejob(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
-		OcrPicturejob dto = this.ocrPicturejobService.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 delMoreOcrPicturejob(HttpServletResponse response,HttpServletRequest request) throws IOException{
-		String ids = request.getParameter("id");
-		this.ocrPicturejobService.deleteByIdMore(ids);
-		return ResultVoUtil.success();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturejobHtmlController.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import cn.jyjz.xiaoyao.ocr.service.OcrPicturejobService;
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,8 +27,6 @@ public class OcrPicturejobHtmlController extends BaseController{
 
 	private Logger log = LoggerFactory.getLogger(this.getClass());
 
-	@Autowired
-	private OcrPicturejobService ocrPicturejobService;
 
 	@Autowired
 	private UserTokenService userTokenService;

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeController.java

@@ -1,159 +0,0 @@
-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.dataobject.OcrPicturetype;
-import cn.jyjz.xiaoyao.ocr.service.OcrPicturetypeService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.beans.factory.annotation.Autowired;
-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;
-
-@RestController
-@RequestMapping("/ocr/ocrPicturetype")
-public class OcrPicturetypeController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Resource
-	private OcrPicturetypeService ocrPicturetypeService;
-
-	@Resource
-	private UserTokenService userTokenService;
-	@Resource
-	private UserService userService;
-	@Resource
-	private TenantService tenantService;
-	
-	/**
-	 * 图片类型列表
-	 *
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "orc_picturetype-分页列表查询")
-	@ApiOperation(value="图片类型列表", notes="图片类型列表，无分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
-	})
-	@GetMapping(value = "/rootList")
-	public ResultVo<List<OcrPicturetype>> queryPageList(HttpServletRequest req) {
-		//租户主键，由前端页面传送
-		String tenantId = req.getHeader("X-Tenant-Id");
-		if(StringUtils.isBlank(tenantId)){
-			return ResultVoUtil.error("租户主键不能为空");
-		}
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(req, "search_");
-		OcrPicturetype ocrpicturetype = new OcrPicturetype();
-		QueryWrapper<OcrPicturetype> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype);
-		queryWrapper.eq("TENANTID",tenantId);
-		queryWrapper.orderByDesc("REORDER");
-		
-		List<OcrPicturetype> list = this.ocrPicturetypeService.queryListNoPage(queryWrapper);
-		return ResultVoUtil.success(list);
-	}
-	
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/list")
-	public ResultVo<IPage<OcrPicturetype>> listOcrPicturetype(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-
-		OcrPicturetype ocrpicturetype = new OcrPicturetype();
-
-		QueryWrapper<OcrPicturetype> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrpicturetype);
-		IPage<OcrPicturetype> page = this.ocrPicturetypeService.selectSearchListPage(paramterPage,queryWrapper);
-		for(OcrPicturetype ocrPicturetype:page.getRecords()){
-			ocrPicturetype.setTenant(tenantService.selectDtoById(ocrPicturetype.getTenantid()));
-		}
-		return ResultVoUtil.success(page);
-	}
-
-	/**
-	*方法描述：保存添加数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@PostMapping("/save")
-	public ResultVo saveOcrPicturetype(HttpServletResponse response,HttpServletRequest request,OcrPicturetype tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		
-		tab.setCreateby(userToken.getLoginname());
-		tab.setCreatetime(System.currentTimeMillis());
-		this.ocrPicturetypeService.save(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：根据页面form传来的对象修改数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@PostMapping("/edit")
-	public ResultVo editOcrPicturetype(HttpServletResponse response,HttpServletRequest request,OcrPicturetype tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setUpdateby(userToken.getLoginname());
-		tab.setUpdatetime(System.currentTimeMillis());
-		this.ocrPicturetypeService.updateById(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：通过主键获得对象信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/getdata/{id}")
-	@ResponseBody
-	public ResultVo getdateOcrPicturetype(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
-		OcrPicturetype dto = this.ocrPicturetypeService.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 delMoreOcrPicturetype(HttpServletResponse response,HttpServletRequest request) throws IOException{
-		String ids = request.getParameter("id");
-		this.ocrPicturetypeService.deleteByIdMore(ids);
-		return ResultVoUtil.success();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPicturetypeHtmlController.java

@@ -1,75 +0,0 @@
-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.OcrPicturetypeService;
-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/ocrpicturetypeHtml")
-public class OcrPicturetypeHtmlController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrPicturetypeService ocrPicturetypeService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	/**
-	*方法描述：跳转到列表页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/toList")
-	public String toListOcrPicturetype(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrpicturetype/list";
-	}
-
-	/**
-	*方法描述：跳转到保存页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/toSave")
-	public String toSaveOcrPicturetype(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrpicturetype/add";
-	}
-
-	/**
-	*方法描述：根据ID跳转到修改页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:01
-	**/
-	@GetMapping("/toEdit/{id}")
-	public String toEditOcrPicturetype(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/ocrpicturetype/edit";
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanController.java

@@ -1,156 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.controller;
-
-import java.io.IOException;
-import java.util.Arrays;
-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.OcrPicturetype;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
-import cn.jyjz.xiaoyao.ocr.service.OcrPlanService;
-import com.alibaba.fastjson.JSONObject;
-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.beans.factory.annotation.Autowired;
-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;
-
-@RestController
-@RequestMapping("/ocr/ocrPlan")
-public class OcrPlanController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Resource
-	private OcrPlanService ocrPlanService;
-
-	@Resource
-	private UserTokenService userTokenService;
-	@Resource
-	private UserService userService;
-	@Resource
-	private TenantService tenantService;
-	/**
-	 *方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	 *创建人：mail.zhangyong@gmail.com
-	 *创建时间：2024-01-14 10:27:02
-	 **/
-	@ApiOperation(value="ocr_任务计划列表查询", notes="ocr_任务计划列表查询，无分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
-	})
-	@GetMapping("/listall")
-	public ResultVo<List<OcrPlan>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		
-		//租户主键，由前端页面传送
-		String tenantId = request.getHeader("X-Tenant-Id");
-		if(StringUtils.isBlank(tenantId)){
-			return ResultVoUtil.error("租户主键不能为空");
-		}
-		
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-		OcrPlan ocrplan = new OcrPlan();
-		QueryWrapper<OcrPlan> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan);
-		queryWrapper.eq("TENANTID",tenantId);
-		queryWrapper.orderByDesc("REORDER");
-		List<OcrPlan> page = this.ocrPlanService.queryListNoPage(queryWrapper);;
-		return ResultVoUtil.success(page);
-	}
-	
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/list")
-	public ResultVo<IPage<OcrPlan>> listOcrPlan(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-
-		OcrPlan ocrplan = new OcrPlan();
-
-		QueryWrapper<OcrPlan> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrplan);
-		IPage<OcrPlan> page = this.ocrPlanService.selectSearchListPage(paramterPage,queryWrapper);
-		for(OcrPlan ocrPlan:page.getRecords()){
-			ocrPlan.setTenant(tenantService.selectDtoById(ocrPlan.getTenantid()));
-		}
-		return ResultVoUtil.success(page);
-	}
-
-	/**
-	*方法描述：保存添加数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/save")
-	public ResultVo saveOcrPlan(HttpServletResponse response,HttpServletRequest request,OcrPlan tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setCreateby(userToken.getLoginname());
-		tab.setCreatetime(System.currentTimeMillis());
-		this.ocrPlanService.save(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：根据页面form传来的对象修改数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/edit")
-	public ResultVo editOcrPlan(HttpServletResponse response,HttpServletRequest request,OcrPlan tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setUpdateby(userToken.getLoginname());
-		tab.setUpdatetime(System.currentTimeMillis());
-		this.ocrPlanService.updateById(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：通过主键获得对象信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/getdata/{id}")
-	@ResponseBody
-	public ResultVo getdateOcrPlan(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
-		OcrPlan dto = this.ocrPlanService.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:02
-	**/
-	@GetMapping("/delmore")
-	@ResponseBody
-	public ResultVo delMoreOcrPlan(HttpServletResponse response,HttpServletRequest request) throws IOException{
-		String ids = request.getParameter("id");
-		this.ocrPlanService.deleteByIdMore(ids);
-		return ResultVoUtil.success();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPlanHtmlController.java

@@ -1,75 +0,0 @@
-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.OcrPlanService;
-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/ocrplanHtml")
-public class OcrPlanHtmlController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrPlanService ocrPlanService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	/**
-	*方法描述：跳转到列表页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toList")
-	public String toListOcrPlan(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrplan/list";
-	}
-
-	/**
-	*方法描述：跳转到保存页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toSave")
-	public String toSaveOcrPlan(HttpServletResponse response,HttpServletRequest request){
-		String resourceid = request.getParameter("resourceid");
-		request.setAttribute("resourceid",resourceid);
-		return "/backstage/oa/ocr/ocrplan/add";
-	}
-
-	/**
-	*方法描述：根据ID跳转到修改页面
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/toEdit/{id}")
-	public String toEditOcrPlan(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/ocrplan/edit";
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrProvinceController.java

@@ -1,73 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.controller;
-
-import java.io.IOException;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import cn.jyjz.xiaoyao.oa.from.dataobject.Category;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
-import cn.jyjz.xiaoyao.ocr.service.OcrProvinceService;
-import com.alibaba.fastjson.JSONObject;
-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.beans.factory.annotation.Autowired;
-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("/backstage/ocrnewtest/ocrprovince")
-public class OcrProvinceController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrProvinceService ocrProvinceService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-03-10 23:18:35
-	**/
-	@ApiOperation(value="省份列表", notes="省份列表")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
-	})
-	@GetMapping("/listall")
-	public ResultVo<List<OcrProvince>> listall(HttpServletRequest request, HttpServletResponse response) throws IOException{
-		//租户主键，由前端页面传送
-		String tenantId = request.getHeader("X-Tenant-Id");
-		if(StringUtils.isBlank(tenantId)){
-			return ResultVoUtil.error("租户主键不能为空");
-		}
-		
-		QueryWrapper<OcrProvince> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("tenantid",tenantId);
-		
-		List<OcrProvince> list = this.ocrProvinceService.getProvinceAll(queryWrapper);
-		
-		return ResultVoUtil.success(list);
-	}
-
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java

@@ -66,38 +66,38 @@ public class OcrSUserTController {
                     if(map.get("newPassword").equals(map.get("rePasswrod"))){
                         BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
                         UpdateWrapper<OcrSUserT> updatewrapper = new UpdateWrapper<>();
-                        updatewrapper.eq("LOGINNAME", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword")));
+                        updatewrapper.eq("MOBILE", map.get("loginname")).set("PASSWORD",bCryptPasswordEncoder.encode(map.get("newPassword")));
                         boolean update = sUserTService.update(updatewrapper);
 
                         if(update){
 //                            return  new ResponseEntity<Object>("密码重设成功！",HttpStatus.OK);
-                            return ResultVoUtil.error(ResultVo.SUCCESS,"密码重设成功！");
+                            return ResultVoUtil.success(ResultVo.SUCCESS,"密码重设成功！");
                         }
                     }else{
 
 //                        return  new ResponseEntity<Object>("两次密码输入不一致！",HttpStatus.OK);
-                        return ResultVoUtil.error(ResultVo.SUCCESS,"两次密码输入不一致！");
+                        return ResultVoUtil.error(ResultVo.ERROR,"两次密码输入不一致！");
                     }
 
                 }else{
 
 //                    return  new ResponseEntity<Object>("请再次输入新密码！",HttpStatus.OK);
-                    return ResultVoUtil.error(ResultVo.SUCCESS,"请再次输入新密码！");
+                    return ResultVoUtil.error(ResultVo.ERROR,"请再次输入新密码！");
                 }
             }else{
 
 //                return  new ResponseEntity<Object>("请输入新密码！",HttpStatus.OK);
-                return ResultVoUtil.error(ResultVo.SUCCESS,"请输入新密码！");
+                return ResultVoUtil.error(ResultVo.ERROR,"请输入新密码！");
 
             }
 
         }else {
 
 //            return  new ResponseEntity<Object>("请输入同时包含英文、数字的8~16位密码！",HttpStatus.OK);
-            return ResultVoUtil.error(ResultVo.SUCCESS,"请输入同时包含英文、数字的8~16位密码！");
+            return ResultVoUtil.error(ResultVo.ERROR,"请输入同时包含英文、数字的8~16位密码！");
         }
 
-        return ResultVoUtil.error(ResultVo.SUCCESS);
+        return ResultVoUtil.error(ResultVo.ERROR);
     }
 
     @ApiOperation(value = "忘记密码", notes = "忘记密码")
@@ -131,40 +131,40 @@ public class OcrSUserTController {
                                         return ResultVoUtil.success(ResultVo.SUCCESS,list);
                                     }else {
 //                                        return  new ResponseEntity<Object>("验证码错误！",HttpStatus.OK);
-                                        return ResultVoUtil.error(ResultVo.SUCCESS,"验证码错误！");
+                                        return ResultVoUtil.error(ResultVo.ERROR,"验证码错误！");
                                     }
                                 }else {
 //                                    return  new ResponseEntity<Object>("手机号错误！",HttpStatus.OK);
-                                    return ResultVoUtil.error(ResultVo.SUCCESS,"手机号错误！");
+                                    return ResultVoUtil.error(ResultVo.ERROR,"手机号错误！");
                                 }
 
                             }else {
 //                                return  new ResponseEntity<Object>("账号不存在！",HttpStatus.OK);
-                                return ResultVoUtil.error(ResultVo.SUCCESS,"账号不存在！");
+                                return ResultVoUtil.error(ResultVo.ERROR,"账号不存在！");
                             }
 
 
                         }else {
 //                            return  new ResponseEntity<Object>("企业编码错误！",HttpStatus.OK);
-                            return ResultVoUtil.error(ResultVo.SUCCESS,"企业编码错误！");
+                            return ResultVoUtil.error(ResultVo.ERROR,"企业编码错误！");
                         }
 
                     }else {
 //                        return  new ResponseEntity<Object>("请输入企业编码！",HttpStatus.OK);
-                        return ResultVoUtil.error(ResultVo.SUCCESS,"请输入企业编码！");
+                        return ResultVoUtil.error(ResultVo.ERROR,"请输入企业编码！");
                     }
                 }else {
 //                    return  new ResponseEntity<Object>("请输入验证码！",HttpStatus.OK);
-                    return ResultVoUtil.error(ResultVo.SUCCESS,"请输入验证码！");
+                    return ResultVoUtil.error(ResultVo.ERROR,"请输入验证码！");
                 }
             }else {
 //                return  new ResponseEntity<Object>("请输入手机号！",HttpStatus.OK);
-                return ResultVoUtil.error(ResultVo.SUCCESS,"请输入手机号！");
+                return ResultVoUtil.error(ResultVo.ERROR,"请输入手机号！");
             }
         }else {
 
 //            return  new ResponseEntity<Object>("请输入账号！",HttpStatus.OK);
-            return ResultVoUtil.error(ResultVo.SUCCESS,"请输入账号！");
+            return ResultVoUtil.error(ResultVo.ERROR,"请输入账号！");
         }
 
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java

@@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ocr控制器
@@ -42,13 +44,20 @@ public class OcrSearchHistoryController  {
      */
     @RequestMapping(value = "/searchList", method = RequestMethod.GET)
     public ResultVo searchList(HttpServletRequest request,
-                               @RequestParam(value = "search", required = false) String search) {
+                               @RequestParam(value = "search", required = true) String search) {
+        //租户主键，由前端页面传送
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         //执行查询方法
-        List<String> selectsearch = ocrSearchHistoryService.selectsearch(search, userToken.getUsername());
+        Map<Object, List<Map<String,String>>> 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);
@@ -67,9 +76,16 @@ public class OcrSearchHistoryController  {
      */
     @RequestMapping(value = "/searchdelete", method = RequestMethod.DELETE)
     public ResultVo searchdelete(HttpServletRequest request) {
+        //租户主键，由前端页面传送
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
         UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         QueryWrapper<OcrSearchHistory> wrapper = new QueryWrapper<>();
         wrapper.eq("userid",userToken.getUserid());
+        wrapper.eq("tenant_id",Long.valueOf(tenantId));
         //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据
          ocrSearchHistoryService.remove(wrapper);
 //        return new ResponseEntity<Object>("true",HttpStatus.OK);
@@ -84,10 +100,15 @@ public class OcrSearchHistoryController  {
      */
     @RequestMapping(value = "/historySearch", method = RequestMethod.GET)
     public ResultVo historySearch(HttpServletRequest request) {
-        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
 
+        //租户主键，由前端页面传送
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
         QueryWrapper<OcrSearchHistory> wrapper = new QueryWrapper<>();
-        wrapper.select("historyname","createdate").eq("userid",userToken.getUserid()).orderByDesc("createdate").last("limit 8");
+        wrapper.select("historyname","createdate").eq("userid",userToken.getUserid()).eq("tenant_id",Long.valueOf(tenantId)).orderByDesc("createdate").last("limit 8");
         List<OcrSearchHistory> list = ocrSearchHistoryService.list(wrapper);
 
 //        return new ResponseEntity<List<OcrSearchHistory>>(list, HttpStatus.OK);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchmanagerController.java

@@ -12,10 +12,7 @@ import cn.jyjz.xiaoyao.common.mybatisplus.util.SearchQueryFormat;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchmanager;
 import cn.jyjz.xiaoyao.ocr.service.OcrSearchmanagerService;
 import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
-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;
@@ -72,6 +69,7 @@ public class OcrSearchmanagerController extends BaseController{
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("create_by",userToken.getLoginname());
 		queryWrapper.eq("tenant_id",tenantId);
+		queryWrapper.eq("type",ocrSearchmanager.getType());
 		
 		List<OcrSearchmanager> list =  ocrSearchmanagerService.list(queryWrapper);
 		
@@ -82,6 +80,7 @@ public class OcrSearchmanagerController extends BaseController{
 		ocrSearchmanager.setCreateBy(userToken.getLoginname());
 		ocrSearchmanager.setCreateTime(System.currentTimeMillis());
 		ocrSearchmanager.setTenantId(Long.parseLong(tenantId));
+		ocrSearchmanager.setType(ocrSearchmanager.getType());
 		
 		return ocrSearchmanagerService.save(ocrSearchmanager)?ResultVoUtil.success("添加成功！"):ResultVoUtil.error();
 	}
@@ -97,7 +96,7 @@ public class OcrSearchmanagerController extends BaseController{
 			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
 	})
 	@GetMapping(value = "/query")
-	public ResultVo<OcrSearchmanager> queryById(HttpServletRequest req) {
+	public ResultVo<OcrSearchmanager> queryById(HttpServletRequest req,@RequestParam(name = "type") @ApiParam(value = "类型（首页：0，终审：1）", required = true) Integer type) {
 		
 		//获取当前登录人
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
@@ -111,6 +110,7 @@ public class OcrSearchmanagerController extends BaseController{
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("create_by",userToken.getLoginname());
 		queryWrapper.eq("tenant_id",tenantId);
+		queryWrapper.eq("type",type);
 
 		OcrSearchmanager ocrSearchmanager = null;
 		List<OcrSearchmanager> list =  ocrSearchmanagerService.list(queryWrapper);

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java

@@ -0,0 +1,122 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+
+import cn.jyjz.xiaoyao.common.base.controller.BaseController;
+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.OcrPicture;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage;
+import cn.jyjz.xiaoyao.ocr.dto.OcrTaskPackageDto;
+import cn.jyjz.xiaoyao.ocr.service.IOcrTaskPackageService;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ * 一键查重 and 任务包功能
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/ocr/ocrTaskPackage")
+public class OcrTaskPackageController extends BaseController {
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private IOcrTaskPackageService ocrTaskPackageService;
+
+
+    @Resource
+    private UserTokenService userTokenService;
+
+    /**
+     * 创建任务包
+     *
+     * @param ocrTaskPackage
+     * @param req
+     * @return
+     */
+    @PostMapping(value = "/createPackage")
+    public ResultVo createPackage(@RequestBody OcrTaskPackageDto ocrTaskPackage, HttpServletRequest req) {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req));
+        //租户
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if (StringUtils.isBlank(tenantId)) {
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        ocrTaskPackage.setTenantId(Long.parseLong(tenantId));
+        //校验参数包名称
+        if (ocrTaskPackage == null) {
+            return ResultVoUtil.error("参数对象为空");
+        }
+
+        //校验参数包名称
+        if (StringUtils.isBlank(ocrTaskPackage.getName())) {
+            return ResultVoUtil.error("任务包名称不能为空");
+        }
+
+        //校验参数包名称
+        if (StringUtils.isBlank(ocrTaskPackage.getCheckDuplicateNo())) {
+            return ResultVoUtil.error("查重任务编号不能为空");
+        }
+        ocrTaskPackage.setCreateBy(userToken.getUserid());
+        ocrTaskPackage.setCreateTime(System.currentTimeMillis());
+        return ocrTaskPackageService.saveTaskPackage(ocrTaskPackage);
+    }
+
+
+    /**
+     * 通过主键删除任务包
+     *
+     * @param packageId
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/deletePackage")
+    public ResultVo deletePackage(@RequestParam(name = "packageId", required = true) Long packageId, HttpServletRequest req) {
+        OcrTaskPackage taskPackage = new OcrTaskPackage();
+        taskPackage.setId(packageId);
+        taskPackage.setIsDelete(1);
+        boolean b = ocrTaskPackageService.updateById(taskPackage);
+        if (b) {
+            return ResultVoUtil.success();
+        } else {
+            return ResultVoUtil.error();
+        }
+    }
+
+    /**
+     * 获取任务包列表
+     *
+     * @param packageName
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/getPackageList")
+    public ResultVo getPackageList(@RequestParam(name = "packageName", required = false) String packageName,
+                                   @RequestParam(name = "pageNo") Integer pageNo,
+                                   @RequestParam(name = "pageSize") Integer pageSize,
+                                   HttpServletRequest req) {
+        String tenantId = req.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+        Page<Map<String, Object>> result = ocrTaskPackageService.getPackageList(pageNo, pageSize, packageName,tenantId);
+        return ResultVoUtil.success(result);
+
+    }
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -0,0 +1,221 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+import cn.hutool.core.collection.CollUtil;
+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 cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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
+ */
+@Api(tags="ocr可疑文件控制器")
+@RestController
+@RequestMapping("/ocr/dubiousfile")
+public class OcrTaskchildDubiousFileController  {
+
+
+    @Autowired
+    private IOcrTaskchildDubiousFileService ocrTaskchildDubiousFileService;
+
+    @Autowired
+    private UserTokenService userTokenService;
+
+    @Autowired
+    OcrTaskchildPictureService ocrtaskchildpictureservice;
+
+    @Autowired
+    OcrPictureService ocrpictureservice;
+
+    /**
+     * 分页查询
+     * @param request
+     * @return
+     */
+    @ApiOperation(value="可疑文件列表查询", notes="可疑文件列表查询")
+    @RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET)
+    public ResultVo<Page<OcrTaskChildPictureVo>> dubiousfilelist(HttpServletRequest request,
+                                  @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
+                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                    @RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) {
+
+
+        String tenantId = request.getHeader("X-Tenant-Id");
+        if(StringUtils.isBlank(tenantId)){
+            return ResultVoUtil.error("租户主键不能为空");
+        }
+
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+
+//        QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
+//        dubiouswrapper.eq("userid",userToken.getUserid());
+//        List<OcrTaskchildDubiousFile> list = ocrTaskchildDubiousFileService.list(dubiouswrapper);
+//        if(list.size()==0){
+//            return ResultVoUtil.success();
+//        }
+//        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()));
+//
+//
+//        if(orderbyname.equals("desc")){
+//            wrapper.orderByDesc("create_time");
+//        }else {
+//            wrapper.orderByAsc("create_time");
+//        }
+//
+//        //IPage<OcrPicture> page = ocrpictureservice.page(iPage, wrapper);
+
+        Page<OcrTaskChildPictureVo>  page = ocrTaskchildDubiousFileService.dubiousfilelist(pageNo,pageSize,orderbyname,userToken,tenantId);
+
+        return ResultVoUtil.success(page);
+    }
+
+
+    /**
+     *  删除
+     * @param request
+     * @return
+     */
+    @ApiOperation(value="可疑文件列表移除", notes="可疑文件列表移除")
+    @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));
+            if(ocrPicture != null){
+                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);
+            if(one != null){
+                fileList.add(one);
+            }
+        }
+
+        //无对应图片信息
+        if(CollUtil.isEmpty(saveList)){
+            return ResultVoUtil.error("可疑文件不存在！");
+        }
+        ocrpictureservice.updateBatchById(saveList);
+
+
+        //根据具体情况 判断 是否需要 进行数据返回， 默认不返回数据
+
+        return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error("可疑文件不存在！");
+    }
+    /**
+     * 添加
+     * @param request
+     * @return
+     */
+    @ApiOperation(value="可疑文件列表添加", notes="可疑文件列表添加")
+    @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET)
+    public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) {
+
+        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 = pictureid.toString().split(",");
+        for (String asd:taskchildid1){
+
+            QueryWrapper<OcrTaskchildDubiousFile> filewrapper = new QueryWrapper<>();
+            filewrapper.eq("picture_id",asd).eq("userid",userToken.getUserid());
+            OcrTaskchildDubiousFile one1 = ocrTaskchildDubiousFileService.getOne(filewrapper);
+            if (null==one1){
+                OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile();
+                ocrtaskchilddubiousfile.setPictureId(Long.parseLong(asd));
+                ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId));
+                ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid()));
+                ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis());
+
+
+                QueryWrapper<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
+                wrapper.eq("PICTUREID",asd);
+                OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
+                ocrtaskchilddubiousfile.setTaskchildId(one.getId());
+
+                UpdateWrapper<OcrPicture> updatewrapper = new UpdateWrapper<>();
+                updatewrapper.eq("ID", asd).set("suspiciousfile","1");
+
+                ocrpictureservice.update(updatewrapper);
+
+                list.add(ocrtaskchilddubiousfile);
+            }else {
+                if (!asd.equals(one1.getPictureId().toString())) {
+                    OcrTaskchildDubiousFile ocrtaskchilddubiousfile=new OcrTaskchildDubiousFile();
+                    ocrtaskchilddubiousfile.setPictureId(Long.parseLong(asd));
+                    ocrtaskchilddubiousfile.setTenantid(Long.parseLong(tenantId));
+                    ocrtaskchilddubiousfile.setUserid(Long.parseLong(userToken.getUserid()));
+                    ocrtaskchilddubiousfile.setCreatedate(System.currentTimeMillis());
+
+
+                    QueryWrapper<OcrTaskchildPicture> wrapper = new QueryWrapper<>();
+                    wrapper.eq("PICTUREID",asd);
+                    OcrTaskchildPicture one = ocrtaskchildpictureservice.getOne(wrapper);
+                    ocrtaskchilddubiousfile.setTaskchildId(one.getId());
+
+                    UpdateWrapper<OcrPicture> updatewrapper = new UpdateWrapper<>();
+                    updatewrapper.eq("ID", asd).set("suspiciousfile","1");
+
+                    ocrpictureservice.update(updatewrapper);
+
+                    list.add(ocrtaskchilddubiousfile);
+                }
+            }
+        }
+
+
+
+        return ocrTaskchildDubiousFileService.saveBatch(list)?ResultVoUtil.success():ResultVoUtil.error("当前图片已添加过了");
+    }
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java

@@ -1,7 +1,10 @@
 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;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -13,7 +16,10 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
 import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.beust.jcommander.Parameter;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,7 +27,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,6 +57,8 @@ public class OcrTaskchildPictureController extends BaseController{
     private UserTokenService userTokenService;
     @Resource
     private UserService userService;
+
+
     /**
      * 方法描述：返回json字符串，接受参数，dto名称以及分页信息
      * 创建人：mail.zhangyong@gmail.com
@@ -61,7 +71,8 @@ public class OcrTaskchildPictureController extends BaseController{
         OcrTaskchildPicture ocrtaskchildpicture = new OcrTaskchildPicture();
 
         QueryWrapper<OcrTaskchildPicture> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture);
-		IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.selectSearchListPage(paramterPage,queryWrapper);;
+        IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.selectSearchListPage(paramterPage, queryWrapper);
+        ;
         return ResultVoUtil.success(page);
     }
 
@@ -93,8 +104,9 @@ public class OcrTaskchildPictureController extends BaseController{
         QueryWrapper<OcrTaskchildPicture> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture);
 
         queryWrapper.eq("TENANTID", tenantId);
+        if (StringUtils.isNotBlank(packageid)) {
             queryWrapper.eq("PACKAGEID", packageid);
-		
+        }
         IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.selectSearchListPage(paramterPage, queryWrapper);
 
         QueryWrapper<OcrTaskchildPicture> queryWrapperNex = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture);
@@ -113,7 +125,7 @@ public class OcrTaskchildPictureController extends BaseController{
     @ApiOperation(value = "ocr_任务包下的当前图片比对的集合列表", notes = "ocr_任务包下的当前图片比对的集合列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
-			@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true),
+            @ApiImplicitParam(paramType = "path", name = "packageid", value = "任务包主键"),
             @ApiImplicitParam(paramType = "path", name = "taskchildpictureid", value = "当前选中的任务主键", required = true)
     })
     @GetMapping("/listbypictureid/{packageid}/{taskchildpictureid}")
@@ -122,7 +134,14 @@ public class OcrTaskchildPictureController extends BaseController{
                                                                                HttpServletResponse response,
                                                                                @PathVariable("packageid") String packageid,
                                                                                @PathVariable("taskchildpictureid") String taskchildpictureid) throws IOException {
-		
+        //获取页码、当前页
+        String pageNoStr = request.getParameter("pageNo");
+        String pageSizeStr = request.getParameter("pageSize");
+        if (StringUtils.isEmpty(pageNoStr) || StringUtils.isEmpty(pageSizeStr)) {
+            return ResultVoUtil.error("页码和条数必传！");
+        }
+        paramterPage.setStart(Integer.parseInt(pageNoStr));
+        paramterPage.setPagesize(Integer.parseInt(pageSizeStr));
         //租户主键，由前端页面传送
         String tenantId = request.getHeader("X-Tenant-Id");
         if (StringUtils.isBlank(tenantId)) {
@@ -139,11 +158,33 @@ public class OcrTaskchildPictureController extends BaseController{
         OcrTaskchildPicture ocrtaskchildpicture = new OcrTaskchildPicture();
         QueryWrapper<OcrTaskchildPicture> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery, ocrtaskchildpicture);
 
+        //
+
         //queryWrapper.eq("TENANTID",tenantId);
         //queryWrapper.eq("PACKAGEID",packageid);
 
         IPage<OcrTaskchildPicture> page = this.ocrTaskchildPictureService.listByPackageId(taskchildpictureid, paramterPage, queryWrapper, orderbyname, orderbyvalue, packageid, tenantId);
-		return ResultVoUtil.success(page);
+        List<JSONObject> collect = page.getRecords().stream().map(p -> {
+            JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(p));
+            jsonObject.put("id", jsonObject.getOrDefault("id", null).toString());
+            jsonObject.put("tenantid", jsonObject.getOrDefault("tenantid", null).toString());
+            jsonObject.put("pictureid", jsonObject.getOrDefault("pictureid", null).toString());
+            jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString());
+            return jsonObject;
+        }).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<>();
+        BeanUtils.copyProperties(page, objects);
+        objects.setRecords(collect1);
+        return ResultVoUtil.success(objects);
     }
 
     /**
@@ -183,6 +224,24 @@ public class OcrTaskchildPictureController extends BaseController{
      * @param req
      * @return
      */
+//	@ApiOperation(value="任务清除标记", notes="任务清除标记")
+//	@ApiImplicitParams({
+//			@ApiImplicitParam(paramType = "path",name = "taskchildpictureid", value = "任务主键", required = true),
+//			@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true)
+//	})
+//	@PostMapping(value = "/clearmark")
+//	public ResultVo clearmark(@RequestParam(name="taskchildpictureid",required=true) String taskchildpictureid,
+//									 @RequestParam(name="packageid",required=true) String packageid,
+//									 HttpServletRequest req) {
+//		//如果是历史图片，不允许进行设置
+//		//如果是已经审批完成的图片不允许是指
+//
+//		OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture();
+//
+//		ocrTaskchildPicture.setPackageid(Long.parseLong(packageid));
+//
+//		return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid);
+//	}
     @ApiOperation(value = "任务清除标记", notes = "任务清除标记")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "taskchildpictureid", value = "任务主键", required = true),
@@ -191,15 +250,15 @@ public class OcrTaskchildPictureController extends BaseController{
     @PostMapping(value = "/clearmark")
     public ResultVo clearmark(@RequestParam(name = "taskchildpictureid", required = true) String taskchildpictureid,
                               @RequestParam(name = "packageid", required = true) String packageid,
-									 HttpServletRequest req) {
+                              HttpServletRequest request) {
-		//如果是历史图片，不允许进行设置
+        //租户主键，由前端页面传送
-		//如果是已经审批完成的图片不允许是指
+        String tenantId = request.getHeader("X-Tenant-Id");
-		
+        if (StringUtils.isBlank(tenantId)) {
-		OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture();
+            return ResultVoUtil.error("租户主键不能为空");
+        }
 
-		ocrTaskchildPicture.setPackageid(Long.parseLong(packageid));
 
-		return ocrTaskchildPictureService.clearmark(taskchildpictureid,packageid);
+        return ocrTaskchildPictureService.clearmark(tenantId, taskchildpictureid, packageid);
     }
 
     /**
@@ -237,14 +296,15 @@ public class OcrTaskchildPictureController extends BaseController{
     @ApiOperation(value = "ocr_任务包下的当前展示的任务对象", notes = "ocr_任务包下的当前展示的任务对象")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", name = "id", value = "当前选中的任务主键", required = true),
-			@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键", required = true)
+            @ApiImplicitParam(paramType = "path", name = "packageid", value = "任务包主键，注意不是当前任务关联的packageid，而是当前选中的任务包主键")
     })
     @GetMapping("/getdata/{id}/{packageid}")
     @ResponseBody
     public ResultVo getdateOcrTaskchildPicture(HttpServletResponse response, HttpServletRequest request,
                                                @PathVariable("packageid") Long packageid,
                                                @PathVariable("id") Long id) throws IOException {
-		OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(),packageid);
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid, userToken);
         if (null != dto) {
             return ResultVoUtil.success(dto);
         } else {
@@ -312,4 +372,41 @@ public class OcrTaskchildPictureController extends BaseController{
         return ResultVoUtil.success();
     }
 
+    @ApiOperation(value = "ocr_任务包下的当前图片比对的集合列表", notes = "ocr_任务包下的当前图片比对的集合列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
+    })
+    @GetMapping("/getSimilarityList")
+    public ResultVo<IPage<OcrTaskChildPictureVo>> getSimilarityList(
+            @RequestParam(name = "pageNo") Integer pageNo,
+            @RequestParam(name = "pageSize") Integer pageSize,
+            @RequestParam(name = "orderType") String orderType,
+            @RequestParam(name = "orderName") String orderName,
+            @RequestParam(name = "pictureId") String pictureId,
+            HttpServletRequest request) {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        Page<OcrTaskChildPictureVo> similarityList = ocrTaskchildPictureService.getSimilarityList(pageNo, pageSize, pictureId, orderType, orderName,userToken);
+        return ResultVoUtil.success(similarityList);
+    }
+
+    /**
+     * 获取任务包相似图片
+     *
+     * @return
+     */
+    @GetMapping(value = "/getPictureSimilarityList")
+    public ResultVo getPictureSimilarityList(
+            @RequestParam(name = "pageNo") Integer pageNo,
+            @RequestParam(name = "pageSize") Integer pageSize,
+            @RequestParam(name = "orderType") String orderType,
+            @RequestParam(name = "orderName") String orderName,
+            @RequestParam(name = "checkDuplicateId") String checkDuplicateId,
+            @RequestParam(name = "pictureId") String pictureId,
+            HttpServletRequest request) {
+        UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
+        Page<OcrTaskChildPictureVo> result = ocrTaskchildPictureService.getPackageSimilarityList(pageNo, pageSize, orderType, orderName, checkDuplicateId, pictureId,userToken);
+        return ResultVoUtil.success(result);
+
+    }
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUpuserController.java

@@ -1,155 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.controller;
-
-import java.io.IOException;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-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.OcrPicturetype;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
-import cn.jyjz.xiaoyao.ocr.service.OcrUpuserService;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.beans.factory.annotation.Autowired;
-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/ocrUpuser")
-public class OcrUpuserController extends BaseController{
-
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private OcrUpuserService ocrUpuserService;
-
-	@Autowired
-	private UserTokenService userTokenService;
-	@Autowired
-	private UserService userService;
-	
-	
-	/**
-	 * 提报人列表查询
-	 *
-	 * @return
-	 */
-	//@AutoLog(value = "ocr_upuser-分页列表查询")
-	@ApiOperation(value="ocr_提报人查询", notes="ocr_提报人查询，无分页")
-	@ApiImplicitParams({
-			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true)
-	})
-	@GetMapping(value = "/listall")
-	public ResultVo<IPage<OcrUpuser>> queryPageList(
-												  HttpServletRequest req) {
-		//租户主键，由前端页面传送
-		String tenantId = req.getHeader("X-Tenant-Id");
-		if(StringUtils.isBlank(tenantId)){
-			return ResultVoUtil.error("租户主键不能为空");
-		}
-		
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(req, "search_");
-		OcrUpuser ocrUpuser = new OcrUpuser();
-		QueryWrapper<OcrUpuser> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrUpuser);
-		queryWrapper.eq("tenant_id",tenantId);
-		queryWrapper.orderByAsc("convert(upname using gbk)");
-		
-		List<OcrUpuser> pageList = ocrUpuserService.queryListNoPage(queryWrapper);
-		return ResultVoUtil.success(pageList);
-	}
-	
-	/**
-	*方法描述：返回json字符串，接受参数，dto名称以及分页信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/list")
-	public ResultVo<IPage<OcrUpuser>> listOcrUpuser(ParamterPage paramterPage, HttpServletRequest request, HttpServletResponse response) throws IOException{
-		SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_");
-
-		OcrUpuser ocrupuser = new OcrUpuser();
-
-		QueryWrapper<OcrUpuser> queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrupuser);
-		IPage<OcrUpuser> page = this.ocrUpuserService.selectSearchListPage(paramterPage,queryWrapper);;
-		return ResultVoUtil.success(page);
-	}
-
-	/**
-	*方法描述：保存添加数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/save")
-	public ResultVo saveOcrUpuser(HttpServletResponse response,HttpServletRequest request,OcrUpuser tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setCreateBy(userToken.getLoginname());
-		tab.setCreateTime(System.currentTimeMillis());
-		this.ocrUpuserService.save(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：根据页面form传来的对象修改数据
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@PostMapping("/edit")
-	public ResultVo editOcrUpuser(HttpServletResponse response,HttpServletRequest request,OcrUpuser tab) throws IOException{
-		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		tab.setUpdateBy(userToken.getLoginname());
-		tab.setUpdateTime(System.currentTimeMillis());
-		this.ocrUpuserService.updateById(tab);
-		return ResultVoUtil.success();
-	}
-
-	/**
-	*方法描述：通过主键获得对象信息
-	*创建人：mail.zhangyong@gmail.com
-	*创建时间：2024-01-14 10:27:02
-	**/
-	@GetMapping("/getdata/{id}")
-	@ResponseBody
-	public ResultVo getdateOcrUpuser(HttpServletResponse response,HttpServletRequest request,@PathVariable("id") Long id) throws IOException{
-		OcrUpuser dto = this.ocrUpuserService.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:02
-	**/
-	@GetMapping("/delmore")
-	@ResponseBody
-	public ResultVo delMoreOcrUpuser(HttpServletResponse response,HttpServletRequest request) throws IOException{
-		String ids = request.getParameter("id");
-		this.ocrUpuserService.deleteByIdMore(ids);
-		return ResultVoUtil.success();
-	}
-
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java

@@ -30,14 +30,13 @@ public class OcrUserFieldController extends BaseController{
 	 */
 	@ApiOperation(value="保存或更新用户展示字段列表", notes="保存或更新用户展示字段列表")
 	@PostMapping(value = "/saveOrUpdate")
-	public ResultVo saveOrUpdate(@ApiParam(value = "用户字段信息", required = true) OcrUserFieldVo ocrUserFieldVo) {
+	public ResultVo saveOrUpdate(@ApiParam(value = "用户字段信息", required = true) @RequestBody OcrUserFieldVo ocrUserFieldVo) {
 		try {
 			OcrUserField ocrUserField = new OcrUserField();
 			ocrUserField.setUserId(ocrUserFieldVo.getUserId());
 			ocrUserField.setReviewType(ocrUserFieldVo.getReviewType());
-			ocrUserField.setUserField(ocrUserFieldVo.getUserField());
+			ocrUserField.setUserFieldFixed(ocrUserFieldVo.getUserFieldFixed());
-			ocrUserFieldService.saveData(ocrUserField);
+			ocrUserField.setUserFieldUnFixed(ocrUserFieldVo.getUserFieldUnFixed());
-			// 调用服务层方法，并处理返回值
 			ResultVo result = ocrUserFieldService.saveData(ocrUserField);
 			return result;
 		}catch (Exception e) {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java

@@ -12,17 +12,15 @@ 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.OcrConfiguration;
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearch;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
 import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchService;
 import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
+import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
+import cn.jyjz.xiaoyao.ocr.vo.SearchConditionVO;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
+import io.swagger.annotations.*;
-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;
@@ -71,6 +69,7 @@ public class OcrUsersearchController extends BaseController{
 	@GetMapping(value = "/list")
 	public ResultVo<IPage<OcrUsersearch>> queryPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														@RequestParam(name="type") @ApiParam(value = "类型(首页为0，终审为1)", required = true) Integer type,
 														  HttpServletRequest request) {
 		//获取当前登录人
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
@@ -93,6 +92,7 @@ public class OcrUsersearchController extends BaseController{
 
 		queryWrapper.eq("USERID",userToken.getUserid());
 		queryWrapper.eq("TENANTID",tenantId);
+		queryWrapper.eq("TYPE",type);
 		queryWrapper.orderByDesc(Arrays.asList("IZTOP","REORDER"));
 
 		IPage<OcrUsersearch> pageList = ocrUsersearchService.selectSearchListPage(paramterPage, queryWrapper);
@@ -133,7 +133,8 @@ public class OcrUsersearchController extends BaseController{
 		ocrUsersearch.setCreatetime(System.currentTimeMillis());
 		ocrUsersearch.setCreateby(userToken.getLoginname());
 		ocrUsersearch.setTenantid(Long.parseLong(tenantId));
-		ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid()));
+		ocrUsersearch.setReorder(this.ocrUsersearchService.getReorder(ocrUsersearch.getUserid(),ocrUsersearch.getType()));
+		ocrUsersearch.setType(ocrUsersearch.getType());
 		if(null != ocrUsersearch.getId()){
 			this.ocrUsersearchService.removeByIds(ocrUsersearch.getId().toString());
 		}
@@ -302,4 +303,21 @@ public class OcrUsersearchController extends BaseController{
 		}
 		return ResultVoUtil.success(ocrUsersearch);
 	}
+
+	/**
+	 * 根据查询条件转换为图片接口对应的传参字段
+	 * @param userSearchId
+	 * @return
+	 */
+	@ApiOperation(value="获取AI查询过滤条件回写", notes="获取AI查询过滤条件回写")
+	@GetMapping(value = "/querySearchCondition")
+	public ResultVo<SearchConditionVO> querySearchCondition(@RequestParam(name="userSearchId",required=true) String userSearchId) {
+		//解析此条件列表字段并返回前端解析为对应前端字段内容
+		SearchConditionVO searchConditionVO = ocrUsersearchchildService.querySearchCondition(userSearchId);
+		if(searchConditionVO==null) {
+			return ResultVoUtil.error("未找到对应数据");
+		}
+		return ResultVoUtil.success(searchConditionVO);
+	}
+
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrAreaMybatisDao.java

@@ -1,11 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrAreaMybatisDao extends BaseMapper<OcrArea> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDuplicateMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 查重任务表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrCheckDuplicateMapper extends BaseMapper<OcrCheckDuplicate> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDuplicateResultMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrCheckDuplicateResultMapper extends BaseMapper<OcrCheckDuplicateResult> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrFieldMybatisDao.java

@@ -1,6 +1,5 @@
 package cn.jyjz.xiaoyao.ocr.dataDao;
 
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrArea;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrField;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrMsgMapper.java

@@ -19,7 +19,9 @@ import java.util.Map;
  */
 @Mapper
 public interface OcrMsgMapper extends BaseMapper<OcrMsg> {
-    List<List<Map<Object, String>>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory);
+    List<Map<Object, String>> selectPage(@Param("userid")String userid,@Param("msgCategory")String msgCategory);
 
     Map<Object, String> selectone(@Param("id")String id);
+
+    int selectUnreadMsgCount(@Param("userId") String userid);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureDuplicateHisMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureDuplicateHis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 图片比对历史信息表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrPictureDuplicateHisMapper extends BaseMapper<OcrPictureDuplicateHis> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureInfoMapper.java

@@ -0,0 +1,13 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * ClassName： $className$.java
+ * Description: 
+ * Author： scl.
+ * Date： 2024/3/22 07:09
+ */
+public interface OcrPictureInfoMapper extends BaseMapper<OcrPictureInfo> {
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureMybatisDao.java

@@ -3,9 +3,16 @@ package cn.jyjz.xiaoyao.ocr.dataDao;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
 * 数据持久化
 */
 @Mapper
 public interface OcrPictureMybatisDao extends BaseMapper<OcrPicture> {
+    OcrPicture getPackagePictureInfo(@Param("packageId") String packageId, @Param("pictureId") String pictureId, @Param("userNodeType") String userNodeType);
+
+    List<OcrPicture> getPictureNodeStatesList(@Param("pictureIds") List<String> pictureIds, @Param("userNodeType") String userNodeType);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureclassMybatisDao.java

@@ -1,11 +0,0 @@
-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<OcrPictureclass> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturejobMybatisDao.java

@@ -1,30 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturejob;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrPicturejobMybatisDao extends BaseMapper<OcrPicturejob> {
-    /**
-     * 通过主表id删除子表数据
-     *
-     * @param mainId 主表id
-     * @return boolean
-     */
-    public boolean deleteByMainId(@Param("mainId") String mainId);
-    
-    /**
-     * 通过主表id查询子表数据
-     *
-     * @param mainId 主表id
-     * @return List<OcrPicturejob>
-     */
-    public List<OcrPicturejob> selectByMainId(@Param("mainId") String mainId);
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPicturetypeMybatisDao.java

@@ -1,11 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicturetype;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrPicturetypeMybatisDao extends BaseMapper<OcrPicturetype> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPlanMybatisDao.java

@@ -1,11 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrPlanMybatisDao extends BaseMapper<OcrPlan> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrProvinceMybatisDao.java

@@ -1,11 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrProvince;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrProvinceMybatisDao extends BaseMapper<OcrProvince> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrSearchHistoryMapper.java

@@ -3,11 +3,11 @@ package cn.jyjz.xiaoyao.ocr.dataDao;
 
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import liquibase.pro.packaged.S;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,5 +19,21 @@ import java.util.List;
  */
 @Mapper
 public interface OcrSearchHistoryMapper extends BaseMapper<OcrSearchHistory> {
-        List<String> selectsearch(@Param("search")String search,@Param("assignee") String assignee);
+        List<Map<String,String>> selectsearch1(@Param("userid")String userid,@Param("search")String search,@Param("tenantId")String tenantId);
+
+        List<Map<String,String>> selectsearch2(@Param("userid")String userid,@Param("search")String search,@Param("tenantId")String tenantId);
+
+        List<Map<String,String>> selectsearch3(@Param("userid")String userid,@Param("search")String search,@Param("tenantId")String tenantId);
+
+
+
+//        Map<Object,Object> toolscount(@Param("tenantid")String tenantid);
+
+        Map<Object,Object> toolscount(@Param("userId")String userId);
+
+        Map<Object,Object> selectaisp(@Param("id")String id);
+
+        List<Map<Object, Object>> selectaispList(@Param("id")String id);
+
+        String selectaiuser(@Param("userid")String userid);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java

@@ -0,0 +1,25 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 任务包表  (新20240323) Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrTaskPackageMapper extends BaseMapper<OcrTaskPackage> {
+
+    Page<Map<String,Object>> getPackageList(Page<Map<String, Object>> page, @Param("packageName") String packageName,
+                                            @Param("tenantId") String tenantId);
+}

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;
+
+/**
+ * <p>
+ * 可疑文件夹 Mapper 接口
+ * </p>
+ *
+ * @author 你的肉123
+ * @since 2024-03-21
+ */
+@Mapper
+public interface OcrTaskchildDubiousFileMapper extends BaseMapper<OcrTaskchildDubiousFile> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskchildPictureMybatisDao.java

@@ -1,10 +1,13 @@
 package cn.jyjz.xiaoyao.ocr.dataDao;
 
-import cn.jyjz.xiaoyao.oa.from.vo.FlowUnionVo;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
+import cn.jyjz.xiaoyao.ocr.vo.OcrTaskChildPictureVo;
+import cn.jyjz.xiaoyao.ocr.vo.PictureDetailVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -41,4 +44,14 @@ public interface OcrTaskchildPictureMybatisDao extends BaseMapper<OcrTaskchildPi
      * @return
      */
     Long listmytaskCount(Map<String, Object> query);
+
+
+    String selectocpicture(@Param("tenantid")String tenantid,@Param("packageid")String packageid,@Param("id")String id);
+
+    List<OcrTaskChildPictureVo> getPictureHistoryList(@Param("pictureIds") List<String> pictureIds, @Param("taskname") String taskname);
+    List<OcrTaskChildPictureVo> getDubiousfileList(@Param("pictureIds") List<String> pictureIds, @Param("taskname") String taskname);
+
+    PictureDetailVo getPictureDetail(String pictureId);
+
+    Page<OcrTaskChildPictureVo> getPackageSimilarityList(Page<OcrTaskChildPictureVo> page, @Param("checkDuplicateId") String checkDuplicateId, @Param("pictureId") String pictureId, @Param("oderType") String oderType, @Param("oderName") String oderName, @Param("taskname") String taskname);
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrUpuserMybatisDao.java

@@ -1,11 +0,0 @@
-package cn.jyjz.xiaoyao.ocr.dataDao;
-
-import cn.jyjz.xiaoyao.ocr.dataobject.OcrUpuser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-/**
-* 数据持久化
-*/
-@Mapper
-public interface OcrUpuserMybatisDao extends BaseMapper<OcrUpuser> {
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrArea.java

@@ -1,114 +0,0 @@
-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.base.jsonDomain.DateSerializer;
-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_area")
-public class OcrArea implements BaseDto,java.io.Serializable {
-	
-	private static final long serialVersionUID = 8088861709460050761L;
-	@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 = "创建时间")
-	@JsonSerialize(using = DateSerializer.class)
-	@TableField(value="CREATETIME")
-	private Long createtime;
-	
-	@Schema(description = "修改人")
-	@TableField(value="UPDATEBY")
-	private String updateby;
-	
-	@Schema(description = "修改时间")
-	@JsonSerialize(using = DateSerializer.class)
-	@TableField(value="UPDATETIME")
-	private Long updatetime;
-	
-	@Schema(description = "租户ID")
-	@JsonSerialize(using = ToStringSerializer.class)
-	@TableField(value="TENANTID")
-	private Long tenantid;
-	
-	@Schema(description = "省份主键")
-	@JsonSerialize(using = ToStringSerializer.class)
-	@TableField(value="PROVINCEID")
-	private Long provinceid;
-	
-	@Schema(description = "地区名称")
-	@TableField(value="CITYNAME")
-	private String cityname;
-	
-	@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<String,String> query = Stream.of(
-		new SimpleEntry<>("listdept","deptid"),
-		new SimpleEntry<>("ID","id"),
-		new SimpleEntry<>("create_by","createBy"),
-		new SimpleEntry<>("create_time","createTime"),
-		new SimpleEntry<>("update_by","updateBy"),
-		new SimpleEntry<>("update_time","updateTime"),
-		new SimpleEntry<>("TENANTID","tenant_id"),
-		new SimpleEntry<>("PID","pid"),
-		new SimpleEntry<>("HASCHILD","has_child"),
-		new SimpleEntry<>("TYPENAME","typename")
-	)
-	.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;
-	}
-}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicate.java

@@ -0,0 +1,71 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 查重任务表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_check_duplicate")
+@ApiModel(value="OcrCheckDuplicate对象", description="查重任务表")
+public class OcrCheckDuplicate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="id")
+    private Long id;
+
+    @ApiModelProperty(value = "查重任务编号")
+    private String checkDuplicateNo;
+
+    @ApiModelProperty(value = "1.执行中 2.执行完毕 3.执行异常")
+    private Integer status;
+
+    @ApiModelProperty(value = "完成时间")
+    private Long completionTime;
+
+    @ApiModelProperty(value = "租户标识")
+    private Long tenantId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    @ApiModelProperty(value = "查重时的筛选条件")
+    private String searchingJson;
+
+    @ApiModelProperty(value = "主图数量")
+    private Integer pictureCount;
+
+    @ApiModelProperty(value = "0可用 1删除")
+    private Integer isDelete;
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java

@@ -0,0 +1,56 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_check_duplicate_result")
+@ApiModel(value="OcrCheckDuplicateResult对象", description="")
+public class OcrCheckDuplicateResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="ID")
+    private Long id;
+
+    @ApiModelProperty(value = "图片id")
+    private Long pictureId;
+
+    @ApiModelProperty(value = "当前图片与任务包其他图片比对结果")
+    private String compareResultJson;
+
+    @ApiModelProperty(value = "查重任务id")
+    private Long checkDuplicateId;
+
+    @ApiModelProperty(value = "当前图片在当前任务包下比对最高阈值")
+    private Double maxSimilarity;
+
+    @ApiModelProperty(value = "阈值分组排序值，数值越低排序越靠前，")
+    private Integer similarityGroupOrder;
+
+}