From 1546ad81f12a11de743b4ac778cc660f57598d2c Mon Sep 17 00:00:00 2001
From: liulu <lu.liu@sunyard.com>
Date: Thu, 31 Oct 2024 10:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=AE=A1=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sunyard/chsm/enums/KeyStatus.java     |   2 +-
 .../java/com/sunyard/chsm/model/Option.java   |   2 +-
 .../sunyard/chsm/model/entity/KeyInfo.java    |   2 +
 .../controller/ApplicationController.java     | 106 ++++++++++++++++++
 .../chsm/controller/KeyInfoController.java    |   1 +
 .../java/com/sunyard/chsm/dto/AppQuery.java   |  19 ++++
 .../java/com/sunyard/chsm/dto/AppSave.java    |  15 +++
 .../java/com/sunyard/chsm/dto/AppView.java    |  16 +++
 .../chsm/service/ApplicationService.java      |  25 +++++
 .../service/impl/ApplicationServiceImpl.java  |  54 +++++++++
 .../chsm/service/impl/KeyInfoServiceImpl.java |  40 ++++---
 .../serviceimpl/ParamConfServiceImpl.java     |   7 +-
 doc/ssp_dm.sql                                |   6 +-
 13 files changed, 275 insertions(+), 20 deletions(-)
 create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppQuery.java
 create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppSave.java
 create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppView.java
 create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/service/ApplicationService.java
 create mode 100644 chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/ApplicationServiceImpl.java

diff --git a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java b/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java
index 1c43204..9ba5a99 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyStatus.java
@@ -19,7 +19,7 @@ public enum KeyStatus {
     DISABLED("disabled", "已停用"),
     ARCHIVED("archived", "已归档"),
     EXPIRED("expired", "已过期"),
-    DESTORY("destory", "已销毁"),
+    DESTROY("destroy", "已销毁"),
     ;
     private final String code;
     private final String desc;
diff --git a/chsm-common/src/main/java/com/sunyard/chsm/model/Option.java b/chsm-common/src/main/java/com/sunyard/chsm/model/Option.java
index 167f180..7c1de4e 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/model/Option.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/model/Option.java
@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class Option {
 
-    public String code;
+    private String code;
     private String text;
 
 
diff --git a/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java b/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
index 2a9ba57..5186170 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
@@ -30,8 +30,10 @@ public class KeyInfo {
     private LocalDateTime expiredTime;
 
     private String remark;
+    private Boolean deleted;
     private LocalDateTime createTime;
     private LocalDateTime updateTime;
+    private LocalDateTime deleteTime;
 
     @TableField(exist = false)
     private List<KeyRecord> records;
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/ApplicationController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/ApplicationController.java
index 22fc89e..a6d8019 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/ApplicationController.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/ApplicationController.java
@@ -1,8 +1,114 @@
 package com.sunyard.chsm.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sunyard.chsm.dto.AppQuery;
+import com.sunyard.chsm.dto.AppSave;
+import com.sunyard.chsm.dto.AppView;
+import com.sunyard.chsm.model.R;
+import com.sunyard.chsm.service.ApplicationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
 /**
+ * 应用管理接口
+ *
  * @author liulu
  * @since 2024/10/29
  */
+@Slf4j
+@RestController
+@RequestMapping("/application")
 public class ApplicationController {
+
+    @Resource
+    private ApplicationService applicationService;
+
+    /**
+     * 分页查询应用列表
+     *
+     * @param query 查询条件
+     * @return 应用列表
+     */
+    @GetMapping("/pageList")
+    public R<Page<AppView>> queryPageList(AppQuery query) {
+
+        Page<AppView> page = applicationService.selectPageList(query);
+
+        return R.data(page);
+    }
+
+    /**
+     * 创建应用
+     *
+     * @param save 参数
+     * @return id
+     */
+    @PostMapping
+    public R<String> save(@Valid @RequestBody AppSave save) {
+        Long id = applicationService.save(save);
+        return R.data(String.valueOf(id));
+    }
+
+    /**
+     * 启用应用
+     *
+     * @param id 应用id
+     * @return
+     */
+    @PostMapping("/enable")
+    public R<Void> enable(Long id) {
+        Assert.notNull(id, "应用id不能为空");
+        applicationService.enable(id);
+        return R.ok();
+    }
+
+    /**
+     * 停用应用
+     *
+     * @param id 应用id
+     * @return
+     */
+    @PostMapping("/disable")
+    public R<Void> disable(Long id) {
+        Assert.notNull(id, "应用id不能为空");
+        applicationService.disable(id);
+        return R.ok();
+    }
+
+    /**
+     * 修改应用
+     *
+     * @param update 参数
+     * @return 应用
+     */
+    @PutMapping
+    public R<Void> update(@Valid @RequestBody AppSave update) {
+        Assert.notNull(update.getId(), "应用id不能为空");
+        applicationService.update(update);
+        return R.ok();
+    }
+
+    /**
+     * 删除应用
+     *
+     * @param id 应用id
+     * @return
+     */
+    @DeleteMapping
+    public R<Void> delete(Long id) {
+        Assert.notNull(id, "应用id不能为空");
+        applicationService.delete(id);
+        return R.ok();
+    }
+
 }
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java
index 331dbe5..2d4c773 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/controller/KeyInfoController.java
@@ -41,6 +41,7 @@ public class KeyInfoController {
 
         List<Option> options = Arrays.stream(KeyStatus.values())
                 .map(it -> new Option(it.getCode(), it.getDesc()))
+                .filter(it -> !KeyStatus.DESTROY.getCode().equals(it.getCode()))
                 .collect(Collectors.toList());
         return R.data(options);
     }
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppQuery.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppQuery.java
new file mode 100644
index 0000000..235ca7a
--- /dev/null
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppQuery.java
@@ -0,0 +1,19 @@
+package com.sunyard.chsm.dto;
+
+import com.sunyard.chsm.model.PageQuery;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author liulu
+ * @since 2024/10/30
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AppQuery extends PageQuery {
+
+    private String name;
+
+    private String status;
+
+}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppSave.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppSave.java
new file mode 100644
index 0000000..774e94a
--- /dev/null
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppSave.java
@@ -0,0 +1,15 @@
+package com.sunyard.chsm.dto;
+
+import lombok.Data;
+
+/**
+ * @author liulu
+ * @since 2024/10/30
+ */
+@Data
+public class AppSave {
+
+
+    private Long id;
+
+}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppView.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppView.java
new file mode 100644
index 0000000..b86f433
--- /dev/null
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/dto/AppView.java
@@ -0,0 +1,16 @@
+package com.sunyard.chsm.dto;
+
+import lombok.Data;
+
+/**
+ * @author liulu
+ * @since 2024/10/30
+ */
+@Data
+public class AppView {
+
+
+
+
+
+}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/ApplicationService.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/ApplicationService.java
new file mode 100644
index 0000000..12d6a18
--- /dev/null
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/ApplicationService.java
@@ -0,0 +1,25 @@
+package com.sunyard.chsm.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sunyard.chsm.dto.AppQuery;
+import com.sunyard.chsm.dto.AppSave;
+import com.sunyard.chsm.dto.AppView;
+
+/**
+ * @author liulu
+ * @since 2024/10/30
+ */
+public interface ApplicationService {
+
+    Page<AppView> selectPageList(AppQuery query);
+
+    Long save(AppSave save);
+
+    void update(AppSave update);
+
+    void enable(Long id);
+
+    void disable(Long id);
+
+    void delete(Long id);
+}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/ApplicationServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/ApplicationServiceImpl.java
new file mode 100644
index 0000000..8991bcf
--- /dev/null
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/ApplicationServiceImpl.java
@@ -0,0 +1,54 @@
+package com.sunyard.chsm.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sunyard.chsm.dto.AppQuery;
+import com.sunyard.chsm.dto.AppSave;
+import com.sunyard.chsm.dto.AppView;
+import com.sunyard.chsm.mapper.ApplicationMapper;
+import com.sunyard.chsm.service.ApplicationService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author liulu
+ * @since 2024/10/30
+ */
+@Slf4j
+@Service
+public class ApplicationServiceImpl implements ApplicationService {
+
+    @Resource
+    private ApplicationMapper applicationMapper;
+
+    @Override
+    public Page<AppView> selectPageList(AppQuery query) {
+        return null;
+    }
+
+    @Override
+    public Long save(AppSave save) {
+        return null;
+    }
+
+    @Override
+    public void update(AppSave update) {
+
+    }
+
+    @Override
+    public void enable(Long id) {
+
+    }
+
+    @Override
+    public void disable(Long id) {
+
+    }
+
+    @Override
+    public void delete(Long id) {
+
+    }
+}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
index 26ad64f..a352129 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
@@ -91,13 +91,16 @@ public class KeyInfoServiceImpl implements KeyInfoService {
         LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<KeyInfo>()
                 .eq(StringUtils.hasText(query.getKeyType()), KeyInfo::getKeyType, query.getKeyType())
                 .eq(StringUtils.hasText(query.getStatus()), KeyInfo::getStatus, query.getStatus())
+                .eq(KeyInfo::getDeleted, false)
                 .orderByDesc(KeyInfo::getCreateTime);
         if (StringUtils.hasText(query.getStatus())) {
             KeyStatus queryStatus = KeyStatus.of(query.getStatus());
             if (KeyStatus.WAIT_ENABLED == queryStatus) {
-                wrapper.gt(KeyInfo::getEffectiveTime, now);
+                wrapper.eq(KeyInfo::getStatus, KeyStatus.ENABLED.getCode())
+                        .gt(KeyInfo::getEffectiveTime, now);
             } else if (KeyStatus.EXPIRED == queryStatus) {
-                wrapper.lt(KeyInfo::getExpiredTime, now);
+                wrapper.eq(KeyInfo::getStatus, KeyStatus.ENABLED.getCode())
+                        .lt(KeyInfo::getExpiredTime, now);
             } else {
                 wrapper.eq(KeyInfo::getStatus, query.getStatus());
             }
@@ -134,6 +137,9 @@ public class KeyInfoServiceImpl implements KeyInfoService {
                             view.setStatusText(KeyStatus.EXPIRED.getDesc());
                         }
                     }
+                    if (ObjectUtils.isEmpty(view.getStatusText())) {
+                        view.setStatusText(keyStatus.getDesc());
+                    }
                     return view;
                 })
                 .collect(Collectors.toList());
@@ -196,7 +202,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime newEffectTime = LocalDateTime.of(update.getEffectiveTime(), LocalTime.MIN);
 
-        Assert.isTrue(now.isBefore(newEffectTime), "生效日期必须在当前时间之后");
+        Assert.isTrue(!now.toLocalDate().isAfter(update.getEffectiveTime()), "生效日期必须在当前时间之后");
 
         List<KeyInfo> keyInfos = keyInfoMapper.selectBatchIds(ids);
         if (CollectionUtils.isEmpty(keyInfos)) {
@@ -424,7 +430,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
                 .map(KeyInfo::getCode)
                 .collect(Collectors.toList());
         Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),
-                "密钥id: " + String.join(",", unNormalCodes) + "不是已停用状态, 无法启用");
+                "密钥id: " + String.join(",", unNormalCodes) + "当前状态不支持启用操作");
         keyInfoMapper.update(
                 new LambdaUpdateWrapper<KeyInfo>()
                         .set(KeyInfo::getStatus, KeyStatus.ENABLED.getCode())
@@ -447,7 +453,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
                 .map(KeyInfo::getCode)
                 .collect(Collectors.toList());
         Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),
