20250214

src/main/java/com/fdkankan/scene/Interceptor/InitEditInfoAspect.java

@@ -127,7 +127,12 @@ public class InitEditInfoAspect {
 
 		Set<String> keySet = new HashSet<>();
 		Set<Long> deleteIds = new HashSet<>();
-		List<SceneFileMapping> mappingList = sceneFileMappingService.list(new LambdaQueryWrapper<SceneFileMapping>().eq(SceneFileMapping::getNum, num).eq(SceneFileMapping::getSubgroup, subgroup).orderByDesc(SceneFileMapping::getId));
+		List<SceneFileMapping> mappingList = sceneFileMappingService.list(
+				new LambdaQueryWrapper<SceneFileMapping>()
+						.eq(SceneFileMapping::getNum, num)
+						.eq(SceneFileMapping::getSubgroup, subgroup)
+						.eq(SceneFileMapping::getUpTime, upTime)
+						.orderByDesc(SceneFileMapping::getId));
 		for (SceneFileMapping mapping : mappingList) {
 			if(keySet.contains(mapping.getKey())){
 				deleteIds.add(mapping.getId());

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -34,14 +35,12 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -137,28 +136,43 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
 
 
     public static void main(String[] args) {
-        JSONObject params = new JSONObject();
-        params.put("SYSCODE", "CHNTZCGL_ZCSZHGL");
-        params.put("ACCTID", "101269561");
-        params.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3MjQxMTQwLCJOQU5PU0VDT05EIjozNTk0NjI1NTg5ODQ3MDU0Nn0.MIlnrl5X00_0QgaT1N9wYRwi4WQ86dGtQlD3EsA01I0");
-        String encode = ThreeDESUtil.encode(params.toString(), "6#dPz>3F");
-        System.out.println(encode);
-
-        JSONObject params2 = new JSONObject();
-        params2.put("SERVICEID", "CHNTZCGL_ZCSZHGL");
-        params2.put("LOGINACCOUNT", "yangqc");
-        params2.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3NTc3Mzc2LCJOQU5PU0VDT05EIjozNjI4MjQ5MTc2NjM4MDAzMX0.fbTCdbjMTOD6NywkuKGtsOnQdmFI7PiU4g8mEiLQ5wQ");
-        encode = ThreeDESUtil.encode(params2.toString(), "6#dPz>3F");
-        System.out.println(encode);
-
-
-        JSONObject params3 = new JSONObject();
-        params3.put("SERVICEID", "CHNTZCGL_ZCSZHGL");
-        params3.put("QUERYMODE", "3");
-        params3.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3MjQxMTQwLCJOQU5PU0VDT05EIjozNTk0NjI1NTg5ODQ3MDU0Nn0.MIlnrl5X00_0QgaT1N9wYRwi4WQ86dGtQlD3EsA01I0");
-        params3.put("ORGCODE", "100035");
-        encode = ThreeDESUtil.encode(params3.toString(), "6#dPz>3F");
-        System.out.println(encode);
+//        JSONObject params = new JSONObject();
+//        params.put("SYSCODE", "CHNTZCGL_ZCSZHGL");
+//        params.put("ACCTID", "101269561");
+//        params.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3MjQxMTQwLCJOQU5PU0VDT05EIjozNTk0NjI1NTg5ODQ3MDU0Nn0.MIlnrl5X00_0QgaT1N9wYRwi4WQ86dGtQlD3EsA01I0");
+//        String encode = ThreeDESUtil.encode(params.toString(), "6#dPz>3F");
+//        System.out.println(encode);
+//
+//        JSONObject params2 = new JSONObject();
+//        params2.put("SERVICEID", "CHNTZCGL_ZCSZHGL");
+//        params2.put("LOGINACCOUNT", "yangqc");
+//        params2.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3NTc3Mzc2LCJOQU5PU0VDT05EIjozNjI4MjQ5MTc2NjM4MDAzMX0.fbTCdbjMTOD6NywkuKGtsOnQdmFI7PiU4g8mEiLQ5wQ");
+//        encode = ThreeDESUtil.encode(params2.toString(), "6#dPz>3F");
+//        System.out.println(encode);
+//
+//
+//        JSONObject params3 = new JSONObject();
+//        params3.put("SERVICEID", "CHNTZCGL_ZCSZHGL");
+//        params3.put("QUERYMODE", "3");
+//        params3.put("TOKEN", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJSRVMiLCJpc3MiOiJXUzRBIiwiZXhwIjoxNzI3MjQxMTQwLCJOQU5PU0VDT05EIjozNTk0NjI1NTg5ODQ3MDU0Nn0.MIlnrl5X00_0QgaT1N9wYRwi4WQ86dGtQlD3EsA01I0");
+//        params3.put("ORGCODE", "100035");
+//        encode = ThreeDESUtil.encode(params3.toString(), "6#dPz>3F");
+//        System.out.println(encode);
+
+//        String s1 = MD5.create().digestHex16("D:\\四维时代\\江门公安\\场景迁移\\sncode.txt");
+//        String s2 = MD5.create().digestHex16("D:\\四维时代\\江门公安\\场景迁移\\KJ-3wS2R5E57eY\\sncode.txt");
+//        System.out.println(s1);
+//        System.out.println(FileUtil.size(new File("D:\\四维时代\\江门公安\\场景迁移\\sncode.txt")));
+//        System.out.println(s2);
+//        System.out.println(FileUtil.size(new File("D:\\四维时代\\江门公安\\场景迁移\\KJ-3wS2R5E57eY\\sncode.txt")));
+
+        String s1 = MD5.create().digestHex16("D:\\四维时代\\江门公安\\场景迁移\\123.txt");
+        System.out.println(s1);
+
+        FileUtil.writeUtf8String("123123", "D:\\四维时代\\江门公安\\场景迁移\\123.txt");
+
+        String s2 = MD5.create().digestHex16("D:\\四维时代\\江门公安\\场景迁移\\123.txt");
+        System.out.println(s2);
 
     }
 
@@ -190,6 +204,12 @@ public class SceneServiceImpl extends ServiceImpl<SceneMapper, Scene> implements
         if(CollUtil.isEmpty(list)){
             return null;
         }
-        return list.stream().collect(Collectors.toMap(v -> v.getUpTimeKey(), v-> DateUtil.formatDateTime(DateUtil.parse(v.getUpTimeKey(), DatePattern.PURE_DATETIME_PATTERN))));
+        Map<String, String> map = new LinkedHashMap<>();
+        for (Scene scene : list) {
+            map.put(scene.getUpTimeKey(), DateUtil.formatDateTime(DateUtil.parse(scene.getUpTimeKey(), DatePattern.PURE_DATETIME_PATTERN)));
+        }
+        return map;
     }
+
+
 }