diff --git a/htmlweb/web/backstage/oa/ocr/picturelog/list.html b/htmlweb/web/backstage/oa/ocr/picturelog/list.html new file mode 100644 index 0000000..347f4d6 --- /dev/null +++ b/htmlweb/web/backstage/oa/ocr/picturelog/list.html @@ -0,0 +1,138 @@ +<#include "/common/taglibs.html" /> + + + + + 查重模型日志 + + + +<#include "/head/headlist.html" /> + + +
+
+
+
+
+ +
+ +
+ +
+  搜索 +  重置 +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<#include "/head/footlist.html" /> + + + + diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogController.java new file mode 100644 index 0000000..6d29bdd --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogController.java @@ -0,0 +1,69 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +import cn.jyjz.xiaoyao.admin.service.UserService; +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.mybatisplus.util.SearchQueryFormat; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrField; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureLogService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("/ocr/picturelog") +public class OcrPictureLogController extends BaseController { + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private OcrPictureLogService ocrPictureLogService; + + @Autowired + private UserService userService; + + /** + * 自定义筛选字段列表查询 + * @return + */ + @ApiOperation(value="根据评审类型查询字段列表", notes="根据评审类型查询字段列表") + @GetMapping(value = "/page") + public ResultVo> list(@RequestParam(name="start", defaultValue="1") Integer start, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="callStatus", defaultValue="1") Integer callStatus, + // @RequestParam(name="callTimeStart") String callTimeStart, + // @RequestParam(name="callTimeEnd") String callTimeEnd, + HttpServletRequest request) { + + //SearchQuery searchQuery = this.getParametersStartingWithToSearchJson(request, "search_"); + + //cn.jyjz.xiaoyao.admin.dataobject.User user = this.userService.getSessionUser(request); + //OcrPictureLog ocrPictureLog = new OcrPictureLog(); + //ocrPictureLog.setSearchQueryrolesShowleave(user.getSearchQueryrolesShowleave()); + //QueryWrapper queryWrapper = SearchQueryFormat.queryStringFormat(searchQuery,ocrPictureLog); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("call_status",callStatus); + //queryWrapper.le("call_time",callTimeStart); + //queryWrapper.ne("call_time",callTimeEnd); + ResultVo> resultVo = new ResultVo<>(); + ParamterPage paramterPage = new ParamterPage(); + paramterPage.setPagesize(pageSize); + paramterPage.setStart(start); + IPage ocrPictureLogIPage = ocrPictureLogService.selectSearchListPage(paramterPage, queryWrapper); + resultVo.setData(ocrPictureLogIPage); + resultVo.addOK("查询成功"); + return resultVo; + } + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogHtmlController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogHtmlController.java new file mode 100644 index 0000000..b16d54e --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogHtmlController.java @@ -0,0 +1,37 @@ +package cn.jyjz.xiaoyao.ocr.controller; + +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.ocr.service.OcrConfigurationService; +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.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@Controller +@RequestMapping("/backstage/oa/picturelogHtml") +public class OcrPictureLogHtmlController extends BaseController{ + + private Logger log = LoggerFactory.getLogger(this.getClass()); + + + /** + *方法描述：跳转到列表页面 + *创建人：mail.zhangyong@gmail.com + *创建时间：2024-01-14 10:27:01 + **/ + @GetMapping("/toList") + public String toListOcrConfiguration(HttpServletResponse response,HttpServletRequest request){ + String resourceid = request.getParameter("resourceid"); + request.setAttribute("resourceid",resourceid); + return "/backstage/oa/ocr/picturelog/list"; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureLogMapper.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureLogMapper.java new file mode 100644 index 0000000..9bdd19a --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictureLogMapper.java @@ -0,0 +1,14 @@ +package cn.jyjz.xiaoyao.ocr.dataDao; + +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/3/22 07:09 + */ +public interface OcrPictureLogMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureLog.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureLog.java new file mode 100644 index 0000000..54bd8bb --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictureLog.java @@ -0,0 +1,93 @@ +package cn.jyjz.xiaoyao.ocr.dataobject; + +import cn.jyjz.xiaoyao.common.base.util.requestFormat.SearchQuery; +import cn.jyjz.xiaoyao.common.mybatisplus.dto.BaseDto; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.sql.Date; +import java.util.AbstractMap; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "字段信息", title = "字段信息") +@TableName(value = "ocr_picture_log") +public class OcrPictureLog implements BaseDto, Serializable { + private static final long serialVersionUID = 8088861709460050761L; + @Schema(description = "主键") + @TableId(value = "id",type = IdType.AUTO) + @TableField(value="id") + private Long id; + + @Schema(description = "调用时间") + @TableField(value="call_time") + private String callTime; + + @Schema(description = "图片地址") + @TableField(value="picture_url") + private String pictureUrl; + + @Schema(description = "调用状态") + @TableField(value="call_status") + private String callStatus; + + @Schema(description = "调用信息") + @TableField(value="call_msg") + private String callMsg; + + @Schema(description = "创建人") + @TableField(value="create_by") + private String createBy; + + @Schema(description = "创建时间") + @TableField(value="create_time") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @Schema(description = "修改人") + @TableField(value="update_by") + private String updateBy; + + @Schema(description = "修改时间") + @TableField(value="update_time") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + + //保存当前登录用户的数据权限范围的搜索条件 + @TableField(exist = false) + @JsonIgnore + private SearchQuery searchQueryrolesShowleave; + + @TableField(exist = false) + @JsonIgnore + private final Map query = Stream.of( + new AbstractMap.SimpleEntry<>("CALLTIME","call_time"), + new AbstractMap.SimpleEntry<>("REVIEWTYPE","call_status") + ) + .collect(Collectors.toMap(AbstractMap.SimpleEntry::getKey, AbstractMap.SimpleEntry::getValue)); + @Override + public String getQueryFiled(String filedname){ + String obj = null; + if(null != query && query.size() > 0){ + obj = query.get(filedname); + } + return obj; + } + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureLogService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureLogService.java new file mode 100644 index 0000000..b7c6dc1 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrPictureLogService.java @@ -0,0 +1,17 @@ +package cn.jyjz.xiaoyao.ocr.service; + +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureInfo; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* ClassName： $className$.java +* Description: +* Author： scl. +* Date： 2024/3/22 07:09 +*/ +public interface OcrPictureLogService extends BaseService { + + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureLogServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureLogServiceImpl.java new file mode 100644 index 0000000..d0aaf00 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureLogServiceImpl.java @@ -0,0 +1,19 @@ +package cn.jyjz.xiaoyao.ocr.service.impl; + +import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; +import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictureLogMapper; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureLogService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * ClassName： $className$.java + * Description: + * Author： scl. + * Date： 2024/3/22 07:09 + */ +@Service +public class OcrPictureLogServiceImpl extends BaseServiceImpl implements OcrPictureLogService { + +} diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java index 9cc1346..35e9183 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/ImageClassUtil.java @@ -1,5 +1,10 @@ package cn.jyjz.xiaoyao.ocr.util; +import cn.hutool.core.date.DateUtil; +import cn.hutool.extra.spring.SpringUtil; +import cn.hutool.json.JSONUtil; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictureLog; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureLogService; import cn.jyjz.xiaoyao.ocr.util.httputil.HttpClient; import cn.jyjz.xiaoyao.ocr.util.httputil.HttpHeader; import cn.jyjz.xiaoyao.ocr.util.httputil.HttpParamers; @@ -10,6 +15,10 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; + +import java.util.HashMap; +import java.util.Map; public class ImageClassUtil { private static Logger logger = LoggerFactory.getLogger(ImageClassUtil.class); @@ -80,14 +89,33 @@ public class ImageClassUtil { paramersVi.setJsonParamer(jsonObjectVi.toJSONString()); HttpHeader headerVi = null; String responseDataVi = ""; + OcrPictureLog ocrPictureLog = new OcrPictureLog(); try { responseDataVi = HttpClient.doService(serverurl, paramersVi, headerVi, 15000, 30000); + JSONObject jsonObjectSimi = JSON.parseObject(responseDataVi); + if (null != jsonObjectSimi && jsonObjectSimi.getString("code").equals("0") && jsonObjectSimi.get("data") != null && jsonObjectSimi.getJSONArray("data").size() > 0) { + JSONObject data = jsonObjectSimi.getJSONArray("data").getJSONObject(0); + Map map = new HashMap(); + map.put("classId", data.getString("classId")); + map.put("hash", data.getString("hash")); + ocrPictureLog.setCallStatus("1"); + ocrPictureLog.setPictureUrl(imgurl); + } else { + ocrPictureLog.setCallStatus("2"); + ocrPictureLog.setCallMsg(responseDataVi); + } } catch (Exception e) { - logger.error("classify={}",e); - return null; + logger.error("classify={}", e); + ocrPictureLog.setCallStatus("3"); + ocrPictureLog.setCallMsg(e.getMessage()); + } finally { + ApplicationContext applicationContext = SpringUtil.getApplicationContext(); + OcrPictureLogService ocrPictureLogService = applicationContext.getBean(OcrPictureLogService.class); + ocrPictureLog.setCallTime(DateUtil.now()); + ocrPictureLogService.save(ocrPictureLog); } - JSONObject jsonObject = JSON.parseObject(responseDataVi); return jsonObject; } + } diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureLogMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureLogMapper.xml new file mode 100644 index 0000000..1b34b59 --- /dev/null +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureLogMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + +