From d73547fe56e9ef3415f4aeaba2884cfc835fe3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com>
Date: Wed, 17 Aug 2022 11:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/ConfigController.java   | 49 ++++++++++++++++---
 1 file changed, 42 insertions(+), 7 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java
index 0c8612603..45ca4e862 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java
@@ -1,7 +1,6 @@
 package com.njcn.system.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -46,13 +45,30 @@ public class ConfigController extends BaseController {
     private final IConfigService iConfigService;
 
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/getSysConfig")
-    @ApiOperation("获取系统配置列表")
-    public HttpResult<List<Config>> getSysConfig() {
+    @ApiOperation("获取系统配置")
+    public HttpResult<Config> getSysConfig() {
         String methodDescribe = getMethodDescribe("getSysConfig");
         LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe);
-        List<Config> res = iConfigService.list(new QueryWrapper<Config>().eq("sys_config.State", DataStateEnum.ENABLE.getCode()));
+        Config config = iConfigService.lambdaQuery()
+                .eq(Config::getState, DataStateEnum.ENABLE.getCode())
+                .one();
+        if (Objects.isNull(config)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, config, methodDescribe);
+        }
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getSysConfigData")
+    @ApiOperation("获取系统配置列表")
+    public HttpResult<List<Config>> getSysConfigData() {
+        String methodDescribe = getMethodDescribe("getSysConfigData");
+        LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe);
+        List<Config> res = iConfigService.list();
         if (CollectionUtils.isEmpty(res)) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
         } else {
@@ -77,6 +93,26 @@ public class ConfigController extends BaseController {
     }
 
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/updateSysConfigById")
+    @ApiOperation("根据配置Id更改(激活)系统状态")
+    @ApiImplicitParam(name = "id", value = "参数id", required = true)
+    public HttpResult<Config> updateSysConfigById(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("updateSysConfigById");
+        LogUtil.njcnDebug(log, "{}", methodDescribe, id);
+        Config config = iConfigService.getById(id);
+        if (!Objects.isNull(config)) {
+            iConfigService.update( new UpdateWrapper<Config>().eq("sys_config.State", DataStateEnum.ENABLE.getCode())
+                    .set("sys_config.State", DataStateEnum.DELETED.getCode()));
+            iConfigService.update( new UpdateWrapper<Config>().eq("sys_config.Id", id)
+                    .set("sys_config.State", DataStateEnum.ENABLE.getCode()));
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        }else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.ID_NOT_EXIST, null, methodDescribe);
+        }
+    }
+
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @GetMapping("/removeSysConfigById")
     @ApiOperation("根据配置Id删除系统配置")
@@ -84,8 +120,7 @@ public class ConfigController extends BaseController {
     public HttpResult<Config> removeSysConfigById(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("removeSysConfigById");
         LogUtil.njcnDebug(log, "{}", methodDescribe, id);
-        boolean res = iConfigService.update( new UpdateWrapper<Config>().eq("sys_config.Id", id)
-                                                            .set("sys_config.State", DataStateEnum.DELETED.getCode()));
+        boolean res = iConfigService.removeById(id);
         if (res) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {