Commit fdb152accb6e4abb84768c1cdebe3d6d3a1f150c

Authored by liujun001
1 parent 7e0b9ec4

系统关键点添加日志

Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
1 package com.ruoyi.domain; 1 package com.ruoyi.domain;
2 2
  3 +import com.alibaba.fastjson2.JSON;
3 import lombok.Data; 4 import lombok.Data;
4 import org.apache.poi.hpsf.Decimal; 5 import org.apache.poi.hpsf.Decimal;
5 6
@@ -31,4 +32,9 @@ public class DriverScheduling { @@ -31,4 +32,9 @@ public class DriverScheduling {
31 * 不是当前表的属性 32 * 不是当前表的属性
32 */ 33 */
33 private String fleetName; 34 private String fleetName;
  35 +
  36 + @Override
  37 + public String toString() {
  38 + return JSON.toJSONString(this);
  39 + }
34 } 40 }
Bsth-admin/src/main/java/com/ruoyi/domain/RuleSettingDriver.java
1 package com.ruoyi.domain; 1 package com.ruoyi.domain;
2 2
3 3
  4 +import com.alibaba.fastjson2.JSON;
4 import com.baomidou.mybatisplus.annotation.IdType; 5 import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableField; 6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
@@ -47,4 +48,10 @@ public class RuleSettingDriver implements Serializable { @@ -47,4 +48,10 @@ public class RuleSettingDriver implements Serializable {
47 48
48 @TableField(exist = false) 49 @TableField(exist = false)
49 private static final long serialVersionUID = 1L; 50 private static final long serialVersionUID = 1L;
  51 +
  52 +
  53 + @Override
  54 + public String toString() {
  55 + return JSON.toJSONString(this);
  56 + }
50 } 57 }
51 \ No newline at end of file 58 \ No newline at end of file
Bsth-admin/src/main/java/com/ruoyi/domain/RuleSettingScheduling.java
1 package com.ruoyi.domain; 1 package com.ruoyi.domain;
2 2
3 3
  4 +import com.alibaba.fastjson2.JSON;
4 import com.baomidou.mybatisplus.annotation.IdType; 5 import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableField; 6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
@@ -51,4 +52,9 @@ public class RuleSettingScheduling implements Serializable { @@ -51,4 +52,9 @@ public class RuleSettingScheduling implements Serializable {
51 52
52 @TableField(exist = false) 53 @TableField(exist = false)
53 private static final long serialVersionUID = 1L; 54 private static final long serialVersionUID = 1L;
  55 +
  56 + @Override
  57 + public String toString() {
  58 + return JSON.toJSONString(this);
  59 + }
54 } 60 }
55 \ No newline at end of file 61 \ No newline at end of file
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
@@ -3,6 +3,7 @@ package com.ruoyi.in.domain; @@ -3,6 +3,7 @@ package com.ruoyi.in.domain;
3 import java.io.UnsupportedEncodingException; 3 import java.io.UnsupportedEncodingException;
4 import java.math.BigDecimal; 4 import java.math.BigDecimal;
5 5
  6 +import com.alibaba.fastjson2.JSON;