-                "密钥id: " + String.join(",", unNormalCodes) + "不是启用状态, 无法停用");
+                "密钥id: " + String.join(",", unNormalCodes) + "当前状态不支持停用操作");
         keyInfoMapper.update(
                 new LambdaUpdateWrapper<KeyInfo>()
                         .set(KeyInfo::getStatus, KeyStatus.DISABLED.getCode())
@@ -466,12 +472,12 @@ public class KeyInfoServiceImpl implements KeyInfoService {
             log.warn("archiveKey no exist key with ids: {}", ids.stream().map(String::valueOf).collect(Collectors.joining(",")));
             return;
         }
-//        List<String> unNormalCodes = keyInfos.stream()
-//                .filter(it -> !Objects.equals(KeyStatus.ENABLED.getCode(), it.getStatus()))
-//                .map(KeyInfo::getCode)
-//                .collect(Collectors.toList());
-//        Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),
-//                "密钥id: " + String.join(",", unNormalCodes) + "不是启用状态, 无法停用");
+        List<String> unNormalCodes = keyInfos.stream()
+                .filter(it -> !Objects.equals(KeyStatus.DISABLED.getCode(), it.getStatus()))
+                .map(KeyInfo::getCode)
+                .collect(Collectors.toList());
+        Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),
+                "密钥id: " + String.join(",", unNormalCodes) + "当前状态不支持归档操作");
         keyInfoMapper.update(
                 new LambdaUpdateWrapper<KeyInfo>()
                         .set(KeyInfo::getStatus, KeyStatus.ARCHIVED.getCode())
@@ -489,15 +495,21 @@ public class KeyInfoServiceImpl implements KeyInfoService {
             log.warn("destroyKey no exist key with ids: {}", ids.stream().map(String::valueOf).collect(Collectors.joining(",")));
             return;
         }
+        LocalDateTime now = LocalDateTime.now();
         List<String> unNormalCodes = keyInfos.stream()
-                .filter(it -> !Objects.equals(KeyStatus.ARCHIVED.getCode(), it.getStatus()))
+                .filter(it -> Objects.equals(KeyStatus.ENABLED.getCode(), it.getStatus())
+                        && now.isAfter(it.getEffectiveTime())
+                        && now.isBefore(it.getExpiredTime())
+                )
                 .map(KeyInfo::getCode)
                 .collect(Collectors.toList());
         Assert.isTrue(CollectionUtils.isEmpty(unNormalCodes),
-                "密钥id: " + String.join(",", unNormalCodes) + "不是归档状态, 无法销毁");
+                "密钥id: " + String.join(",", unNormalCodes) + "当前状态不支持销毁操作");
         keyInfoMapper.update(
                 new LambdaUpdateWrapper<KeyInfo>()
-                        .set(KeyInfo::getStatus, KeyStatus.DESTORY.getCode())
+                        .set(KeyInfo::getStatus, KeyStatus.DESTROY.getCode())
+                        .set(KeyInfo::getDeleted, true)
+                        .set(KeyInfo::getDeleteTime, now)
                         .in(KeyInfo::getId, ids)
         );
     }
