修复日期显示问题及getSingleTypeApp接口优化

src/main/java/cn/qg/holmes/controller/k8s/K8sController.java

@@ -275,19 +275,27 @@ public class K8sController {
     @GetMapping("/getSingleTypeApp")
     public JsonResult getSingleTypeApp(@RequestParam String namespace, @RequestParam String type) {
         List<RepoInfo> repoInfoList = imageService.getRepoInfoList(namespace);
-        if (repoInfoList.size() > 0) {
         Map<String, Object> resultMap =  new HashMap<>();
+        if (type.equals("base")) {
+            resultMap.put("RepoInfo", repoInfoList);
+            resultMap.put("TotalCount", repoInfoList.size());
+            return JsonResult.buildSuccessResult(resultMap);
+        }
+        if (repoInfoList.size() > 0) {
             List<RepoInfo> newRepoInfoList = new ArrayList<>();
             QueryWrapper<DockerProject> queryWrapper = new QueryWrapper<>();
-            for (RepoInfo repoInfo: repoInfoList) {
             queryWrapper
-                        .eq("project_name", repoInfo.getRepoName().split("/")[1])
                     .eq("project_type", type)
-                        .eq("is_active", 1);
-                if (dockerProjectService.getOne(queryWrapper) != null) {
+                    .eq("is_active", 1)
+                    .eq("deploy_to_docker", 1);
+            List<DockerProject> dockerProjectList = dockerProjectService.list(queryWrapper);
+            for (RepoInfo repoInfo: repoInfoList) {
+                String projectName = repoInfo.getRepoName().split("/")[1];
+                for (DockerProject dockerProject: dockerProjectList) {
+                    if (dockerProject.getProjectName().equals(projectName)) {
                         newRepoInfoList.add(repoInfo);
                     }
-                queryWrapper.clear();
+                }
             }
             resultMap.put("RepoInfo", newRepoInfoList);
             resultMap.put("TotalCount", newRepoInfoList.size());

src/main/java/cn/qg/holmes/service/k8s/K8sService.java

@@ -146,6 +146,7 @@ public class K8sService {
                     }
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
                     df.setTimeZone(TimeZone.getTimeZone("UTC"));
+                    SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Map map = new HashMap<>();
                     map.put("name", name);
                     map.put("description", namespace.getMetadata().getAnnotations().get("description"));
@@ -154,7 +155,7 @@ public class K8sService {
                     map.put("mysqlHost", host);
                     map.put("mysqlPort", port);
                     try {
-                        map.put("createdAt", df.parse(namespace.getMetadata().getCreationTimestamp()));
+                        map.put("createdAt", df2.format(df.parse(namespace.getMetadata().getCreationTimestamp())));
                     } catch (Exception e) {
                         log.info("时间解析异常！");
                         e.printStackTrace();
@@ -180,6 +181,7 @@ public class K8sService {
                     }
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
                     df.setTimeZone(TimeZone.getTimeZone("UTC"));
+                    SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Map<String, Object> map = new HashMap<>();
                     map.put("name", name);
                     map.put("description", namespace.getMetadata().getAnnotations().get("description"));
@@ -188,7 +190,7 @@ public class K8sService {
                     map.put("mysqlHost", host);
                     map.put("mysqlPort", port);
                     try {
-                        map.put("createdAt", df.parse(namespace.getMetadata().getCreationTimestamp()));
+                        map.put("createdAt", df2.format(df.parse(namespace.getMetadata().getCreationTimestamp())));
                     } catch (Exception e) {
                         log.info("时间解析异常！");
                         e.printStackTrace();