6 import io.swagger.annotations.ApiModel; 7 import io.swagger.annotations.ApiModel;
7 import io.swagger.annotations.ApiModelProperty; 8 import io.swagger.annotations.ApiModelProperty;
8 import lombok.Data; 9 import lombok.Data;
@@ -98,5 +99,10 @@ public class SignIn extends BaseEntity { @@ -98,5 +99,10 @@ public class SignIn extends BaseEntity {
98 @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常") 99 @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常")
99 @ApiModelProperty("异常类型") 100 @ApiModelProperty("异常类型")
100 private Integer exType; 101 private Integer exType;
  102 +
  103 + @Override
  104 + public String toString() {
  105 + return JSON.toJSONString(this);
  106 + }
101 } 107 }
102 108
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -170,6 +170,8 @@ public class SignInServiceImpl implements ISignInService { @@ -170,6 +170,8 @@ public class SignInServiceImpl implements ISignInService {
170 List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now); 170 List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
171 handleSignBody(signIn, driver, globalIndex, now, dto); 171 handleSignBody(signIn, driver, globalIndex, now, dto);
172 172
  173 + log.info("签到签退数据为:[{}]",dto.get(globalIndex.getIndex()));
  174 +
173 if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) { 175 if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
174 AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo); 176 AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
175 if (!Objects.isNull(result)) { 177 if (!Objects.isNull(result)) {
Bsth-admin/src/main/java/com/ruoyi/pojo/GlobalIndex.java
1 package com.ruoyi.pojo; 1 package com.ruoyi.pojo;
2 2
  3 +import com.alibaba.fastjson2.JSON;
3 import lombok.Data; 4 import lombok.Data;
4 5
5 /** 6 /**
@@ -9,4 +10,9 @@ import lombok.Data; @@ -9,4 +10,9 @@ import lombok.Data;
9 public class GlobalIndex { 10 public class GlobalIndex {
10 private Integer index; 11 private Integer index;
11 public GlobalIndex(){this.index = 0;} 12 public GlobalIndex(){this.index = 0;}
  13 +
  14 + @Override
  15 + public String toString() {
  16 + return JSON.toJSONString(this);
  17 + }
12 } 18 }
Bsth-admin/src/main/java/com/ruoyi/pojo/request/HeartPackageVo.java
1 package com.ruoyi.pojo.request; 1 package com.ruoyi.pojo.request;
2 2
  3 +import com.alibaba.fastjson2.JSON;
3 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data; 6 import lombok.Data;
@@ -19,4 +20,9 @@ public class HeartPackageVo { @@ -19,4 +20,9 @@ public class HeartPackageVo {
19 @ApiModelProperty("版本号") 20 @ApiModelProperty("版本号")
20 @NotBlank(message = "版本号不能为空") 21 @NotBlank(message = "版本号不能为空")
21 private String versionNum; 22 private String versionNum;
  23 +
  24 + @Override
  25 + public String toString() {
  26 + return JSON.toJSONString(this);
  27 + }
22 } 28 }
Bsth-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
1 package com.ruoyi.pojo.response; 1 package com.ruoyi.pojo.response;
  2 +
2 import java.math.BigDecimal; 3 import java.math.BigDecimal;
3 import java.util.Date; 4 import java.util.Date;
  5 +
  6 +import com.alibaba.fastjson2.JSON;
4 import com.google.common.collect.Maps; 7 import com.google.common.collect.Maps;
5 8
6 import com.alibaba.excel.annotation.ExcelIgnore; 9 import com.alibaba.excel.annotation.ExcelIgnore;
@@ -11,6 +14,7 @@ import lombok.Data; @@ -11,6 +14,7 @@ import lombok.Data;
11 14
12 /** 15 /**
13 * 签到vo 16 * 签到vo
  17 + *
14 * @author 20412 18 * @author 20412
15 */ 19 */
16 @Data 20 @Data
@@ -19,18 +23,18 @@ public class SignInResponseVo extends SignIn { @@ -19,18 +23,18 @@ public class SignInResponseVo extends SignIn {
19 String address; 23 String address;
20 @Excel(name = "姓名") 24 @Excel(name = "姓名")
21 String name; 25 String name;
22 - @Excel( name = "工种") 26 + @Excel(name = "工种")
23 String posts; 27 String posts;
24 - @Excel( name = "场地名称") 28 + @Excel(name = "场地名称")
25 String siteName; 29 String siteName;
26 30
27 @ExcelIgnore 31 @ExcelIgnore
28 /** 32 /**
29 * 打卡日期 33 * 打卡日期
30 */ 34 */
31 - String date; 35 + String date;
32 36
33 - public SignInResponseVo(SignIn signIn){ 37 + public SignInResponseVo(SignIn signIn) {
34 this.setDeviceId(signIn.getDeviceId()); 38 this.setDeviceId(signIn.getDeviceId());
35 this.setId(signIn.getId()); 39 this.setId(signIn.getId());
36 this.setJobCode(signIn.getJobCode()); 40 this.setJobCode(signIn.getJobCode());
@@ -48,6 +52,13 @@ public class SignInResponseVo extends SignIn { @@ -48,6 +52,13 @@ public class SignInResponseVo extends SignIn {
48 this.setUpdateTime(signIn.getUpdateTime()); 52 this.setUpdateTime(signIn.getUpdateTime());
49 this.setRemark(signIn.getRemark()); 53 this.setRemark(signIn.getRemark());
50 } 54 }
51 - public SignInResponseVo(){} 55 +
  56 + public SignInResponseVo() {
  57 + }
  58 +
  59 + @Override
  60 + public String toString() {
  61 + return JSON.toJSONString(this);
  62 + }
52 63
53 } 64 }
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/SchedulingRequestVo.java
1 package com.ruoyi.pojo.vo; 1 package com.ruoyi.pojo.vo;
2 2
  3 +import com.alibaba.fastjson2.JSON;
3 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 5 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data; 6 import lombok.Data;
@@ -27,4 +28,9 @@ public class SchedulingRequestVo { @@ -27,4 +28,9 @@ public class SchedulingRequestVo {
27 */ 28 */
28 @ApiModelProperty("工号") 29 @ApiModelProperty("工号")
29 private String jobCode; 30 private String jobCode;
  31 +
  32 + @Override
  33 + public String toString() {
  34 + return JSON.toJSONString(this);
  35 + }
30 } 36 }
Bsth-admin/src/main/resources/application.yml
@@ -38,6 +38,15 @@ logging: @@ -38,6 +38,15 @@ logging:
38 level: 38 level:
39 com.ruoyi: debug 39 com.ruoyi: debug
40 org.springframework: warn 40 org.springframework: warn
  41 + org:
  42 + springframework:
  43 + web:
  44 + servlet:
  45 + mvc:
  46 + method:
  47 + annotation:
  48 + RequestResponseBodyMethodProcessor: TRACE
  49 + DispatcherServlet: TRACE
41 50
42 # 用户配置 51 # 用户配置
43 user: 52 user:
Bsth-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
@@ -2,6 +2,8 @@ package com.ruoyi.common.core.domain; @@ -2,6 +2,8 @@ package com.ruoyi.common.core.domain;
2 2
3 import java.util.HashMap; 3 import java.util.HashMap;
4 import java.util.Objects; 4 import java.util.Objects;
  5 +
  6 +import com.alibaba.fastjson2.JSON;
5 import com.ruoyi.common.constant.HttpStatus; 7 import com.ruoyi.common.constant.HttpStatus;
6 import com.ruoyi.common.utils.StringUtils; 8 import com.ruoyi.common.utils.StringUtils;
7 9
@@ -213,4 +215,9 @@ public class AjaxResult extends HashMap&lt;String, Object&gt; @@ -213,4 +215,9 @@ public class AjaxResult extends HashMap&lt;String, Object&gt;
213 super.put(key, value); 215 super.put(key, value);
214 return this; 216 return this;
215 } 217 }
  218 +
  219 + @Override
  220 + public String toString() {
  221 + return JSON.toJSONString(this);
  222 + }
216 } 223 }
Bsth-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java
1 package com.ruoyi.common.core.page; 1 package com.ruoyi.common.core.page;
2 2
  3 +import com.alibaba.fastjson2.JSON;
  4 +
3 import java.io.Serializable; 5 import java.io.Serializable;
4 import java.util.List; 6 import java.util.List;
5 7
@@ -82,4 +84,10 @@ public class TableDataInfo implements Serializable @@ -82,4 +84,10 @@ public class TableDataInfo implements Serializable
82 { 84 {
83 this.msg = msg; 85 this.msg = msg;
84 } 86 }
  87 +
  88 +
  89 + @Override
  90 + public String toString() {
  91 + return JSON.toJSONString(this);
  92 + }
85 } 93 }