【CHG】修改生成图片的字体

railway-business/src/main/java/com/railway/business/safetool/domain/vo/SecExpInfoVo.java

@@ -10,54 +10,58 @@ import lombok.Data;
 
 /**
  * 送检记录详情
+ *
  * @author lijie 2021-12-04
  */
 @Data
 @ApiModel("送检记录详情")
 public class SecExpInfoVo implements Serializable {
 
-    @ApiModelProperty(value = "主键", hidden = true)
-    private Long id;
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
 
-    @ApiModelProperty(value = "车间")
-    private Long deptId;
+  @ApiModelProperty(value = "车间")
+  private Long deptId;
 
-    @ApiModelProperty(value = "车间名称")
-    private String deptName;
+  @ApiModelProperty(value = "车间名称")
+  private String deptName;
 
-    @ApiModelProperty(value = "实验室id 部门表类型为实验室")
-    private Long labId;
+  @ApiModelProperty(value = "实验室id 部门表类型为实验室")
+  private Long labId;
 
-    @ApiModelProperty(value = "实验室Name 部门表类型为实验室")
-    private String labName;
+  @ApiModelProperty(value = "实验室Name 部门表类型为实验室")
+  private String labName;
 
-    @ApiModelProperty(value = "送检计划id")
-    private Long scheduledId;
+  @ApiModelProperty(value = "送检计划id")
+  private Long scheduledId;
 
-    @ApiModelProperty(value = "截止时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
+  @ApiModelProperty(value = "截止时间")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date endTime;
 
-    @ApiModelProperty(value = "实验日期")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expDate;
+  @ApiModelProperty(value = "实验日期")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private Date expDate;
 
-    @ApiModelProperty(value = "状态，0待实验，1已实验")
-    private String state;
+  @ApiModelProperty(value = "检测报告文件路径")
+  private String expReport;
 
-    @ApiModelProperty(value = "送检人")
-    private String sjrId;
+  @ApiModelProperty(value = "状态，0待实验，1已实验")
+  private String state;
 
-    @ApiModelProperty(value = "送检人")
-    private String sjName;
+  @ApiModelProperty(value = "送检人")
+  private String sjrId;
 
-    @ApiModelProperty(value = "实验人")
-    private String syrId;
+  @ApiModelProperty(value = "送检人")
+  private String sjName;
 
-    @ApiModelProperty(value = "实验人")
-    private String syName;
+  @ApiModelProperty(value = "实验人")
+  private String syrId;
 
-    @ApiModelProperty(value = "分组数据")
-    private List<SecExpToolsVo> baseSafetyTools;
+  @ApiModelProperty(value = "实验人")
+  private String syName;
+
+  @ApiModelProperty(value = "分组数据")
+  private List<SecExpToolsVo> baseSafetyTools;
 
 }

railway-business/src/main/resources/mapper/safetool/SecExperimentMapper.xml

@@ -90,10 +90,11 @@
     <result column="scheduled_id" property="scheduledId"/>
     <result column="deptName" property="deptName"/>
     <result column="labName" property="labName"/>
+    <result column="exp_report" property="expReport"/>
   </resultMap>
 
   <select id="getInfo" resultMap="InfoResultMap">
-    select e.id,e.state,e.scheduled_time,e.end_time,e.exp_date,e.dept_name,e.lab_name,
+    select e.id,e.state,e.scheduled_time,e.end_time,e.exp_date,e.dept_name,e.lab_name,e.exp_report,
     u.real_name as sj_name, u1.real_name as sy_name, u.user_id as sjr_id, u1.user_id as syr_id
     from sec_experiment e
     left join sys_user u on e.create_by = u.user_name

railway-common/src/main/java/com/railway/common/utils/FontsUtil.java

@@ -0,0 +1,36 @@
+package com.railway.common.utils;
+
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.IOException;
+import java.io.InputStream;
+import lombok.extern.slf4j.Slf4j;
+
+
+/**
+ * @author ZhaoMn
+ */
+@Slf4j
+public class FontsUtil {
+
+  /**
+   * 宋体
+   */
+  public static Font getSimsun(int style, float size) {
+    Font font = null;
+    //获取字体流
+    InputStream simsunFontFile = FontsUtil.class.getResourceAsStream("/fonts/SIMSUN.TTC");
+    try {
+      //创建字体
+      assert simsunFontFile != null;
+      font = Font.createFont(Font.PLAIN, simsunFontFile).deriveFont(style, size);
+    } catch (FontFormatException e) {
+      log.error("", e);
+    } catch (IOException e) {
+      font = new Font("宋体", Font.BOLD, 6);
+      log.error("", e);
+    }
+    return font;
+  }
+
+}

railway-common/src/main/java/com/railway/common/utils/QrCodeUtil.java

@@ -139,7 +139,8 @@ public class QrCodeUtil {
     g2.clearRect(0, 0, QRCODE_SIZE, FONT_HEIGHT);
     g2.setPaint(Color.BLACK);
     FontRenderContext context = g2.getFontRenderContext();
-    Font font = new Font("宋体", Font.BOLD, FONT_SIZE);
+    // Font font = new Font("宋体", Font.BOLD, FONT_SIZE)
+    Font font = FontsUtil.getSimsun(Font.BOLD, FONT_SIZE);
     g2.setFont(font);
     LineMetrics lineMetrics = font.getLineMetrics(str, context);
     FontMetrics fontMetrics = FontDesignMetrics.getMetrics(font);