From c8a8ccc8e23323bf3c367481ce6721dd860f2989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 26 Aug 2026 16:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zhehekeji/web/config/ConfigProperties.java  | 2 ++
 .../java/com/zhehekeji/web/config/RestTemplateConfig.java     | 2 +-
 web/src/main/java/com/zhehekeji/web/service/CronTab.java      | 4 ++--
 .../java/com/zhehekeji/web/service/LightSourceService.java    | 1 +
 web/src/main/java/com/zhehekeji/web/service/PlcService.java   | 1 +
 web/src/main/resources/application-prod.yml                   | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
index e3326a1..958529b 100644
--- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
+++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java
@@ -46,6 +46,8 @@ public class ConfigProperties {
     private Integer orderTest = 0;
     private String productDoc;
     private List<SmokeBoxType> smokeBoxType;
+    String deleteFileCron = "0 0 12 * * ?";
+    int spaceGB = 150;
 
     @Data
     public static class SmokeBoxType{
diff --git a/web/src/main/java/com/zhehekeji/web/config/RestTemplateConfig.java b/web/src/main/java/com/zhehekeji/web/config/RestTemplateConfig.java
index b8682cc..044bad8 100644
--- a/web/src/main/java/com/zhehekeji/web/config/RestTemplateConfig.java
+++ b/web/src/main/java/com/zhehekeji/web/config/RestTemplateConfig.java
@@ -11,7 +11,7 @@ public class RestTemplateConfig {
     public RestTemplate restTemplate() {
         SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
         // 设置连接超时时间（单位：毫秒）
-        factory.setConnectTimeout(1000);
+        factory.setConnectTimeout(5000);
         // 设置读取数据超时时间（单位：毫秒）
         factory.setReadTimeout(50000);
 
diff --git a/web/src/main/java/com/zhehekeji/web/service/CronTab.java b/web/src/main/java/com/zhehekeji/web/service/CronTab.java
index 1a515ad..8ad210e 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CronTab.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CronTab.java
@@ -58,7 +58,7 @@ public class CronTab {
 
     private static int gByte = 1024* 1024 * 1024;
 
-    @Scheduled(cron = "0 0 0 * * ?")
+    @Scheduled(cron = "${cameraConfig.cameraTimeUpdateCron}")
     //@Scheduled(cron = "0 0/1 * * * *")
     public void file() {
         log.info(" corn delete file");
@@ -66,7 +66,7 @@ public class CronTab {
         File dir = new File(configProperties.getSavePath().getMediaPath());
         long space = dir.getFreeSpace() / gByte;
         log.info(" free space :{}",space);
-        if(space > 150){
+        if(space > configProperties.getSpaceGB()){
             return;
         }
         checkFileTime(dir,configProperties.getDeleteFileDays());
diff --git a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java
index a8840ef..4ffb157 100644
--- a/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/LightSourceService.java
@@ -59,6 +59,7 @@ public class LightSourceService {
 
 
         } catch (IOException e) {
+            log.error("ip:{}",ip,e);
 
         }finally {
             if(os != null){
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 23eefc4..2deb584 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -822,6 +822,7 @@ public class PlcService {
             stock.setWmsCategory(algorithmPojo.getGoodsType());
             stock.setWmsCount(algorithmPojo.getGoodsNumber());
             stock.setCheckPic(path);
+            stock.setCountTop(0);
             stock.setPreoperationPic(paths);
             stock.setCheckNum(plcCmdInfo.getOrderNum());
             stockMapper.updateById(stock);
diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml
index 832545f..e545adf 100644
--- a/web/src/main/resources/application-prod.yml
+++ b/web/src/main/resources/application-prod.yml
@@ -62,6 +62,7 @@ savePath:
   mp4Path: d://data/mp4/
 # ------------服务端类型  0：TCP(罗伯泰克)    1:KSEC(JSON)（昆船）
 serverMode: 1
+deleteFileCron: "0 0 12 * * ?"
 ksec:
   ip: 127.0.0.1
   port: 3000