guzijian / bsth-alcohol-sign · Commits

Commit c4e54cba0e90e2430f13a2987b70cd3087a8fabb

Authored by liujun001
1 parent 5ece0d69
build: skipped

添加设备操作异常警报

Inline Side-by-side
Showing 5 changed files with 46 additions and 17 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java
  View file @c4e54cb
... ... @@ -61,7 +61,7 @@ public class AppSignExceptionController extends BaseController {
61 61 signIn.setStartCreateTime(DateUtil.shortDate(dto.getSignTime()));
62 62 signIn.setEndCreateTime(DateUtils.addDays(signIn.getStartCreateTime(), 1));
63 63 } else {
64   - signIn.setEndCreateTime(DateUtil.shortDate(new Date()));
  64 + signIn.setEndCreateTime(DateUtil.shortDate(DateUtils.addDays(new Date(),1)));
65 65 signIn.setStartCreateTime(DateUtils.addMonths(signIn.getEndCreateTime(), -2));
66 66  
67 67 }
... ...
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
  View file @c4e54cb
... ... @@ -587,6 +587,9 @@ public class DssDriverController extends BaseController {
587 587 }
588 588  
589 589 private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
  590 + if(Objects.isNull(signIn)){
  591 + return null;
  592 + }
590 593 GetWineRecordVo vo = new GetWineRecordVo();
591 594 vo.setCheckTime(signIn.getCreateTime());
592 595  
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/dto/LoginDriverDTO.java
  View file @c4e54cb
... ... @@ -40,7 +40,11 @@ public class LoginDriverDTO implements java.io.Serializable {
40 40  
41 41 @Override
42 42 public String toString() {
43   - return JSON.toJSONString(this);
  43 + String temp = authValue;
  44 + this.authValue = null;
  45 + String str = JSON.toJSONString(this);
  46 + this.authValue = temp;
  47 + return str;
44 48 }
45 49  
46 50  
... ...
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
  View file @c4e54cb
... ... @@ -143,6 +143,12 @@ public class FaceServiceImpl implements FaceService {
143 143 return null;
144 144 }
145 145  
  146 + int size = CollectionUtils.size(faceInfoList);
  147 + if(size == 0){
  148 + log.error("人脸对比失败，没有人脸特征数据:[{}];错误代码：[{}]", driver, errorCode);
  149 + return null;
  150 + }
  151 +
146 152 FaceFeature faceFeature = new FaceFeature();
147 153 errorCode = faceEngine.extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
148 154 if (errorCode != ErrorInfo.MOK.getValue()) {
... ...
Bsth-admin/src/main/resources/application-druid-prd.yml
  View file @c4e54cb
... ... @@ -7,7 +7,7 @@ spring:
7 7 # 自己的邮箱
8 8 username: m18980249160@163.com
9 9 # 提供的密码 不是自己的登录密码
10   - password: RZHJXWXPCALIAOCG
  10 + password: RZHJXWXPCALIAOCG1
11 11 # 占用端口号
12 12 port: 465
13 13 nickname: 酒精测试异常通知
... ... @@ -28,9 +28,9 @@ spring:
28 28 # 主库数据源
29 29 master:
30 30 # 测试地址
31   - url: jdbc:mysql://192.168.40.121:3307/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
  31 + url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
32 32 username: root
33   - password: qinpugongjiao20230730
  33 + password: guzijian
34 34 # 从库数据源
35 35 slave:
36 36 # 从数据源开关/默认关闭
... ... @@ -97,10 +97,10 @@ spring:
97 97 redis:
98 98 # 地址
99 99 # host: 121.41.83.61
100   - host: 192.168.40.121
101   - database: 0
  100 + host: 127.0.0.1
  101 + database: 4
102 102 # password: qpgjredis
103   - port: 6378
  103 + port: 6379
104 104 # 连接超时时间
105 105 timeout: 10s
106 106 lettuce:
... ... @@ -118,7 +118,7 @@ spring:
118 118 # 令牌自定义标识
119 119 header: Authorization
120 120 # 令牌密钥
121   - secret: abcdefghijklmnopqrstuvwxyz
  121 + secret: abcdefghijklmnopqrstuvwxys
122 122 # 令牌有效期（默认30分钟）
123 123 expireTime: 30
124 124  
... ... @@ -133,7 +133,7 @@ ruoyi:
133 133 # 实例演示开关
134 134 demoEnabled: true
135 135 # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
136   - profile: /home/qpbssign/server/uploadPath
  136 + profile: /data/lingang/apache-tomcat-8.5.61/webapps/uploadPath
137 137 # 获取ip地址开关
138 138 addressEnabled: false
139 139 # 验证码类型 math 数字计算 char 字符验证
... ... @@ -141,7 +141,7 @@ ruoyi:
141 141 # 开发环境配置
142 142 server:
143 143 # 服务器的HTTP端口，默认为8080
144   - port: 8100
  144 + port: 8102
145 145 servlet:
146 146 # 应用的访问路径
147 147 context-path: /
... ... @@ -175,8 +175,6 @@ springfox:
175 175 documentation:
176 176 auto-startup: false
177 177 enabled: false
178   -log:
179   - path: /home/qpbssign/server/logs
180 178  
181 179 api:
182 180 template: 车队与线路匹配模板
... ... @@ -188,8 +186,8 @@ api:
188 186 # 获取排班信息
189 187 getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
190 188 getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
  189 + getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
191 190 config:
192   - # 固定密码
193 191 password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
194 192 # 随机字符串
195 193 nonce: adfsad
... ... @@ -197,6 +195,10 @@ api:
197 195 path: /apk/dev
198 196 # 用户头像存放位置
199 197 headImage: /head/image
  198 + sign:
  199 + image: /image
  200 + video:
  201 + basePath: /video
200 202  
201 203 personnel:
202 204 token:
... ... @@ -205,8 +207,8 @@ api:
205 207 appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
206 208 people:
207 209 url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
208   -
209   -
  210 +log:
  211 + path: logs
210 212 netty:
211 213 # 是否开启netty服务
212 214 enabled: false
... ... @@ -215,4 +217,18 @@ netty:
215 217 catalogue:
216 218 image: device/image
217 219 speech: device/speech
218   - port: 8989
219 220 \ No newline at end of file
  221 + port: 8989
  222 +bsth:
  223 + face:
  224 + app:
  225 + id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
  226 + sdk:
  227 + key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
  228 + # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
  229 + lib:
  230 + path: /data/lingang/LINUX64
  231 + # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
  232 + faceFeature:
  233 + url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
  234 + skip:
  235 + url: /big/view/queryNumberByType;/big/view/queryLineInfo/*;/big/view/querySignDetails;/report/list/**;/system/dict/data/**;/app/version/check/**;/app/checkDeviceHeart;/app/download;"/driver/**;/in/**;/eexception/**;/equipment/**;/report/**;/login;/register;/captchaImage;/dss/Driver/Auth;/login/no/code
... ...