fix(): 修复代码格式

boot3.0
dongzeliang 2025-01-14 12:05:20 +08:00
parent 1af2baea05
commit ad3dec352a
9 changed files with 96 additions and 22 deletions

View File

@ -31,11 +31,4 @@ public class SuperBasic<OC> implements Serializable {
*/ */
private String serviceId; private String serviceId;
/**
*
* @return
*/
public static <OC> OC ofNull(){
return (OC) builder().build();
}
} }

View File

@ -47,7 +47,7 @@ public class BaseController {
/** /**
* *
*/ */
public Result success () { public Result<String> success () {
return Result.success(); return Result.success();
} }

View File

@ -2,6 +2,7 @@ package com.muyu.system.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.muyu.common.core.domain.Result; import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.utils.poi.ExcelUtil;
import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.core.web.page.DataPageResp;
@ -12,6 +13,7 @@ import com.muyu.common.security.annotation.RequiresPermissions;
import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.system.domain.SysConfig; import com.muyu.system.domain.SysConfig;
import com.muyu.system.domain.model.SysConfigPageQueryModel; import com.muyu.system.domain.model.SysConfigPageQueryModel;
import com.muyu.system.domain.rep.SysConfigAddReq;
import com.muyu.system.domain.rep.SysConfigListReq; import com.muyu.system.domain.rep.SysConfigListReq;
import com.muyu.system.service.SysConfigService; import com.muyu.system.service.SysConfigService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
@ -78,12 +80,11 @@ public class SysConfigController extends BaseController {
@RequiresPermissions("system:config:add") @RequiresPermissions("system:config:add")
@Log(title = "参数管理", businessType = BusinessType.INSERT) @Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public Result add (@Validated @RequestBody SysConfig config) { public Result add (@Validated @RequestBody SysConfigAddReq sysConfigAddReq) {
if (!configService.checkConfigKeyUnique(config)) { if (!configService.checkConfigKeyUnique(sysConfigAddReq.getConfigKey())) {
return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); return error(StringUtils.format("新增参数「{}」失败,参数键名已存在",sysConfigAddReq.getConfigName()));
} }
config.setCreateBy(SecurityUtils.getUsername()); return toAjax(configService.save(SysConfig.addReqBuild(sysConfigAddReq)));
return toAjax(configService.save(config));
} }
/** /**
@ -91,9 +92,9 @@ public class SysConfigController extends BaseController {
*/ */
@RequiresPermissions("system:config:edit") @RequiresPermissions("system:config:edit")
@Log(title = "参数管理", businessType = BusinessType.UPDATE) @Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping("/{sysConfigId}")
public Result edit (@Validated @RequestBody SysConfig config) { public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfig config) {
if (!configService.checkConfigKeyUnique(config)) { if (!configService.checkConfigKeyUnique(config.getConfigKey())) {
return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在");
} }
config.setUpdateBy(SecurityUtils.getUsername()); config.setUpdateBy(SecurityUtils.getUsername());

View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.annotation.Excel.ColumnType;
import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.system.domain.rep.SysConfigAddReq;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -78,4 +80,19 @@ public class SysConfig extends BaseEntity {
return configValue; return configValue;
} }
/**
*
* @param addReq
* @return
*/
public static SysConfig addReqBuild(SysConfigAddReq addReq) {
return builder()
.configKey(addReq.getConfigKey())
.configName(addReq.getConfigName())
.configValue(addReq.getConfigValue())
.configType(addReq.getConfigType())
.remark(addReq.getRemark())
.createBy(SecurityUtils.getUsername())
.build();
}
} }

View File

@ -56,4 +56,12 @@ public class SysDeptPageQueryModel extends QueryModel<SysDeptPageQueryModel> {
.deptId(deptId) .deptId(deptId)
.build(); .build();
} }
/**
*
* @return
*/
public static SysDeptPageQueryModel ofNull() {
return new SysDeptPageQueryModel();
}
} }

View File

@ -0,0 +1,45 @@
package com.muyu.system.domain.rep;
import com.muyu.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @description:
* @author dongzeliang
* @date 2025/1/10 17:24
* @version 1.0
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SysConfigAddReq {
/**
*
*/
private String configName;
/**
*
*/
private String configKey;
/**
*
*/
private String configValue;
/**
* Y N
*/
private String configType;
/**
*
*/
private String remark;
}

View File

@ -0,0 +1,10 @@
package com.muyu.system.domain.rep;
/**
* @author dongzeliang
* @version 1.0
* @description:
* @date 2025/1/14 10:39
*/
public class SysConfigUpdReq {
}

View File

@ -27,10 +27,10 @@ public interface SysConfigService extends IService<SysConfig> {
/** /**
* *
* @param config * @param configKey Key
* @return * @return true false
*/ */
boolean checkConfigKeyUnique (SysConfig config); boolean checkConfigKeyUnique (String configKey);
/** /**
* *

View File

@ -61,10 +61,10 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
} }
@Override @Override
public boolean checkConfigKeyUnique (SysConfig config) { public boolean checkConfigKeyUnique (String configKey) {
LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey()); queryWrapper.eq(SysConfig::getConfigKey, configKey);
return this.count(queryWrapper) > 0; return this.count(queryWrapper) == 0;
} }
@Override @Override