修改6

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -749,7 +749,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
             //通过生成门禁白名单
             QueryWrapper<DeviceList> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", billPersonnelAdmission.getFarmId()).eq("location_id", strings[strings.length - 1]);
+            queryWrapper.eq("farm_id", billPersonnelAdmission.getFarmId()).eq("location_id", billPersonnelAdmission.getDestId());
             DeviceList deviceList = deviceListMapper.selectOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(deviceList)) {
                 if (deviceList.getDeviceType() == 0) {

huimv-receive/src/main/java/com/huimv/receive/service/impl/BillSamplingServiceImpl.java

@@ -122,11 +122,12 @@ public class BillSamplingServiceImpl extends ServiceImpl<BillSamplingMapper, Bil
     @Override
     public Result edit(HttpServletRequest httpServletRequest, String farmId, String id, String date, MultipartFile img) throws ParseException, IOException {
         String s = "";
-        if (uploadImage.getVideoCom(img).equals("上传失败")) {
+        s = uploadImage.getVideoCom(img);
+        if (s.equals("上传失败")) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new Result(10001, "视频上传失败", false);
         }
-        s = uploadImage.getVideoCom(img);
+
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysAccountMultilevelServiceImpl.java

@@ -173,14 +173,14 @@ public class SysAccountMultilevelServiceImpl extends ServiceImpl<SysAccountMulti
             sysAccountMultilevel.setWorkName(workName);
         }
 
-
-        if (!IDCardValidator.isValidIDCard(papersCode)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return new Result(10001, "身份证号格式错误!", false);
+        if (ObjectUtil.isNotEmpty(papersCode)) {
+            if (!IDCardValidator.isValidIDCard(papersCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return new Result(10001, "身份证号格式错误!", false);
+            }
+            sysAccountMultilevel.setPapersCode(papersCode);
         }
 
-        sysAccountMultilevel.setPapersCode(papersCode);
-
         accountMultilevelMapper.updateById(sysAccountMultilevel);
         return new Result(ResultCode.SUCCESS, sysAccountMultilevel);
     }

huimv-receive/src/main/resources/application-test2.yml

@@ -0,0 +1,80 @@
+server:
+  port: 8015
+  ssl:
+    key-store: classpath:12743383_receive.ifarmcloud.com.jks
+    key-store-type: jks
+    key-store-password: kh4wsh73
+
+spring:
+  application:
+    name: huimv-admin
+
+
+  servlet:
+    multipart:
+      max-request-size: 200MB
+      max-file-size: 20MB
+
+  datasource:
+    druid:
+      url: jdbc:mysql://115.238.57.190:3306/huimv-huatong-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      username: root
+      password: WICi9V6VC1GYjMR0ITj5mzmW7dzu7UsYubjyyHJbx3TlL7L8n+CGCnPE61gLWuhxn4mKqX7zdrYCfKy/4rITtg==
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      filters: config
+      connect-properties:
+        config.decrypt: true
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+      remove-abandoned-timeout: 120
+    type: com.alibaba.druid.pool.DruidDataSource
+
+
+  #配置rabbitMq 服务器
+#  rabbitmq:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    host: 122.112.224.199
+    port: 6379
+    password: hm123456
+  reactor:
+    debug-agent:
+      enabled: true
+#  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+
+#img:
+#  url: https://img.ifarmcloud.com/images/
+#  basePath: /home/huimv/img/
+##  ip: 139.9.167.178
+##  ip: img.ifarmcloud.com
+#  ip: 139.9.172.209
+#  user:  huimv
+#  password: "!hm123@1"
+#  port: 22
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 119.3.44.183
+  user:  huimv
+  password: "!hm123@1"
+  port: 22

huimv-receive/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 #spring.profiles.active=dev
 spring.profiles.active=prod
-
+#spring.profiles.active=test2
 #¿ªÆô½¡¿µ¼à¿Ø
 management.endpoints.web.exposure.include=*