yingp 6 éve
szülő
commit
ee5be00f94

+ 2 - 0
applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/DeviceClient.java

@@ -10,6 +10,7 @@ import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author yingp
@@ -17,6 +18,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
  */
 @EnableConfigurationProperties(DeviceServerProperties.class)
 @SpringBootApplication
+@EnableScheduling
 public class DeviceClient extends AbstractJavaFxApplicationSupport {
 
     public static void main(String[] args) {

+ 2 - 2
applications/device/device-client-biometric/src/main/java/com/usoftchina/smartschool/device/client/biometric/controller/CameraController.java

@@ -88,8 +88,8 @@ public class CameraController extends ViewController {
                     Scene scene = getScene();
                     if (scene instanceof ParameterizedScene) {
                         ObjectProperty<File> fileProperty = (ObjectProperty<File>) ((ParameterizedScene) scene).getParams();
-                        File tempImageFile = Files.createTempFile("snapshot", "png").toFile();
-                        ImageIO.write(webcam.getImage(), "PNG", tempImageFile);
+                        File tempImageFile = Files.createTempFile("snapshot", "jpg").toFile();
+                        ImageIO.write(webcam.getImage(), "JPG", tempImageFile);
                         fileProperty.setValue(tempImageFile);
                     }
                     scene.getWindow().hide();

+ 7 - 4
applications/device/device-sdk-biometric/src/main/java/com/usoftchina/smartschool/device/biometric/DeviceManageController.java

@@ -3,13 +3,14 @@ package com.usoftchina.smartschool.device.biometric;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.usoftchina.smartschool.device.context.SpringContextHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.time.LocalDateTime;
 
 /**
  * @author yingp
@@ -19,6 +20,8 @@ import java.time.LocalDateTime;
 @RequestMapping("/DeviceManageService")
 public class DeviceManageController {
 
+    private final Logger logger = LoggerFactory.getLogger(DeviceManageController.class);
+
     /**
      * 接收心跳
      *
@@ -28,14 +31,14 @@ public class DeviceManageController {
      */
     @PostMapping("/ACSServer")
     @Deprecated
-    public ResultPo deviceHeart(HttpServletRequest request) throws IOException {
-        System.out.println(LocalDateTime.now() + " ACSServer " + request.getReader().readLine());
+    public ResultPo deviceHeartbeat(HttpServletRequest request) throws IOException {
         String body = request.getReader().readLine();
+        logger.debug(body);
         if (null != body && body.startsWith("{")) {
             RequestPo<HealthInfo> req = JSON.parseObject(body, new TypeReference<RequestPo<HealthInfo>>() {
             });
             SpringContextHolder.getContext().publishEvent(new HeartbeatEvent(req.getResponseBody().getDeviceCode(), this));
         }
-        return ResultPo.success().setHoldRequests("0");
+        return ResultPo.success();
     }
 }

+ 6 - 2
applications/device/device-sdk-biometric/src/main/java/com/usoftchina/smartschool/device/biometric/VerificationController.java

@@ -1,12 +1,13 @@
 package com.usoftchina.smartschool.device.biometric;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.time.LocalDateTime;
 
 /**
  * @author yingp
@@ -16,6 +17,8 @@ import java.time.LocalDateTime;
 @RequestMapping("/verificationInterface")
 public class VerificationController {
 
+    private final Logger logger = LoggerFactory.getLogger(VerificationController.class);
+
     /**
      * 接收闸机过人数据
      *
@@ -23,7 +26,8 @@ public class VerificationController {
      */
     @PostMapping("/passlog/passFullLog")
     public ResultPo passLog(HttpServletRequest request) throws IOException {
-        System.out.println(LocalDateTime.now() + " passFullLog " + request.getReader().readLine());
+        String body = request.getReader().readLine();
+        logger.debug(body);
         return ResultPo.success();
     }
 }