sunchenliang #59

Merged
sunchenliang merged 12 commits from sunchenliang into test 1 year ago

@ -154,6 +154,17 @@ public class SearchQuery implements java.io.Serializable{
public void addLessEqual(String field,Date value){ public void addLessEqual(String field,Date value){
addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL); 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 * @param field
@ -177,11 +188,15 @@ public class SearchQuery implements java.io.Serializable{
log.error("【添加搜索条件】对象-value-错误value不能为空"); log.error("【添加搜索条件】对象-value-错误value不能为空");
return; 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(); SearchQueryForm lf = new SearchQueryForm();
if(query.get(field)!=null){
lf = (SearchQueryForm) query.get(field);
}
lf.setField(field); lf.setField(field);
lf.setDataOp(SearchQueryUtil.filterMap.get(filter)); lf.setDataOp(SearchQueryUtil.filterMap.get(filter));
lf.setOp(filter); lf.setOp(filter);

@ -8,10 +8,10 @@ import java.io.Serializable;
*/ */
public class SearchQueryForm implements Serializable { public class SearchQueryForm implements Serializable {
private static final long serialVersionUID = 1L; 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 rulesOp;// 搜索条件的关联方式,或/与and/or
private String tablenameother = "";// 数据表别名 private String tablenameother = "";// 数据表别名
private String dataOp;// 数据库中的比较条件,根据op属性获取 private String dataOp;// 数据库中的比较条件,根据op属性获取

@ -564,6 +564,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
jsonObject.put("sendTime", System.currentTimeMillis()); jsonObject.put("sendTime", System.currentTimeMillis());
jsonObject.put("fromId", model.getId().toString()); jsonObject.put("fromId", model.getId().toString());
jsonObject.put("taskName", model.getFromtaskname()); jsonObject.put("taskName", model.getFromtaskname());
jsonObject.put("pictureId", model.getPictureid());
jsonObject.put("packageId", model.getPackageid()); jsonObject.put("packageId", model.getPackageid());
msg.setBusJson(jsonObject.toJSONString()); msg.setBusJson(jsonObject.toJSONString());
msg.setCreateBy(Long.valueOf(userToken.getUserid())); msg.setCreateBy(Long.valueOf(userToken.getUserid()));

@ -159,9 +159,9 @@ public class PictureSourceResult {
*/ */
String companyDepartment; String companyDepartment;
/** /**
* *
*/ */
String manufacturer; Map<String,Object> manufacturer;
/** /**
* 访 * 访

@ -86,6 +86,7 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
//组装请求参数 //组装请求参数
String url = apiConfig.getInterfaceDomain()+pictureSourceUrl; String url = apiConfig.getInterfaceDomain()+pictureSourceUrl;
String requestBodyJson = JSONObject.toJSONString(requestData); 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); System.out.println("入参数据:"+requestBodyJson);
HttpParamers httpParamers = new HttpParamers(HttpMethod.POST); HttpParamers httpParamers = new HttpParamers(HttpMethod.POST);

@ -37,18 +37,18 @@ public class ApiTestController {
String pageNo = request.getParameter("pageNo"); String pageNo = request.getParameter("pageNo");
PictureSourceParameter pictureSourceParameter = new PictureSourceParameter(); 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(); 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(); Instant einstant = dateTime1.toInstant();
pictureSourceParameter.setStartTime(Date.from(binstant)); pictureSourceParameter.setStartTime(Date.from(binstant));
pictureSourceParameter.setEndTime(Date.from(einstant)); pictureSourceParameter.setEndTime(Date.from(einstant));
pictureSourceParameter.setPageNo(Integer.parseInt(pageNo)); pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
pictureSourceParameter.setPageSize(Integer.parseInt(pageSize)); pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
pictureSourceParameter.setTenantNo(1714548920583360512L); pictureSourceParameter.setTenantNo(1714548920583360512L);
pictureSourceParameter.setAccountNo(1714559587755397120L); pictureSourceParameter.setAccountNo(1714887674875514880L);
try { try {
ApiPage<PictureSourceResult> apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter); ApiPage<PictureSourceResult> apiPage = prevailCloudApi.pullPictureSource(pictureSourceParameter);
List<PictureSourceResult> listResult= apiPage.getRecords(); List<PictureSourceResult> listResult= apiPage.getRecords();

@ -283,9 +283,9 @@ public class OcrPictureController extends BaseController {
String orderByTime = req.getParameter("orderByTime"); String orderByTime = req.getParameter("orderByTime");
if (StringUtils.isNotBlank(orderByTime)) { if (StringUtils.isNotBlank(orderByTime)) {
if (orderByTime.equals("asc")) { if (orderByTime.equals("asc")) {
queryWrapper.orderByAsc("create_time"); queryWrapper.orderByAsc("submit_date_timestamp");
} else { } else {
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("submit_date_timestamp");
} }
} }

@ -1,5 +1,6 @@
package cn.jyjz.xiaoyao.ocr.controller; 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.service.UserTokenService;
import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil;
import cn.jyjz.xiaoyao.common.base.vo.ResultVo; import cn.jyjz.xiaoyao.common.base.vo.ResultVo;
@ -13,6 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
@ -31,11 +34,12 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* ocr * ocr
* *
* @author * @author
* @Date 2024-03-21 19:00:57 * @Date 2024-03-21 19:00:57
*/ */
@Api(tags="ocr可疑文件控制器")
@RestController @RestController
@RequestMapping("/ocr/dubiousfile") @RequestMapping("/ocr/dubiousfile")
public class OcrTaskchildDubiousFileController { public class OcrTaskchildDubiousFileController {
@ -58,8 +62,9 @@ public class OcrTaskchildDubiousFileController {
* @param request * @param request
* @return * @return
*/ */
@ApiOperation(value="可疑文件列表查询", notes="可疑文件列表查询")
@RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET) @RequestMapping(value = "/dubiousfilelist", method = RequestMethod.GET)
public ResultVo dubiousfilelist(HttpServletRequest request, public ResultVo<Page<OcrTaskChildPictureVo>> dubiousfilelist(HttpServletRequest request,
@RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo, @RequestParam(value = "pageNo", required = false, defaultValue = "0") Integer pageNo,
@RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize, @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
@RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) { @RequestParam(value = "orderbyname", required = true, defaultValue = "asc") String orderbyname) {
@ -103,6 +108,7 @@ public class OcrTaskchildDubiousFileController {
* @param request * @param request
* @return * @return
*/ */
@ApiOperation(value="可疑文件列表移除", notes="可疑文件列表移除")
@RequestMapping(value = "/dubiousfileyc", method = RequestMethod.GET) @RequestMapping(value = "/dubiousfileyc", method = RequestMethod.GET)
public ResultVo dubiousfileyc(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { public ResultVo dubiousfileyc(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) {
@ -114,28 +120,39 @@ public class OcrTaskchildDubiousFileController {
List<OcrTaskchildDubiousFile> fileList = new ArrayList<>(); List<OcrTaskchildDubiousFile> fileList = new ArrayList<>();
for (String childpictureid : cps) { for (String childpictureid : cps) {
OcrPicture ocrPicture = ocrpictureservice.selectDtoById(Long.parseLong(childpictureid)); OcrPicture ocrPicture = ocrpictureservice.selectDtoById(Long.parseLong(childpictureid));
if(ocrPicture != null){
ocrPicture.setSuspiciousfile(0); ocrPicture.setSuspiciousfile(0);
ocrPicture.setUpdateTime(System.currentTimeMillis()); ocrPicture.setUpdateTime(System.currentTimeMillis());
saveList.add(ocrPicture); saveList.add(ocrPicture);
}
QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>(); QueryWrapper<OcrTaskchildDubiousFile> dubiouswrapper = new QueryWrapper<>();
dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid); dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid);
OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper); OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper);
fileList.add(one); if(one != null){
fileList.add(one);
}
} }
//无对应图片信息
if(CollUtil.isEmpty(saveList)){
return ResultVoUtil.error("可疑文件不存在!");
}
ocrpictureservice.updateBatchById(saveList); ocrpictureservice.updateBatchById(saveList);
//根据具体情况 判断 是否需要 进行数据返回, 默认不返回数据 //根据具体情况 判断 是否需要 进行数据返回, 默认不返回数据
return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error(); return ocrTaskchildDubiousFileService.removeByIds(fileList)?ResultVoUtil.success():ResultVoUtil.error("可疑文件不存在!");
} }
/** /**
* *
* @param request * @param request
* @return * @return
*/ */
@ApiOperation(value="可疑文件列表添加", notes="可疑文件列表添加")
@RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET) @RequestMapping(value = "/dubiousfileyd", method = RequestMethod.GET)
public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) { public ResultVo dubiousfileyd(HttpServletRequest request, @RequestParam(value = "pictureid", required = true) String pictureid) {

@ -363,6 +363,10 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
@TableField(exist = false) @TableField(exist = false)
private Integer historyStates; private Integer historyStates;
@ApiModelProperty(value = "节点状态")
@TableField(exist = false)
private String taskId;
//保存当前登录用户的数据权限范围的搜索条件 //保存当前登录用户的数据权限范围的搜索条件
@TableField(exist = false) @TableField(exist = false)
@JsonIgnore @JsonIgnore

@ -450,9 +450,12 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
List<OcrCheckDuplicateResult> ocrCheckDuplicateResults = checkDuplicateResultService.selectListByCheckDuplicateNo(checkDuplicateNo, tenantId); List<OcrCheckDuplicateResult> ocrCheckDuplicateResults = checkDuplicateResultService.selectListByCheckDuplicateNo(checkDuplicateNo, tenantId);
//调用查询参数解析方法解析为queryWrapper //调用查询参数解析方法解析为queryWrapper
List<Long> picIdList = new ArrayList<>(); List<Long> picIdList = new ArrayList<>();
Map<Long,Double> picMaxScoreMap = new HashMap<>();
if(CollUtil.isNotEmpty(ocrCheckDuplicateResults)){ if(CollUtil.isNotEmpty(ocrCheckDuplicateResults)){
for (OcrCheckDuplicateResult ocrCheckDuplicateResult : ocrCheckDuplicateResults) { for (OcrCheckDuplicateResult ocrCheckDuplicateResult : ocrCheckDuplicateResults) {
picIdList.add(ocrCheckDuplicateResult.getPictureId()); picIdList.add(ocrCheckDuplicateResult.getPictureId());
picMaxScoreMap.put(ocrCheckDuplicateResult.getPictureId(),ocrCheckDuplicateResult.getMaxSimilarity());
} }
} }
if(CollUtil.isEmpty(picIdList)){ if(CollUtil.isEmpty(picIdList)){
@ -467,7 +470,17 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize); Page<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
IPage<OcrPicture> pageList = pictureService.page(page, queryWrapper); IPage<OcrPicture> pageList = pictureService.page(page, queryWrapper);
return pageList;
List<OcrPicture> records = pageList.getRecords();
records.forEach(picture ->picture.setSimilarityscore(picMaxScoreMap.get(picture.getId()).intValue()));
List<OcrPicture> collect = records.stream().sorted(Comparator.comparing(OcrPicture::getSimilarityscore).reversed()).collect(Collectors.toList());
Page<OcrPicture> pageVO = new Page<OcrPicture>(pageNo, pageSize);
pageVO.setRecords(collect);
pageVO.setTotal(records.size());
return pageVO;
} }
} }

@ -673,7 +673,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
//2.调整图片地址,补齐域名 //2.调整图片地址,补齐域名
for (OcrPicture picture : ocrPictureList) { for (OcrPicture picture : ocrPictureList) {
picture.setCreateTime(System.currentTimeMillis()); //获取创建时间戳 picture.setCreateTime(System.currentTimeMillis()); //获取创建时间戳
picture.setImgurl(interfaceDomain + picture.getImgurl()); // picture.setImgurl(interfaceDomain + picture.getImgurl());
} }
boolean saveBatch = this.saveBatch(ocrPictureList); boolean saveBatch = this.saveBatch(ocrPictureList);

@ -159,7 +159,7 @@ public class OcrSearchHistoryServiceImpl extends ServiceImpl<OcrSearchHistoryMap
Map<String, Integer> counts = new HashMap<>(); Map<String, Integer> counts = new HashMap<>();
counts.put("total", approvedCount + pendingApprovalCount + notGoCount); counts.put("total", approvedCount + pendingApprovalCount + notGoCount);
counts.put("treat", pendingApprovalCount); counts.put("treat", pendingApprovalCount);
counts.put("approvedCount", approvedCount); counts.put("approvedCount", approvedCount+notGoCount);
resultVo.setCode("OK"); resultVo.setCode("OK");
resultVo.setMessage("成功"); resultVo.setMessage("成功");
resultVo.setData(counts); resultVo.setData(counts);

@ -44,11 +44,10 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
//获取条件id下的所有条件 //获取条件id下的所有条件
List<OcrUsersearchchild> list = ocrUsersearchchildService.selectByMainId(userSearchId); List<OcrUsersearchchild> list = ocrUsersearchchildService.selectByMainId(userSearchId);
SearchConditionVO vo = new SearchConditionVO();
List<SearchConditionVO> conditionVOList = new ArrayList<>(); List<SearchConditionVO> conditionVOList = new ArrayList<>();
for (OcrUsersearchchild ocrUsersearchchild : list) { for (OcrUsersearchchild ocrUsersearchchild : list) {
SearchConditionVO vo = new SearchConditionVO();
String searchfield = ocrUsersearchchild.getSearchfield();//解析对应字段 String searchfield = ocrUsersearchchild.getSearchfield();//解析对应字段
if(SearchConfigEnum.PROJECT.getId().equals(searchfield)){ if(SearchConfigEnum.PROJECT.getId().equals(searchfield)){
@ -109,13 +108,8 @@ public class OcrUsersearchchildServiceImpl extends BaseServiceImpl<OcrUsersearch
if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){ if(SearchConfigEnum.THREEWEEKdd.getId().equals(searchfield)){
vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue()); vo.setIzYeardddd(ocrUsersearchchild.getSearchvalue());
} }
conditionVOList.add(vo);
}
if(CollUtil.isEmpty(conditionVOList)){
return new SearchConditionVO();
} }
return conditionVOList.get(0); return vo;
} }
} }

@ -45,7 +45,11 @@ public class PictureDisposeTask implements Runnable{
//定义新增集合对象 //定义新增集合对象
List<OcrPicture> ocrPictureList = new ArrayList<>(); List<OcrPicture> ocrPictureList = new ArrayList<>();
int index =0;
for (Map<String, Object> map : livePhoto) { for (Map<String, Object> map : livePhoto) {
if(index>0){
continue;
}
//检查图片地址是否为空 //检查图片地址是否为空
if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){ if(map.get("imgUrl")!=null && !StringUtils.isEmpty(map.get("imgUrl").toString())){
//判断该任务是否存在判断依据是任务ID相同提报时间不同则可以插入 //判断该任务是否存在判断依据是任务ID相同提报时间不同则可以插入
@ -113,7 +117,7 @@ public class PictureDisposeTask implements Runnable{
//所属任务名称 //所属任务名称
picture.setTaskname(pictureSourceResult.getTaskName()); picture.setTaskname(pictureSourceResult.getTaskName());
//任务来源名称 //任务来源名称
picture.setField4(pictureSourceResult.getTaskName()); picture.setField4("无量云2.0");
//所属任务状态 //所属任务状态
if(pictureSourceResult.getTenantStatus()!=null) { if(pictureSourceResult.getTenantStatus()!=null) {
picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString()); picture.setTaskstatus(pictureSourceResult.getTenantStatus().toString());
@ -182,18 +186,24 @@ public class PictureDisposeTask implements Runnable{
picture.setField9(pictureSourceResult.getProductName().get("name").toString()); picture.setField9(pictureSourceResult.getProductName().get("name").toString());
} }
} }
//厂商
if(pictureSourceResult.getManufacturer()!=null){
if(pictureSourceResult.getManufacturer().get("name")!=null){
picture.setField5(pictureSourceResult.getManufacturer().get("name").toString());
}
}
//拜访科室 //拜访科室
picture.setField7(pictureSourceResult.getCompanyDepartment()); picture.setField7(pictureSourceResult.getCompanyDepartment());
//生产基地
picture.setField5(pictureSourceResult.getManufacturer());
//拜访小结 //拜访小结
picture.setField8(pictureSourceResult.getDiscoveredIssues()); picture.setField8(pictureSourceResult.getDiscoveredIssues());
//拜访日期 //拜访日期
picture.setField11(pictureSourceResult.getVisitDate()); picture.setField11(pictureSourceResult.getVisitDate());
//提报日期时间戳 //提报日期时间戳
// picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime()); picture.setSubmitDateTimestamp(pictureSourceResult.getSubmitTime());
picture.setSubmitDateTimestamp(System.currentTimeMillis()); // picture.setSubmitDateTimestamp(System.currentTimeMillis());
picture.setPhotoDateTimestamp(System.currentTimeMillis()); picture.setPhotoDateTimestamp(System.currentTimeMillis());
System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime()); System.out.println("SubmitDateTimestamp1=================>>>>>>>"+pictureSourceResult.getSubmitTime());
@ -212,6 +222,7 @@ public class PictureDisposeTask implements Runnable{
//默认为创建人为admin //默认为创建人为admin
picture.setCreateBy("1"); picture.setCreateBy("1");
ocrPictureList.add(picture); ocrPictureList.add(picture);
index++;
} }
} }

@ -68,6 +68,7 @@
<result column="photo_date_timestamp" property="photoDateTimestamp" jdbcType="VARCHAR"/> <result column="photo_date_timestamp" property="photoDateTimestamp" jdbcType="VARCHAR"/>
<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/> <result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
<result column="STATES" property="states" jdbcType="INTEGER"/> <result column="STATES" property="states" jdbcType="INTEGER"/>
<result column="TASKID" property="taskId" jdbcType="VARCHAR"/>
<result column="historyStates" property="historyStates" jdbcType="INTEGER"/> <result column="historyStates" property="historyStates" jdbcType="INTEGER"/>
<association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo"> <association property="pictureInfo" javaType="cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo">
@ -224,7 +225,7 @@
</sql> </sql>
<select id="getPackagePictureInfo" resultMap="BaseResultMap"> <select id="getPackagePictureInfo" resultMap="BaseResultMap">
SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1) historyStates,T4.STATES SELECT t2.*,t3.*,ifnull(t5.STATSHIS, 1) historyStates,t4.STATES,t4.TASKID
FROM ocr_check_duplicate_result t1 FROM ocr_check_duplicate_result t1
LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
left join ocr_picture_info t3 on t2.ID=t3.picture_id left join ocr_picture_info t3 on t2.ID=t3.picture_id
@ -234,7 +235,7 @@
<if test="pictureId != null and pictureId != ''"> <if test="pictureId != null and pictureId != ''">
and t1.picture_id = #{pictureId} and t1.picture_id = #{pictureId}
</if> </if>
ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.create_time DESC ORDER BY t1.max_similarity desc,t1.similarity_group_order asc, t2.submit_date_timestamp DESC
LIMIT 1 LIMIT 1
</select> </select>