diff --git a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/paramconf/serviceimpl/ParamConfServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/paramconf/serviceimpl/ParamConfServiceImpl.java
index a15bcab..3c5a62b 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/paramconf/serviceimpl/ParamConfServiceImpl.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/paramconf/serviceimpl/ParamConfServiceImpl.java
@@ -1,8 +1,9 @@
 package com.sunyard.ssp.modules.sysconf.paramconf.serviceimpl;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.sunyard.chsm.utils.JsonUtils;
 import com.sunyard.ssp.common.constant.ParamConfKeyConstant;
 import com.sunyard.ssp.modules.sysconf.paramconf.entity.ParamConf;
 import com.sunyard.ssp.modules.sysconf.paramconf.mapper.ParamConfMapper;
@@ -181,7 +182,9 @@ public class ParamConfServiceImpl extends ServiceImpl<ParamConfMapper, ParamConf
         try {
             File jsonFile = new File(ParamConfKeyConstant.SYS_PARAM_CONFIG_FILE_PATH);
             jsonStr = JsonUtil.getJsonStrFromJsonFile(jsonFile);
-            paramConfs = JSON.parseArray(jsonStr, ParamConf.class);
+            paramConfs = JsonUtils.objectMapper().readValue(jsonStr, new TypeReference<List<ParamConf>>() {
+            });
+//            paramConfs = JSON.parseArray(jsonStr, ParamConf.class);
             return paramConfs;
         } catch (Exception ex) {
             return paramConfs;
diff --git a/doc/ssp_dm.sql b/doc/ssp_dm.sql
index 56cd9e1..f790a01 100644
--- a/doc/ssp_dm.sql
+++ b/doc/ssp_dm.sql
@@ -107,10 +107,12 @@ CREATE TABLE sp_key_info (
     check_alg         VARCHAR(30)  NOT NULL DEFAULT ''  COMMENT '校验算法',
     check_value       VARCHAR(255)  NOT NULL DEFAULT ''  COMMENT '校验值',
     effective_time    TIMESTAMP  COMMENT '启用时间',
-    expired_time         TIMESTAMP  COMMENT '停用时间',
-    remark             VARCHAR(500) NOT NULL DEFAULT ''  COMMENT '备注',
+    expired_time      TIMESTAMP  COMMENT '停用时间',
+    remark            VARCHAR(500) NOT NULL DEFAULT ''  COMMENT '备注',
+    deleted           TINYINT      NOT NULL DEFAULT 0,
     update_time       TIMESTAMP DEFAULT CURRENT_TIMESTAMP(),
     create_time       TIMESTAMP DEFAULT CURRENT_TIMESTAMP(),
+    delete_time       TIMESTAMP,
     PRIMARY KEY (id)
 );