fix: 完善任务详情信息

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

@@ -1,9 +1,12 @@
 package cn.jyjz.xiaoyao.ocr.dataobject;
 
+import cn.jyjz.xiaoyao.common.base.jsonDomain.DateNotimeSerializer;
 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.databind.annotation.JsonSerialize;
+import lombok.Data;
 
 /**
  * ClassName： $className$.java
@@ -12,6 +15,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * Date： 2024/3/22 07:09
  */
 @TableName(value = "ocr_picture_info")
+@Data
 public class OcrPictureInfo {
     /**
      * 主键
@@ -47,12 +51,14 @@ public class OcrPictureInfo {
      * 上传时间
      */
     @TableField(value = "upload_time")
+    @JsonSerialize(using = DateNotimeSerializer.class)
     private Long uploadTime;
 
     /**
      * 创建时间
      */
     @TableField(value = "create_time")
+    @JsonSerialize(using = DateNotimeSerializer.class)
     private Long createTime;
 
     /**
@@ -65,6 +71,7 @@ public class OcrPictureInfo {
      * 标记时间
      */
     @TableField(value = "tag_time")
+    @JsonSerialize(using = DateNotimeSerializer.class)
     private Long tagTime;
 
     /**
@@ -73,183 +80,4 @@ public class OcrPictureInfo {
     @TableField(value = "`source`")
     private String source;
 
-    /**
-     * 获取主键
-     *
-     * @return id - 主键
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * 设置主键
-     *
-     * @param id 主键
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取原图片主键
-     *
-     * @return picture_id - 原图片主键
-     */
-    public Long getPictureId() {
-        return pictureId;
-    }
-
-    /**
-     * 设置原图片主键
-     *
-     * @param pictureId 原图片主键
-     */
-    public void setPictureId(Long pictureId) {
-        this.pictureId = pictureId;
-    }
-
-    /**
-     * 获取图片大小
-     *
-     * @return img_size - 图片大小
-     */
-    public String getImgSize() {
-        return imgSize;
-    }
-
-    /**
-     * 设置图片大小
-     *
-     * @param imgSize 图片大小
-     */
-    public void setImgSize(String imgSize) {
-        this.imgSize = imgSize;
-    }
-
-    /**
-     * 获取图片格式
-     *
-     * @return img_format - 图片格式
-     */
-    public String getImgFormat() {
-        return imgFormat;
-    }
-
-    /**
-     * 设置图片格式
-     *
-     * @param imgFormat 图片格式
-     */
-    public void setImgFormat(String imgFormat) {
-        this.imgFormat = imgFormat;
-    }
-
-    /**
-     * 获取图片尺寸
-     *
-     * @return img_measure - 图片尺寸
-     */
-    public String getImgMeasure() {
-        return imgMeasure;
-    }
-
-    /**
-     * 设置图片尺寸
-     *
-     * @param imgMeasure 图片尺寸
-     */
-    public void setImgMeasure(String imgMeasure) {
-        this.imgMeasure = imgMeasure;
-    }
-
-    /**
-     * 获取上传时间
-     *
-     * @return upload_time - 上传时间
-     */
-    public Long getUploadTime() {
-        return uploadTime;
-    }
-
-    /**
-     * 设置上传时间
-     *
-     * @param uploadTime 上传时间
-     */
-    public void setUploadTime(Long uploadTime) {
-        this.uploadTime = uploadTime;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取图片色彩空间
-     *
-     * @return img_space - 图片色彩空间
-     */
-    public String getImgSpace() {
-        return imgSpace;
-    }
-
-    /**
-     * 设置图片色彩空间
-     *
-     * @param imgSpace 图片色彩空间
-     */
-    public void setImgSpace(String imgSpace) {
-        this.imgSpace = imgSpace;
-    }
-
-    /**
-     * 获取标记时间
-     *
-     * @return tag_time - 标记时间
-     */
-    public Long getTagTime() {
-        return tagTime;
-    }
-
-    /**
-     * 设置标记时间
-     *
-     * @param tagTime 标记时间
-     */
-    public void setTagTime(Long tagTime) {
-        this.tagTime = tagTime;
-    }
-
-    /**
-     * 获取图片来源
-     *
-     * @return source - 图片来源
-     */
-    public String getSource() {
-        return source;
-    }
-
-    /**
-     * 设置图片来源
-     *
-     * @param source 图片来源
-     */
-    public void setSource(String source) {
-        this.source = source;
-    }
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictureServiceImpl.java

@@ -665,15 +665,14 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
                         break;
                 }
                 String formatName = ImageIO.getImageReadersByMIMEType("image/jpeg").next().getFormatName();
-
-                System.out.println("Image Size: " + imageSize + " bytes");
-                System.out.println("Width: " + width + ", Height: " + height);
-                System.out.println("Color Space: " + colorSpaceType);
                 info.setCreateTime(System.currentTimeMillis());
+                info.setUploadTime(System.currentTimeMillis());
+                info.setTagTime(System.currentTimeMillis());
                 info.setImgSpace(colorSpaceType);
                 info.setImgSize(imageSize.toString());
                 info.setImgMeasure(width + "x" + height);
                 info.setImgFormat(formatName);
+                info.setSource("无量云2.0");
                 return info;
             } else {
                 log.info("Cannot read image from URL.");