Browse Source

feat(cms): 增强网站字段管理功能- 添加权限控制注解,细化接口访问权限

-优化批量导入逻辑,先删除旧数据再导入新数据
- 调整字段默认值设置,排序默认值改为100- 更新Excel导入模板字段描述信息
- 移除字段类末尾多余空行,优化代码格式
dev3
科技小王子 2 weeks ago
parent
commit
97fba61dc9
  1. 23
      src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java
  2. 8
      src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldImportParam.java

23
src/main/java/com/gxwebsoft/cms/controller/CmsWebsiteFieldController.java

@ -3,6 +3,8 @@ package com.gxwebsoft.cms.controller;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.cms.service.CmsWebsiteFieldService;
import com.gxwebsoft.cms.entity.CmsWebsiteField;
@ -57,6 +59,7 @@ public class CmsWebsiteFieldController extends BaseController {
return success(cmsWebsiteFieldService.getByIdRel(id));
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:save')")
@Operation(summary = "添加应用参数")
@PostMapping()
public ApiResult<?> save(@RequestBody CmsWebsiteField cmsWebsiteField) {
@ -66,6 +69,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("添加失败");
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:update')")
@Operation(summary = "修改应用参数")
@PutMapping()
public ApiResult<?> update(@RequestBody CmsWebsiteField cmsWebsiteField) {
@ -75,6 +79,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("修改失败");
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:remove')")
@Operation(summary = "删除应用参数")
@DeleteMapping("/{id}")
public ApiResult<?> remove(@PathVariable("id") Integer id) {
@ -84,6 +89,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("删除失败");
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:save')")
@Operation(summary = "批量添加应用参数")
@PostMapping("/batch")
public ApiResult<?> saveBatch(@RequestBody List<CmsWebsiteField> list) {
@ -93,6 +99,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("添加失败");
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:update')")
@Operation(summary = "批量修改应用参数")
@PutMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody BatchParam<CmsWebsiteField> batchParam) {
@ -102,6 +109,7 @@ public class CmsWebsiteFieldController extends BaseController {
return fail("修改失败");
}
@PreAuthorize("hasAuthority('cms:cmsWebsiteField:remove')")
@Operation(summary = "批量删除应用参数")
@DeleteMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
@ -134,17 +142,28 @@ public class CmsWebsiteFieldController extends BaseController {
public ApiResult<List<String>> importBatch(MultipartFile file) {
ImportParams importParams = new ImportParams();
try {
// 第一步:永久删除已标记为 deleted=1 的记录
cmsWebsiteFieldService.remove(new LambdaQueryWrapper<CmsWebsiteField>().eq(CmsWebsiteField::getDeleted, 1));
// 第二步:将现有未删除的记录(deleted=0)标记为 deleted=1
LambdaUpdateWrapper<CmsWebsiteField> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(CmsWebsiteField::getDeleted, 0);
updateWrapper.set(CmsWebsiteField::getDeleted, 1);
cmsWebsiteFieldService.update(updateWrapper);
// 第三步:导入XLS文件的内容
List<CmsWebsiteFieldImportParam> list = ExcelImportUtil.importExcel(file.getInputStream(), CmsWebsiteFieldImportParam.class, importParams);
list.forEach(d -> {
CmsWebsiteField item = JSONUtil.parseObject(JSONUtil.toJSONString(d), CmsWebsiteField.class);
assert item != null;
if (ObjectUtil.isNotEmpty(item)) {
System.out.println("item = " + item);
// 设置默认值
if (item.getDeleted() == null) {
item.setDeleted(0);
item.setDeleted(0); // 新导入的数据deleted设为0
}
if (item.getSortNumber() == null) {
item.setSortNumber(0);
item.setSortNumber(100);
}
if (item.getEncrypted() == null) {
item.setEncrypted(false);

8
src/main/java/com/gxwebsoft/cms/param/CmsWebsiteFieldImportParam.java

@ -18,7 +18,7 @@ public class CmsWebsiteFieldImportParam implements Serializable {
@Excel(name = "自增ID")
private Integer id;
@Excel(name = "类型,0文本 1图片 2其他")
@Excel(name = "类型")
private Integer type;
@Excel(name = "名称")
@ -27,7 +27,7 @@ public class CmsWebsiteFieldImportParam implements Serializable {
@Excel(name = "默认值")
private String defaultValue;
@Excel(name = "可修改的值 [on|off]")
@Excel(name = "可修改的值")
private String modifyRange;
@Excel(name = "备注")
@ -42,7 +42,7 @@ public class CmsWebsiteFieldImportParam implements Serializable {
@Excel(name = "国际化语言")
private String lang;
@Excel(name = "是否加密")
@Excel(name = "加密")
private Boolean encrypted;
@Excel(name = "商户ID")
@ -53,4 +53,4 @@ public class CmsWebsiteFieldImportParam implements Serializable {
@Excel(name = "租户ID")
private Integer tenantId;
}
}

Loading…
Cancel
Save