guoxiangbin
/
ocr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-lili-330' into test

Browse Source
pull/18/head^2
LILI 1 year ago
parent 611f07687d ddbcbd474d
commit 5295d09942
4 changed files with 187 additions and 0 deletions
Show Stats Download Patch File Download Diff File

19
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUsersearchController.java
Unescape View File

@ -16,6 +16,8 @@ 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.*;
@ -301,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);
}
}

3
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrUsersearchchildService.java
Unescape View File

@ -3,6 +3,7 @@ package cn.jyjz.xiaoyao.ocr.service;
import java.util.List;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
import cn.jyjz.xiaoyao.ocr.vo.SearchConditionVO;
/**
* 业务层
@ -16,4 +17,6 @@ public interface OcrUsersearchchildService extends BaseService<OcrUsersearchchil
* @return List<OcrUsersearchchild>
*/
public List<OcrUsersearchchild> selectByMainId(String mainId);
SearchConditionVO querySearchCondition(String userSearchId);
}

94
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrUsersearchchildServiceImpl.java
Unescape View File

@ -1,13 +1,19 @@
package cn.jyjz.xiaoyao.ocr.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.jyjz.xiaoyao.ocr.dataDao.OcrUsersearchchildMybatisDao;
import cn.jyjz.xiaoyao.ocr.dataobject.OcrUsersearchchild;
import cn.jyjz.xiaoyao.ocr.service.OcrUsersearchchildService;
import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum;
import cn.jyjz.xiaoyao.ocr.vo.SearchConditionVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* 业务层实现
@ -17,6 +23,9 @@ import java.util.List;
public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearchchildMybatisDao, OcrUsersearchchild> implements OcrUsersearchchildService {
@Autowired
private OcrUsersearchchildMybatisDao ocrusersearchchildmybatisdao;
@Resource
private OcrUsersearchchildService ocrUsersearchchildService;
@Override
public List<OcrUsersearchchild> selectByMainId(String mainId) {
@ -24,4 +33,89 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
queryWrapper.eq("usersearchid",mainId);
return ocrusersearchchildmybatisdao.selectList(queryWrapper);
}
/**
* 获取AI查询过滤条件回写
* @param userSearchId
* @return
*/
@Override
public SearchConditionVO querySearchCondition(String userSearchId) {
//获取条件id下的所有条件
List<OcrUsersearchchild> list = ocrUsersearchchildService.selectByMainId(userSearchId);
List<SearchConditionVO> conditionVOList = new ArrayList<>();
for (OcrUsersearchchild ocrUsersearchchild : list) {
SearchConditionVO vo = new SearchConditionVO();
String searchfield = ocrUsersearchchild.getSearchfield();//解析对应字段
if(SearchConfigEnum.PROJECT.getId().equals(searchfield)){
vo.setIzproject(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FILED2.getId().equals(searchfield)){
vo.setIzcustomtype(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FILED3.getId().equals(searchfield)){
vo.setIzcustomname(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FIELD4.getId().equals(searchfield)){
vo.setIztaskrrom(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FIELD5.getId().equals(searchfield)){
vo.setIzfirm(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FILED6.getId().equals(searchfield)){
vo.setIzcustomlevel(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FIELD9.getId().equals(searchfield)){
vo.setIzproductname(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FIELD16.getId().equals(searchfield)){
vo.setIztaskstatus(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.FIELD17.getId().equals(searchfield)){
vo.setIzprojecttype(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.PROCINCE.getId().equals(searchfield)){
vo.setIzvisitpro(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.UPUSERSEARCH.getId().equals(searchfield)){
vo.setIzupuser(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.SIMISEARCH.getId().equals(searchfield)){
vo.setIzsimilarity(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.CLASSISEARCH.getId().equals(searchfield)){
vo.setIzshow(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.YEARSEARCH.getId().equals(searchfield)){
vo.setIzyear(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.TYPESEARCH.getId().equals(searchfield)){
vo.setIzpicturetype(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.AREASEARCH.getId().equals(searchfield)){
vo.setIzvisitcity(ocrUsersearchchild.getSearchvalue());
}
if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){
vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue());
}
conditionVOList.add(vo);
}
if(CollUtil.isEmpty(conditionVOList)){
return new SearchConditionVO();
}
return conditionVOList.get(0);
}
}

71
jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/SearchConditionVO.java
Unescape View File

@ -0,0 +1,71 @@
package cn.jyjz.xiaoyao.ocr.vo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "查询条件前端回写VO对象", title = "查询条件前端回写VO对象")
public class SearchConditionVO {
@ApiModelProperty(value = "所属项目")
private String izproject;
@ApiModelProperty(value = "拜访客户类型")
private String izcustomtype;
@ApiModelProperty(value = "拜访客户级别")
private String izcustomlevel;
@ApiModelProperty(value = "拜访客户名称")
private String izcustomname;
@ApiModelProperty(value = "任务来源")
private String iztaskrrom;
@ApiModelProperty(value = "任务状态")
private String iztaskstatus;
@ApiModelProperty(value = "拜访省份/直辖市、")
private String izvisitpro;
@ApiModelProperty(value = "厂商")
private String izfirm;
@ApiModelProperty(value = "产品名称")
private String izproductname;
@ApiModelProperty(value = "拜访项目类别")
private String izprojecttype;
@ApiModelProperty(value = "提报人")
private String izupuser;
@ApiModelProperty(value = "所属计划")
private String izplan;
@ApiModelProperty(value = "相似度")
private String izsimilarity;
@ApiModelProperty(value = "分类搜索")
private String izshow;
@ApiModelProperty(value = "是否展示年份")
private String izyear;
@ApiModelProperty(value = "图片类型")
private String izpicturetype;
@ApiModelProperty(value = "发布地区、拜访城市")
private String izvisitcity;
@ApiModelProperty(value = "上传时间")
private String izYeardddd;
}
Write Preview
Loading…
Cancel
Save