Merge branch 'master' of http://git.zonelife.cn:3000/huangyang/national-motion-backend

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/hikiot/HikiotConstant.java

@@ -17,7 +17,7 @@ public interface HikiotConstant {
     String PASSWORD_VALUE = "ziyan515.";
     String APP_ACCESS_TOKEN_AUTH_HEADER = "App-Access-Token";
     String REDIRECT_URL = "redirectUrl";
-    String VISITOR = "normal";
+    String VISITOR = "visitor";
     String REDIRECT_URL_VALUE = "http://o3878n6548.wicp.vip";
     /**APP KEY*/
     String APP_KEY_VALUE = "1954824074366873616";

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/hikiot/HikiotTool.java

@@ -17,7 +17,6 @@ import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 import static com.alibaba.dashscope.utils.JsonUtils.gson;
@@ -167,13 +166,11 @@ public class HikiotTool {
         addUserRequestDTO.setPayload(new AddUserRequestDTO.Payload()
                 .setUserInfo(new AddUserRequestDTO.Payload.UserInfo()
                         .setUserType(VISITOR)
-                        .setEmployeeNo("0002")
-                        .setName("Sheep2")
+                        .setEmployeeNo("000123")
+                        .setName("Sheep123")
                         .setPermanentValid(true)
                         .setEnableBeginTime(LocalDateTimeUtil.format(LocalDateTime.now().with(LocalTime.MIN), "yyyy-MM-dd'T'HH:mm:ss"))
-                        .setEnableEndTime(LocalDateTimeUtil.format(LocalDateTime.now()
-                        .with(LocalTime.MAX)
-                        .truncatedTo(ChronoUnit.SECONDS), "yyyy-MM-dd'T'HH:mm:ss"))));
+                        .setEnableEndTime("2025-12-31T23:59:59")));
         return sendPostRequest(ADD_USER_URL, gson.toJson(addUserRequestDTO),setHeaders());
     }
 
@@ -235,8 +232,8 @@ public class HikiotTool {
         AddFaceRequestDTO addFaceRequestDTO = new AddFaceRequestDTO();
         addFaceRequestDTO.setDeviceSerial("FX0889961");
         addFaceRequestDTO.setPayload(new AddFaceRequestDTO.Payload()
-                .setFaceInfo(new AddFaceRequestDTO.Payload.FaceInfo().setEmployeeNo("0002")
-                        .setFaceURL("https://dst-health.oss-cn-chengdu.aliyuncs.com/20250815/99e0a736139b4c52a53365486c810452.jpg")));
+                .setFaceInfo(new AddFaceRequestDTO.Payload.FaceInfo().setEmployeeNo("000123")
+                        .setFaceURL("https://dst-health.oss-cn-chengdu.aliyuncs.com/20250818/104a5d80d5da4dcaa0b836a9e826f533.jpg")));
         return sendPostRequest(ADD_FACE_URL, gson.toJson(addFaceRequestDTO),setHeaders());
     }
 
@@ -248,7 +245,7 @@ public class HikiotTool {
     public static String queryUserInfo() throws IOException, InterruptedException {
         Map<String, String> queryUserInfo = new HashMap<>();
         queryUserInfo.put("deviceSerial", "FX0889961");
-        queryUserInfo.put("keyword", "0002");
+        queryUserInfo.put("keyword", "0012");
         return sendPostRequest(QUERY_USER_INFO_URL, gson.toJson(queryUserInfo),setHeaders());
     }
 
@@ -288,14 +285,15 @@ public class HikiotTool {
                 AddUserWeekPlanDTO.TimeSegment segment = new AddUserWeekPlanDTO.TimeSegment();
                 segment.setDoorWeekTimeSegmentId(i);
                 segment.setWeek(day);
-                segment.setDoorStatus("remainClosed");
-                segment.setBeginTime("00:00:00");
-                segment.setEndTime("00:00:00");
+                segment.setDoorStatus("normal");
+                segment.setBeginTime("01:00:00");
+                segment.setEndTime("23:00:00");
 
                 // 特殊配置
                 if (i == 1) {
                     segment.setEnable(true);
-                    segment.setEndTime("23:59:59");
+                    segment.setBeginTime("06:00:00");
+                    segment.setEndTime("23:00:00");
                 } else {
                     segment.setEnable(false);
                 }
@@ -363,15 +361,14 @@ public class HikiotTool {
                 segment.setWeek(day);
 
                 // 设置默认值
-                segment.setBeginTime("00:00:00");
-                segment.setEndTime("00:00:00");
+                segment.setBeginTime("01:00:00");
+                segment.setEndTime("23:00:00");
 
                 // 特殊配置
-                if (i == 1 && (day.equals("Monday") || day.equals("Tuesday")
-                        || day.equals("Wednesday") || day.equals("Thursday")
-                        || day.equals("Friday"))) {
+                if (i == 1 ) {
                     segment.setEnable(true);
-                    segment.setEndTime("23:59:59");
+                    segment.setBeginTime("06:00:00");
+                    segment.setEndTime("23:00:00");
                 } else {
                     segment.setEnable(false);
                 }
@@ -425,8 +422,8 @@ public class HikiotTool {
     }
 
     public static void main(String[] args) throws IOException, InterruptedException {
-        addUserWeekPlan();
 //        addUser();
+        addDoorWeekPlan();
 //        addFace();
 //        addUserWeekPlan();
 //        JsonObject root = JsonParser.parseString(HikiotTool.getAppAccessToken()).getAsJsonObject();

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/hikiot/dto/AddDoorWeekPlanDTO.java

@@ -39,7 +39,7 @@ public class AddDoorWeekPlanDTO {
         private int doorWeekTimeSegmentId;
         private String week;
         private boolean enable;
-        private String doorStatus = "remainClosed";
+        private String doorStatus = "normal";
         private String beginTime;
         private String endTime;
     }