wwh 1 rok pred
rodič
commit
939e87774d

+ 1 - 1
huimv-receive/src/main/java/com/huimv/receive/controller/BillAccessDoorController.java

@@ -87,7 +87,7 @@ public class BillAccessDoorController {
             }
             imageCom = uploadImage.getImageCom(image);
             door.setUrlImg(imageCom);
-        }
+        }//9G0487EPAJD7469
         //后面需要修改
         QueryWrapper<DeviceList> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("device_code", seq);

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

@@ -422,7 +422,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
             //通过生成门禁白名单
             QueryWrapper<DeviceList> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", billPersonnelAdmission.getFarmId()).eq("location_id", locationId);
+            queryWrapper.eq("farm_id", billPersonnelAdmission.getFarmId()).eq("location_id", strings[strings.length-1]);
             DeviceList deviceList = deviceListMapper.selectOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(deviceList)) {
                 if (deviceList.getDeviceType() == 0) {
@@ -445,7 +445,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
 
                     HashMap<String, Object> jsonObject = new HashMap<>();
                     jsonObject.put("seq", deviceList.getDeviceCode());
-                    String savePath = "D:\\works\\pig_projects\\甜妹.jpg";
+//                    String savePath = "D:\\works\\pig_projects\\甜妹.jpg";
+                    String savePath = "/opt/huatong/test.jpg";
                     URL url = new URL(billPersonnelAdmission.getUserImgUrl());
                     HttpURLConnection connection = (HttpURLConnection) url.openConnection();
                     connection.setRequestMethod("GET");
@@ -467,7 +468,8 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
                         System.out.println("文件下载错误码为" + resCode);
                     }
 
-                    jsonObject.put("face", FileUtil.file("D:\\works\\pig_projects\\甜妹.jpg"));
+//                    jsonObject.put("face", FileUtil.file("D:\\works\\pig_projects\\甜妹.jpg"));
+                    jsonObject.put("face", FileUtil.file(savePath));
                     jsonObject.put("name", billPersonnelAdmission.getAdmissionUserName());
                     jsonObject.put("password", "123456");
                     jsonObject.put("timestamp", date1.getTime());