添加设备操作异常警报

liujun001
1 parent 5ece0d69
Showing 5 changed files with 46 additions and 17 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/dto/LoginDriverDTO.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/resources/application-druid-prd.yml
@@ -61,7 +61,7 @@ public class AppSignExceptionController extends BaseController {
             signIn.setStartCreateTime(DateUtil.shortDate(dto.getSignTime()));
             signIn.setEndCreateTime(DateUtils.addDays(signIn.getStartCreateTime(), 1));
         } else {
-            signIn.setEndCreateTime(DateUtil.shortDate(new Date()));
+            signIn.setEndCreateTime(DateUtil.shortDate(DateUtils.addDays(new Date(),1)));
             signIn.setStartCreateTime(DateUtils.addMonths(signIn.getEndCreateTime(), -2));
         }
@@ -587,6 +587,9 @@ public class DssDriverController extends BaseController {
     }
     private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
+        if(Objects.isNull(signIn)){
+            return null;
+        }
         GetWineRecordVo vo = new GetWineRecordVo();
         vo.setCheckTime(signIn.getCreateTime());
@@ -40,7 +40,11 @@ public class LoginDriverDTO implements java.io.Serializable {
     @Override
     public String toString() {
-        return JSON.toJSONString(this);
+        String temp = authValue;
+        this.authValue = null;
+        String str = JSON.toJSONString(this);
+        this.authValue = temp;
+        return str;
     }
@@ -143,6 +143,12 @@ public class FaceServiceImpl implements FaceService {
             return null;
         }
+        int size = CollectionUtils.size(faceInfoList);
+        if(size == 0){
+            log.error("人脸对比失败，没有人脸特征数据:[{}];错误代码：[{}]", driver, errorCode);
+            return null;
+        }
+
         FaceFeature faceFeature = new FaceFeature();
         errorCode = faceEngine.extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
         if (errorCode != ErrorInfo.MOK.getValue()) {
@@ -7,7 +7,7 @@ spring:
         # 自己的邮箱
         username: m18980249160@163.com
         # 提供的密码  不是自己的登录密码
-        password: RZHJXWXPCALIAOCG
+        password: RZHJXWXPCALIAOCG1
         # 占用端口号
         port: 465
         nickname: 酒精测试异常通知
@@ -28,9 +28,9 @@ spring:
             # 主库数据源
             master:
                 # 测试地址
-                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
+                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
                 username: root
-                password: qinpugongjiao20230730
+                password: guzijian
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -97,10 +97,10 @@ spring:
     redis:
         # 地址
 #            host: 121.41.83.61
-        host: 192.168.40.121
-        database: 0
+        host: 127.0.0.1
+        database: 4
 #        password: qpgjredis
-        port: 6378
+        port: 6379
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -118,7 +118,7 @@ spring:
         # 令牌自定义标识
         header: Authorization
         # 令牌密钥
-        secret: abcdefghijklmnopqrstuvwxyz
+        secret: abcdefghijklmnopqrstuvwxys
         # 令牌有效期（默认30分钟）
         expireTime: 30
@@ -133,7 +133,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/qpbssign/server/uploadPath
+    profile: /data/lingang/apache-tomcat-8.5.61/webapps/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -141,7 +141,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8100
+    port: 8102
     servlet:
         # 应用的访问路径
         context-path: /
@@ -175,8 +175,6 @@ springfox:
     documentation:
         auto-startup: false
         enabled: false
-log:
-    path: /home/qpbssign/server/logs
 api:
     template: 车队与线路匹配模板
@@ -188,8 +186,8 @@ api:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
-        # 固定密码
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串
         nonce: adfsad
@@ -197,6 +195,10 @@ api:
         path: /apk/dev
     # 用户头像存放位置
     headImage: /head/image
+    sign:
+        image: /image
+    video:
+        basePath: /video
     personnel:
         token:
@@ -205,8 +207,8 @@ api:
             appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
         people:
             url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
-
-
+log:
+    path: logs
 netty:
     # 是否开启netty服务
     enabled: false
@@ -215,4 +217,18 @@ netty:
         catalogue:
             image: device/image
             speech: device/speech
-        port: 8989
 \ No newline at end of file
+        port: 8989
+bsth:
+    face:
+        app:
+            id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
+        sdk:
+            key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+            # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+        lib:
+            path: /data/lingang/LINUX64
+            # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
+        faceFeature:
+            url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    skip:
+        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