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> getSysConfig() { + @ApiOperation("获取系统配置") + public HttpResult getSysConfig() { String methodDescribe = getMethodDescribe("getSysConfig"); LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); - List res = iConfigService.list(new QueryWrapper().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> getSysConfigData() { + String methodDescribe = getMethodDescribe("getSysConfigData"); + LogUtil.njcnDebug(log, "{}", methodDescribe, methodDescribe); + List 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 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().eq("sys_config.State", DataStateEnum.ENABLE.getCode()) + .set("sys_config.State", DataStateEnum.DELETED.getCode())); + iConfigService.update( new UpdateWrapper().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 removeSysConfigById(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("removeSysConfigById"); LogUtil.njcnDebug(log, "{}", methodDescribe, id); - boolean res = iConfigService.update( new UpdateWrapper().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 {