diff --git a/enhancement/src/main/java/com/centricsoftware/enhancement/controller/c8/C8TestController.java b/enhancement/src/main/java/com/centricsoftware/enhancement/controller/c8/C8TestController.java index 7d9aac4..3ed08dc 100644 --- a/enhancement/src/main/java/com/centricsoftware/enhancement/controller/c8/C8TestController.java +++ b/enhancement/src/main/java/com/centricsoftware/enhancement/controller/c8/C8TestController.java @@ -1,4 +1,5 @@ package com.centricsoftware.enhancement.controller.c8; + import com.centricsoftware.enhancement.modules.c8.dto.ExpResultEntity; import com.fasterxml.jackson.core.type.TypeReference; import cn.hutool.core.convert.Convert; @@ -321,7 +322,8 @@ public class C8TestController { public ResEntity searchByUrl(@RequestParam Map map) { String url = (String) map.get("url"); JSONObject jsonObject = nodeInfoByUrl(url); - return WebResponse.success(ResCode.SUCCESS, jsonObject); + String nodeStr = JsonUtil.toJSONString(jsonObject); + return WebResponse.success(ResCode.SUCCESS, JsonUtil.parseObject(nodeStr, Object.class)); } public JSONObject nodeInfoByUrl(String url) { @@ -537,37 +539,66 @@ public class C8TestController { String modifiedTimeStart = (String) map.get("modifiedTimeStart"); String modifiedTimeEnd = (String) map.get("modifiedTimeEnd"); + // 如果是10位时间戳,补为13位时间戳 + if (modifiedTimeStart != null && modifiedTimeStart.length() == 10) { + modifiedTimeStart = modifiedTimeStart + "000"; + } + if (modifiedTimeEnd != null && modifiedTimeEnd.length() == 10) { + modifiedTimeEnd = modifiedTimeEnd + "000"; + } + + int page = Convert.toInt(map.get("page"), 1); int pageSize = Convert.toInt(map.get("pageSize"), 10); String sequence = Convert.toStr(map.get("sequence"), "DESC"); String nodeName = (String) map.get("nodeName"); String parent = (String) map.get("parent"); + String URL = (String) map.get("URL"); String sValue = (String) map.get("sValue"); String rValue = (String) map.get("rValue"); + String value = (String) map.get("value"); ObjectMapper mapper = new ObjectMapper(); try { - Map sValueMap = mapper.readValue(sValue, new TypeReference>() {}); - - for (Map.Entry entry : sValueMap.entrySet()) { - xmlBuilder.append(String.format( - "", - entry.getKey(), - entry.getValue() - )); + if (sValue != null) { + Map sValueMap = mapper.readValue(sValue, new TypeReference>() { + }); + for (Map.Entry entry : sValueMap.entrySet()) { + xmlBuilder.append(String.format( + "", + entry.getKey(), + entry.getValue() + )); + } } - Map rValueMap = mapper.readValue(rValue, new TypeReference>() {}); - for (Map.Entry entry : rValueMap.entrySet()) { - xmlBuilder.append(String.format( - "", - entry.getKey(), - entry.getValue() - )); + if (rValue != null) { + Map rValueMap = mapper.readValue(rValue, new TypeReference>() { + }); + for (Map.Entry entry : rValueMap.entrySet()) { + xmlBuilder.append(String.format( + "", + entry.getKey(), + entry.getValue() + )); + } } + + if (value != null) { + Map valueMap = mapper.readValue(value, new TypeReference>() { + }); + for (Map.Entry entry : valueMap.entrySet()) { + xmlBuilder.append(String.format( + "", + entry.getKey(), + entry.getValue() + )); + } + } + } catch (Exception e) { log.error("Error parsing JSON: {}", e.getMessage()); } @@ -579,13 +610,13 @@ public class C8TestController { if (!StrUtil.isBlank(modifiedTimeStart)) { xmlBuilder.append(String.format( - "", + "", modifiedTimeStart )); } if (!StrUtil.isBlank(modifiedTimeEnd)) { xmlBuilder.append(String.format( - "", + "", modifiedTimeEnd )); } @@ -604,7 +635,13 @@ public class C8TestController { )); } - System.out.println("xmlBuilder: " + xmlBuilder.toString()); + if (!StrUtil.isBlank(URL)) { + xmlBuilder.append(String.format( + "", + URL + )); + } + log.info("xmlBuilder: {}", xmlBuilder); DepPath depPath = DepPath.builderXml() .xml(xmlBuilder.toString())