@ -18,7 +18,7 @@
<select id="selectsearch1" resultType="map"> <select id="selectsearch1" resultType="map">
<!-- SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"--> <!-- SELECT ID as id,packagename as name FROM ocr_packagetask WHERE create_by=#{userid} AND packagename like "%"#{search}"%"-->
SELECT id,name FROM ocr_task_package WHERE create_by=#{userid} AND name like "%"#{search}"%" AND tenant_id = #{tenantId} SELECT id,name FROM ocr_task_package WHERE create_by=#{userid} AND name like "%"#{search}"%" AND tenant_id = #{tenantId} AND is_delete = 0
</select> </select>
<select id="selectsearch2" resultType="map"> <select id="selectsearch2" resultType="map">

@ -641,7 +641,8 @@
ifnull(t3.STATSHIS, 1) historyStates, ifnull(t3.STATSHIS, 1) historyStates,
t1.submit_date_timestamp submitDateTimestamp, t1.submit_date_timestamp submitDateTimestamp,
t1.photo_date_timestamp photoDateTimestamp, t1.photo_date_timestamp photoDateTimestamp,
t1.similarity_score similarityScore t1.similarity_score similarityScore,
t1.server_thumbnail_url serverThumbnailUrl
FROM ocr_picture t1 FROM ocr_picture t1
LEFT JOIN ocr_taskchild_picture t2 LEFT JOIN ocr_taskchild_picture t2
on t1.ID = t2.PICTUREID on t1.ID = t2.PICTUREID
@ -765,7 +766,7 @@
order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType} order by t1.max_similarity ${oderType},t1.similarity_group_order asc,t2.submit_date_timestamp ${oderType}
</if> </if>
<if test="oderName == 'createdate'"> <if test="oderName == 'createdate'">
order by t2.create_time ${oderType} order by t2.submit_date_timestamp ${oderType}
</if> </if>
</select> </select>

@ -276,7 +276,7 @@ debugger_tools: true
ocr: ocr:
api: api:
wly: wly:
interface-domain: https://b-dr.prevailcloud.com #接口域名 interface-domain: https://b-test.prevailcloud.com #接口域名
accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥 accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码 accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
connectTimeout: 5000 #请求超时时间 毫秒 connectTimeout: 5000 #请求超时时间 毫秒

@ -280,7 +280,7 @@ debugger_tools: true
ocr: ocr:
api: api:
wly: wly:
interface-domain: https://b-dr.prevailcloud.com #接口域名 interface-domain: https://b-test.prevailcloud.com #接口域名
accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥 accessKey: 7390F0221A1A73D8E13F8C8BB96F33B0 #秘钥
accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码 accessCode: ED6F7B39768AF95E87AEA8ACCCC71A6F #秘钥编码
connectTimeout: 5000 #请求超时时间 毫秒 connectTimeout: 5000 #请求超时时间 毫秒

Loading…
Cancel
Save