fix: 更新接口配置，删除ssl证书

guzijian
1 parent 7659392e
Showing 5 changed files with 33 additions and 17 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/AlcoholFlagConverter.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/keystore.jks
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
@@ -33,7 +33,7 @@ public class AlcoholFlagConverter implements Converter&lt;Integer&gt; {
     public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         String str = "";
         if (ALCOHOL_FLAG_YES.equals(integer)){
-            str = ALCOHOL_FLAG_NO_STRING;
+            str = ALCOHOL_FLAG_YES_STRING;
         }
         if (ALCOHOL_FLAG_NO.equals(integer)){
             str = ALCOHOL_FLAG_NO_STRING;
@@ -25,8 +25,6 @@ import java.util.Date;
  */
 @ApiModel("滚动大屏响应体数据")
 @Data
-@ContentRowHeight(100)
-@ColumnWidth(100 / 8)
 public class ReportViewResponseVo {
     @ApiModelProperty("id")
     @ExcelIgnore
@@ -37,6 +35,7 @@ public class ReportViewResponseVo {
     private String jobCode;
     @ExcelProperty(value = "签到类型", converter = SignInTypeConverter.class)
+    @ColumnWidth(10)
     @ApiModelProperty("签到类型")
     private String singnIn;
@@ -45,12 +44,14 @@ public class ReportViewResponseVo {
     private String name;
     @ExcelProperty(value = "签到时间")
+    @ColumnWidth(27)
     @ApiModelProperty("签到时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     @ExcelProperty(value = "签到状态", converter = SignInStatusConverter.class)
+    @ColumnWidth(10)
     @ApiModelProperty("签到状态1 成功2 异常")
     private Integer status;
     /**
@@ -58,30 +59,47 @@ public class ReportViewResponseVo {
      */
     @ApiModelProperty("签到签退")
     @ExcelProperty(value = "签到签退", converter = SignInConvert.class)
+    @ColumnWidth(10)
     private Integer type;
     /**
      * 是否酒精检测 1 检查 2 未检
      */
-    @ApiModelProperty("是否酒精检测 1 检查 2 未检")
     @ExcelProperty(value = "酒精检测", converter = AlcoholFlagConverter.class)
+    @ColumnWidth(10)
+    @ApiModelProperty("是否酒精检测 1 检查 2 未检")
     private Integer alcoholFlag;
     /**
      * 酒精含量
      */
     @ExcelProperty(value = "酒精含量")
+    @ColumnWidth(10)
     @ApiModelProperty("酒精含量")
     private BigDecimal alcoholIntake;
     @ExcelProperty(value = "头像",converter = ImageConverter.class)
     @ApiModelProperty("头像")
     private String image;
+    @ExcelProperty(value = "工种")
+    @ApiModelProperty("工种")
+    private String posts;
-//    private URL url;
+    /**
+     * 签到地址
+     */
+    @ExcelProperty("签到地址")
+    @ColumnWidth(10)
+    @ApiModelProperty("签到地址")
+    String address;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty("设备号")
+    @ExcelProperty("设备号")
+    String deviceId;
     @ExcelProperty(value = "备注")
+    @ColumnWidth(40)
     @ApiModelProperty("备注")
     private String remark;
-    @ExcelProperty(value = "工种")
-    @ApiModelProperty("工种")
-    private String posts;
 }
@@ -118,13 +118,7 @@ ruoyi:
     # 验证码类型 math 数字计算 char 字符验证
     captchaType: math
 # 开发环境配置
-    #SSL Key Info
-security:
-    require-ssl: true
 server:
-    ssl:
-        key-store-password: guzijian
-        key-store: ruoyi-admin/src/main/resources/keystore.jks
     # 服务器的HTTP端口，默认为8080
     port: 8080
     servlet:
@@ -67,20 +67,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         sign_in.id,
         sign_in.singn_in singnIn,
         driver.job_code jobCode,
+        sign_in.device_id deviceId,
         personnel_name `name`,
         sign_in.create_time createTime,
-        `status`,
+        sign_in.`status`,
         type,
         alcohol_flag alcoholFlag,
         alcohol_intake alcoholIntake,
         sign_in.image,
         sign_in.remark,
-        driver.posts
+        driver.posts,
+        equipment.address
         FROM
+        equipment,
         sign_in,
         driver
         WHERE
-        sign_in.jobCode = driver.job_code
+        sign_in.jobCode = driver.job_code and
+        sign_in.device_id = equipment.device_id
         <if test="jobCode != '' and jobCode != null">
           and  sign_in.jobCode = #{jobCode}
         </if>