guzijian / bsth-alcohol-sign · Commits

Commit 8b603b1153bb1f07636fe3414a4f484f35736215

Authored by guzijian
1 parent 7659392e

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

Inline Side-by-side
Showing 5 changed files with 33 additions and 17 deletions
ruoyi-admin/src/main/java/com/ruoyi/pojo/converter/AlcoholFlagConverter.java
  View file @8b603b1
... ... @@ -33,7 +33,7 @@ public class AlcoholFlagConverter implements Converter<Integer> {
33 33 public CellData convertToExcelData(Integer integer, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
34 34 String str = "";
35 35 if (ALCOHOL_FLAG_YES.equals(integer)){
36   - str = ALCOHOL_FLAG_NO_STRING;
  36 + str = ALCOHOL_FLAG_YES_STRING;
37 37 }
38 38 if (ALCOHOL_FLAG_NO.equals(integer)){
39 39 str = ALCOHOL_FLAG_NO_STRING;
... ...
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ReportViewResponseVo.java
  View file @8b603b1
... ... @@ -25,8 +25,6 @@ import java.util.Date;
25 25 */
26 26 @ApiModel("滚动大屏响应体数据")
27 27 @Data
28   -@ContentRowHeight(100)
29   -@ColumnWidth(100 / 8)
30 28 public class ReportViewResponseVo {
31 29 @ApiModelProperty("id")
32 30 @ExcelIgnore
... ... @@ -37,6 +35,7 @@ public class ReportViewResponseVo {
37 35 private String jobCode;
38 36  
39 37 @ExcelProperty(value = "签到类型", converter = SignInTypeConverter.class)
  38 + @ColumnWidth(10)
40 39 @ApiModelProperty("签到类型")
41 40 private String singnIn;
42 41  
... ... @@ -45,12 +44,14 @@ public class ReportViewResponseVo {
45 44 private String name;
46 45  
47 46 @ExcelProperty(value = "签到时间")
  47 + @ColumnWidth(27)
48 48 @ApiModelProperty("签到时间")
49 49 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
50 50 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
51 51 private Date createTime;
52 52  
53 53 @ExcelProperty(value = "签到状态", converter = SignInStatusConverter.class)
  54 + @ColumnWidth(10)
54 55 @ApiModelProperty("签到状态1 成功2 异常")
55 56 private Integer status;
56 57 /**
... ... @@ -58,30 +59,47 @@ public class ReportViewResponseVo {
58 59 */
59 60 @ApiModelProperty("签到签退")
60 61 @ExcelProperty(value = "签到签退", converter = SignInConvert.class)
  62 + @ColumnWidth(10)
61 63 private Integer type;
62 64 /**
63 65 * 是否酒精检测 1 检查 2 未检
64 66 */
65   - @ApiModelProperty("是否酒精检测 1 检查 2 未检")
66 67 @ExcelProperty(value = "酒精检测", converter = AlcoholFlagConverter.class)
  68 + @ColumnWidth(10)
  69 + @ApiModelProperty("是否酒精检测 1 检查 2 未检")
67 70 private Integer alcoholFlag;
68 71 /**
69 72 * 酒精含量
70 73 */
71 74 @ExcelProperty(value = "酒精含量")
  75 + @ColumnWidth(10)
72 76 @ApiModelProperty("酒精含量")
73 77 private BigDecimal alcoholIntake;
74 78  
75 79 @ExcelProperty(value = "头像",converter = ImageConverter.class)
76 80 @ApiModelProperty("头像")
77 81 private String image;
  82 + @ExcelProperty(value = "工种")
  83 + @ApiModelProperty("工种")
  84 + private String posts;
78 85  
79   -// private URL url;
  86 + /**
  87 + * 签到地址
  88 + */
  89 + @ExcelProperty("签到地址")
  90 + @ColumnWidth(10)
  91 + @ApiModelProperty("签到地址")
  92 + String address;
  93 +
  94 + /**
  95 + * 设备id
  96 + */
  97 + @ApiModelProperty("设备号")
  98 + @ExcelProperty("设备号")
  99 + String deviceId;
80 100  
81 101 @ExcelProperty(value = "备注")
  102 + @ColumnWidth(40)
82 103 @ApiModelProperty("备注")
83 104 private String remark;
84   - @ExcelProperty(value = "工种")
85   - @ApiModelProperty("工种")
86   - private String posts;
87 105 }
... ...
ruoyi-admin/src/main/resources/application-druid-prd.yml
  View file @8b603b1
... ... @@ -118,13 +118,7 @@ ruoyi:
118 118 # 验证码类型 math 数字计算 char 字符验证
119 119 captchaType: math
120 120 # 开发环境配置
121   - #SSL Key Info
122   -security:
123   - require-ssl: true
124 121 server:
125   - ssl:
126   - key-store-password: guzijian
127   - key-store: ruoyi-admin/src/main/resources/keystore.jks
128 122 # 服务器的HTTP端口，默认为8080
129 123 port: 8080
130 124 servlet:
... ...
ruoyi-admin/src/main/resources/keystore.jks deleted 100644 → 0
View file @7659392
No preview for this file type
ruoyi-admin/src/main/resources/mapper/in/SignInMapper.xml
  View file @8b603b1
... ... @@ -67,20 +67,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
67 67 sign_in.id,
68 68 sign_in.singn_in singnIn,
69 69 driver.job_code jobCode,
  70 + sign_in.device_id deviceId,
70 71 personnel_name `name`,
71 72 sign_in.create_time createTime,
72   - `status`,
  73 + sign_in.`status`,
73 74 type,
74 75 alcohol_flag alcoholFlag,
75 76 alcohol_intake alcoholIntake,
76 77 sign_in.image,
77 78 sign_in.remark,
78   - driver.posts
  79 + driver.posts,
  80 + equipment.address
79 81 FROM
  82 + equipment,
80 83 sign_in,
81 84 driver
82 85 WHERE
83   - sign_in.jobCode = driver.job_code
  86 + sign_in.jobCode = driver.job_code and
  87 + sign_in.device_id = equipment.device_id
84 88 <if test="jobCode != '' and jobCode != null">
85 89 and sign_in.jobCode = #{jobCode}
86 90 </if>
... ...