chestnut-modules
com.chestnut
- 1.5.7
+ 1.5.8
4.0.0
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelController.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelController.java
index e59914e0..54493e1f 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelController.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelController.java
@@ -18,7 +18,6 @@ package com.chestnut.xmodel.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chestnut.common.domain.R;
import com.chestnut.common.exception.CommonErrorCode;
-import com.chestnut.common.i18n.I18nUtils;
import com.chestnut.common.log.annotation.Log;
import com.chestnut.common.log.enums.BusinessType;
import com.chestnut.common.security.anno.Priv;
@@ -27,21 +26,21 @@ import com.chestnut.common.security.web.PageRequest;
import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.validator.LongId;
import com.chestnut.xmodel.core.IMetaControlType;
import com.chestnut.xmodel.core.IMetaModelType;
import com.chestnut.xmodel.domain.XModel;
-import com.chestnut.xmodel.dto.XModelDTO;
+import com.chestnut.xmodel.dto.CreateXModelRequest;
+import com.chestnut.xmodel.dto.UpdateXModelRequest;
import com.chestnut.xmodel.service.IModelService;
import com.chestnut.xmodel.util.XModelUtils;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
*
@@ -63,14 +62,11 @@ public class XModelController extends BaseRestController {
@GetMapping("/controls")
public R getControlTypeOptions() {
- List> list = controlTypes.stream().map(t ->
- Map.of("id", t.getType(), "name", I18nUtils.get(t.getName()))
- ).toList();
- return R.ok(list);
+ return bindSelectOptions(controlTypes, IMetaControlType::getType, IMetaControlType::getName);
}
@GetMapping
- public R getModelList(@RequestParam(value = "query", required = false) String query) {
+ public R getModelList(@RequestParam(required = false) @Length(max = 100) String query) {
PageRequest pr = this.getPageRequest();
Page page = this.modelService.lambdaQuery().like(StringUtils.isNotEmpty(query), XModel::getName, query)
.page(new Page<>(pr.getPageNumber(), pr.getPageSize(), true));
@@ -78,7 +74,7 @@ public class XModelController extends BaseRestController {
}
@GetMapping("/tables")
- public R getModelDataTableList(@RequestParam String type) {
+ public R getModelDataTableList(@RequestParam @Length(max = 30) String type) {
List list = this.modelService.listModelDataTables(type);
return this.bindDataTable(list);
}
@@ -104,24 +100,21 @@ public class XModelController extends BaseRestController {
@Log(title = "新增元数据", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@RequestBody @Validated XModelDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.modelService.addModel(dto);
+ public R add(@RequestBody @Validated CreateXModelRequest req) {
+ this.modelService.addModel(req);
return R.ok();
}
@Log(title = "编辑元数据", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@RequestBody @Validated XModelDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.modelService.editModel(dto);
+ public R edit(@RequestBody @Validated UpdateXModelRequest req) {
+ this.modelService.editModel(req);
return R.ok();
}
@Log(title = "删除元数据", businessType = BusinessType.DELETE)
@PostMapping("/delete")
- public R remove(@RequestBody @NotEmpty List dtoList) {
- List modelIds = dtoList.stream().map(XModelDTO::getModelId).toList();
+ public R remove(@RequestBody @NotEmpty List modelIds) {
this.modelService.deleteModel(modelIds);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelFieldController.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelFieldController.java
index 0116f176..99c694a5 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelFieldController.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/controller/XModelFieldController.java
@@ -24,17 +24,18 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.security.web.PageRequest;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.validator.LongId;
import com.chestnut.xmodel.core.MetaModel;
import com.chestnut.xmodel.core.MetaModelField;
import com.chestnut.xmodel.domain.XModelField;
-import com.chestnut.xmodel.dto.XModelFieldDTO;
+import com.chestnut.xmodel.dto.CreateXModelFieldRequest;
+import com.chestnut.xmodel.dto.UpdateXModelFieldRequest;
import com.chestnut.xmodel.service.IModelFieldService;
import com.chestnut.xmodel.service.IModelService;
import com.chestnut.xmodel.util.XModelUtils;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -61,7 +62,7 @@ public class XModelFieldController extends BaseRestController {
@GetMapping("/list")
public R getModelFieldList(@RequestParam @LongId Long modelId,
- @RequestParam(value = "query", required = false) String query) {
+ @RequestParam(required = false) @Length(max = 50) String query) {
PageRequest pr = getPageRequest();
Page page = modelFieldService.lambdaQuery()
.eq(XModelField::getModelId, modelId)
@@ -84,17 +85,15 @@ public class XModelFieldController extends BaseRestController {
@Log(title = "新增元数据字段", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@RequestBody @Validated XModelFieldDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.modelFieldService.addModelField(dto);
+ public R add(@RequestBody @Validated CreateXModelFieldRequest req) {
+ this.modelFieldService.addModelField(req);
return R.ok();
}
@Log(title = "编辑元数据字段", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@RequestBody @Validated XModelFieldDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.modelFieldService.editModelField(dto);
+ public R edit(@RequestBody @Validated UpdateXModelFieldRequest req) {
+ this.modelFieldService.editModelField(req);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDTO.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelFieldRequest.java
similarity index 67%
rename from chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDTO.java
rename to chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelFieldRequest.java
index 1707b803..363cf7a6 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelFieldDTO.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelFieldRequest.java
@@ -16,49 +16,54 @@
package com.chestnut.xmodel.dto;
import com.chestnut.common.security.domain.BaseDTO;
-import com.chestnut.xmodel.domain.XModelField;
+import com.chestnut.common.validation.RegexConsts;
+import com.chestnut.system.validator.LongId;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
import lombok.Getter;
import lombok.Setter;
-import org.springframework.beans.BeanUtils;
+import org.hibernate.validator.constraints.Length;
import java.util.List;
import java.util.Map;
@Getter
@Setter
-public class XModelFieldDTO extends BaseDTO {
-
- private Long fieldId;
+public class CreateXModelFieldRequest extends BaseDTO {
+ @LongId
private Long modelId;
- @NotNull
+ @NotBlank
+ @Length(max = 50)
private String name;
- @NotNull
+ @NotBlank
+ @Length(max = 50)
+ @Pattern(regexp = RegexConsts.REGEX_CODE)
private String code;
+ @NotBlank
+ @Length(max = 20)
private String fieldType;
private String fieldName;
- @NotNull
+ @NotBlank
+ @Length(max = 20)
private String controlType;
private List> validations;
private FieldOptions options;
-
+
+ @Length(max = 100)
private String defaultValue;
+ @NotNull
private Long sortFlag;
-
- private boolean isDefaultTable;
-
- public static XModelFieldDTO newInstance(XModelField modelField) {
- XModelFieldDTO dto = new XModelFieldDTO();
- BeanUtils.copyProperties(modelField, dto);
- return dto;
- }
+
+ @Length(max = 500)
+ private String remark;
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelDTO.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelRequest.java
similarity index 73%
rename from chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelDTO.java
rename to chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelRequest.java
index 1a6bf03d..34a63dc0 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/XModelDTO.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/CreateXModelRequest.java
@@ -15,37 +15,41 @@
*/
package com.chestnut.xmodel.dto;
-import org.springframework.beans.BeanUtils;
-
import com.chestnut.common.security.domain.BaseDTO;
+import com.chestnut.common.validation.RegexConsts;
import com.chestnut.xmodel.domain.XModel;
-
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Getter;
import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.beans.BeanUtils;
@Setter
@Getter
-public class XModelDTO extends BaseDTO {
+public class CreateXModelRequest extends BaseDTO {
- private Long modelId;
-
private String ownerType;
-
+
private String ownerId;
-
+
@NotBlank
+ @Length(max = 100)
private String name;
- @Pattern(regexp = "[A-Za-z0-9_]+")
+ @Pattern(regexp = RegexConsts.REGEX_CODE)
+ @Length(max = 50)
private String code;
@NotBlank
+ @Length(max = 100)
private String tableName;
+
+ @Length(max = 500)
+ private String remark;
- public static XModelDTO newInstance(XModel model) {
- XModelDTO dto = new XModelDTO();
+ public static CreateXModelRequest newInstance(XModel model) {
+ CreateXModelRequest dto = new CreateXModelRequest();
BeanUtils.copyProperties(model, dto);
return dto;
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/FieldOptions.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/FieldOptions.java
index 5c3a3a3b..df01183e 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/FieldOptions.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/FieldOptions.java
@@ -15,25 +15,14 @@
*/
package com.chestnut.xmodel.dto;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
public class FieldOptions {
private String type;
private String value;
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelFieldRequest.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelFieldRequest.java
new file mode 100644
index 00000000..6530cea8
--- /dev/null
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelFieldRequest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2022-2025 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.xmodel.dto;
+
+import com.chestnut.system.validator.LongId;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateXModelFieldRequest extends CreateXModelFieldRequest {
+
+ @LongId
+ private Long fieldId;
+}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelRequest.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelRequest.java
new file mode 100644
index 00000000..2eb15018
--- /dev/null
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/dto/UpdateXModelRequest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022-2025 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.xmodel.dto;
+
+import com.chestnut.common.security.domain.BaseDTO;
+import com.chestnut.system.validator.LongId;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class UpdateXModelRequest extends BaseDTO {
+
+ @LongId
+ private Long modelId;
+}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelFieldService.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelFieldService.java
index b9c28645..d679f9c4 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelFieldService.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelFieldService.java
@@ -17,7 +17,8 @@ package com.chestnut.xmodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chestnut.xmodel.domain.XModelField;
-import com.chestnut.xmodel.dto.XModelFieldDTO;
+import com.chestnut.xmodel.dto.CreateXModelFieldRequest;
+import com.chestnut.xmodel.dto.UpdateXModelFieldRequest;
import java.util.List;
@@ -26,21 +27,21 @@ public interface IModelFieldService extends IService {
/**
* 添加元数据模型字段
*
- * @param dto
+ * @param req 元数据模型字段信息
*/
- void addModelField(XModelFieldDTO dto);
+ void addModelField(CreateXModelFieldRequest req);
/**
* 更新元数据模型字段
*
- * @param dto
+ * @param req 元数据模型字段信息
*/
- void editModelField(XModelFieldDTO dto);
+ void editModelField(UpdateXModelFieldRequest req);
/**
* 删除元数据模型字段
*
- * @param fieldIds
+ * @param fieldIds 元数据模型字段ID列表
*/
void deleteModelField(List fieldIds);
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelService.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelService.java
index 02573521..46285a84 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelService.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/IModelService.java
@@ -15,12 +15,13 @@
*/
package com.chestnut.xmodel.service;
-import java.util.List;
-
import com.baomidou.mybatisplus.extension.service.IService;
import com.chestnut.xmodel.core.MetaModel;
import com.chestnut.xmodel.domain.XModel;
-import com.chestnut.xmodel.dto.XModelDTO;
+import com.chestnut.xmodel.dto.CreateXModelRequest;
+import com.chestnut.xmodel.dto.UpdateXModelRequest;
+
+import java.util.List;
public interface IModelService extends IService {
@@ -30,7 +31,7 @@ public interface IModelService extends IService {
* @param dto
* @return
*/
- void addModel(XModelDTO dto);
+ void addModel(CreateXModelRequest dto);
/**
* 编辑扩展模型
@@ -38,7 +39,7 @@ public interface IModelService extends IService {
* @param dto
* @return
*/
- void editModel(XModelDTO dto);
+ void editModel(UpdateXModelRequest dto);
/**
* 删除扩展模型
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelFieldServiceImpl.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelFieldServiceImpl.java
index 7fc978d6..a52adab8 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelFieldServiceImpl.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelFieldServiceImpl.java
@@ -18,17 +18,17 @@ package com.chestnut.xmodel.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chestnut.common.db.DBService;
-import com.chestnut.common.exception.CommonErrorCode;
import com.chestnut.common.db.domain.DBTable;
+import com.chestnut.common.exception.CommonErrorCode;
import com.chestnut.common.utils.ArrayUtils;
import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.IdUtils;
-import com.chestnut.common.utils.StringUtils;
import com.chestnut.xmodel.core.IMetaModelType;
import com.chestnut.xmodel.core.MetaModelField;
import com.chestnut.xmodel.domain.XModel;
import com.chestnut.xmodel.domain.XModelField;
-import com.chestnut.xmodel.dto.XModelFieldDTO;
+import com.chestnut.xmodel.dto.CreateXModelFieldRequest;
+import com.chestnut.xmodel.dto.UpdateXModelFieldRequest;
import com.chestnut.xmodel.exception.MetaErrorCode;
import com.chestnut.xmodel.fixed.dict.MetaFieldType;
import com.chestnut.xmodel.mapper.XModelFieldMapper;
@@ -52,91 +52,86 @@ public class ModelFieldServiceImpl extends ServiceImpl CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("modelId", dto.getModelId()));
+ public void addModelField(CreateXModelFieldRequest req) {
+ XModel model = this.modelService.getById(req.getModelId());
+ Assert.notNull(model, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("modelId", req.getModelId()));
+ this.checkFieldCodeUnique(req.getModelId(), req.getCode(), null);
- dto.setFieldId(null);
- if (!this.checkFieldCodeUnique(dto)) {
- throw CommonErrorCode.DATA_CONFLICT.exception("code");
- }
IMetaModelType mmt = XModelUtils.getMetaModelType(model.getOwnerType());
boolean isDefaultTable = mmt.getDefaultTable().equals(model.getTableName());
- String[] usedFields = this.getUsedFields(model.getModelId(), dto.getFieldType(), isDefaultTable);
+ String[] usedFields = this.getUsedFields(model.getModelId(), req.getFieldType(), isDefaultTable);
if (isDefaultTable) {
- int fieldTypeLimit = MetaFieldType.getFieldTypeLimit(dto.getFieldType());
+ int fieldTypeLimit = MetaFieldType.getFieldTypeLimit(req.getFieldType());
Assert.isTrue(fieldTypeLimit > usedFields.length,
- () -> MetaErrorCode.FIELD_LIMIT.exception(dto.getFieldType()));
+ () -> MetaErrorCode.FIELD_LIMIT.exception(req.getFieldType()));
for (int i = 1; i <= fieldTypeLimit; i++) {
- if (!ArrayUtils.contains(dto.getFieldType() + i, usedFields)) {
- dto.setFieldName(dto.getFieldType() + i);
+ if (!ArrayUtils.contains(req.getFieldType() + i, usedFields)) {
+ req.setFieldName(req.getFieldType() + i);
break;
}
}
} else {
List fixedFields = mmt.getFixedFields().stream().map(MetaModelField::getFieldName).toList();
- if (fixedFields.contains(dto.getFieldName())) {
- throw MetaErrorCode.META_FIELD_CONFLICT.exception(dto.getFieldName());
+ if (fixedFields.contains(req.getFieldName())) {
+ throw MetaErrorCode.META_FIELD_CONFLICT.exception(req.getFieldName());
}
- if (ArrayUtils.contains(dto.getFieldName(), usedFields)) {
- throw MetaErrorCode.META_FIELD_CONFLICT.exception(dto.getFieldName());
+ if (ArrayUtils.contains(req.getFieldName(), usedFields)) {
+ throw MetaErrorCode.META_FIELD_CONFLICT.exception(req.getFieldName());
}
- if (!isTableContainsColumn(model.getTableName(), dto.getFieldName())) {
- throw MetaErrorCode.DB_FIELD_NOT_EXISTS.exception(dto.getFieldName());
+ if (!isTableContainsColumn(model.getTableName(), req.getFieldName())) {
+ throw MetaErrorCode.DB_FIELD_NOT_EXISTS.exception(req.getFieldName());
}
}
XModelField xModelField = new XModelField();
- BeanUtils.copyProperties(dto, xModelField, "fieldId");
+ BeanUtils.copyProperties(req, xModelField);
xModelField.setFieldId(IdUtils.getSnowflakeId());
- xModelField.createBy(dto.getOperator().getUsername());
+ xModelField.createBy(req.getOperator().getUsername());
this.save(xModelField);
this.modelService.clearMetaModelCache(model.getModelId());
}
@Override
- public void editModelField(XModelFieldDTO dto) {
- XModelField modelField = this.getById(dto.getFieldId());
- Assert.notNull(modelField, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("fieldId", dto.getFieldId()));
+ public void editModelField(UpdateXModelFieldRequest req) {
+ XModelField modelField = this.getById(req.getFieldId());
+ Assert.notNull(modelField, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("fieldId", req.getFieldId()));
+ this.checkFieldCodeUnique(req.getModelId(), req.getCode(), req.getFieldId());
- if (!this.checkFieldCodeUnique(dto)) {
- throw CommonErrorCode.DATA_CONFLICT.exception("code");
- }
String oldFieldName = modelField.getFieldName();
String oldFieldType = modelField.getFieldType();
- XModel model = this.modelService.getById(dto.getModelId());
+ XModel model = this.modelService.getById(modelField.getModelId());
IMetaModelType mmt = XModelUtils.getMetaModelType(model.getOwnerType());
boolean isDefaultTable = mmt.getDefaultTable().equals(model.getTableName());
- if (isDefaultTable && !dto.getFieldType().equals(oldFieldType)) {
+ if (isDefaultTable && !req.getFieldType().equals(oldFieldType)) {
// 字段种类变更，重新计算是否有可用字段
- String[] usedFields = this.getUsedFields(model.getModelId(), dto.getFieldType(), true);
- int fieldTypeLimit = MetaFieldType.getFieldTypeLimit(dto.getFieldType());
+ String[] usedFields = this.getUsedFields(model.getModelId(), req.getFieldType(), true);
+ int fieldTypeLimit = MetaFieldType.getFieldTypeLimit(req.getFieldType());
Assert.isTrue(fieldTypeLimit > usedFields.length,
- () -> MetaErrorCode.FIELD_LIMIT.exception(dto.getFieldType()));
+ () -> MetaErrorCode.FIELD_LIMIT.exception(req.getFieldType()));
for (int i = 1; i <= fieldTypeLimit; i++) {
- if (!ArrayUtils.contains(dto.getFieldType() + i, usedFields)) {
- dto.setFieldName(dto.getFieldType() + i);
+ if (!ArrayUtils.contains(req.getFieldType() + i, usedFields)) {
+ req.setFieldName(req.getFieldType() + i);
break;
}
}
- } else if (!isDefaultTable && !dto.getFieldName().equals(oldFieldName)) {
+ } else if (!isDefaultTable && !req.getFieldName().equals(oldFieldName)) {
List fixedFields = mmt.getFixedFields().stream().map(MetaModelField::getFieldName).toList();
- if (fixedFields.contains(dto.getFieldName())) {
- throw MetaErrorCode.META_FIELD_CONFLICT.exception(dto.getFieldName());
+ if (fixedFields.contains(req.getFieldName())) {
+ throw MetaErrorCode.META_FIELD_CONFLICT.exception(req.getFieldName());
}
- String[] usedFields = this.getUsedFields(model.getModelId(), dto.getFieldType(), false);
- if (ArrayUtils.contains(dto.getFieldName(), usedFields)) {
- throw MetaErrorCode.META_FIELD_CONFLICT.exception(dto.getFieldName());
+ String[] usedFields = this.getUsedFields(model.getModelId(), req.getFieldType(), false);
+ if (ArrayUtils.contains(req.getFieldName(), usedFields)) {
+ throw MetaErrorCode.META_FIELD_CONFLICT.exception(req.getFieldName());
}
- if (!isTableContainsColumn(model.getTableName(), dto.getFieldName())) {
- throw MetaErrorCode.DB_FIELD_NOT_EXISTS.exception(dto.getFieldName());
+ if (!isTableContainsColumn(model.getTableName(), req.getFieldName())) {
+ throw MetaErrorCode.DB_FIELD_NOT_EXISTS.exception(req.getFieldName());
}
}
- BeanUtils.copyProperties(dto, modelField, "fieldId", "modelId");
- modelField.updateBy(dto.getOperator().getUsername());
+ BeanUtils.copyProperties(req, modelField, "modelId");
+ modelField.updateBy(req.getOperator().getUsername());
this.updateById(modelField);
this.modelService.clearMetaModelCache(model.getModelId());
@@ -185,11 +180,11 @@ public class ModelFieldServiceImpl extends ServiceImpl q = new LambdaQueryWrapper()
- .eq(XModelField::getModelId, dto.getModelId())
- .eq(XModelField::getCode, dto.getCode())
- .ne(dto.getFieldId() != null && dto.getFieldId() > 0, XModelField::getFieldId, dto.getFieldId());
- return this.count(q) == 0;
+ .eq(XModelField::getModelId, modelId)
+ .eq(XModelField::getCode, code)
+ .ne(IdUtils.validate(fieldId), XModelField::getFieldId, fieldId);
+ Assert.isTrue(this.count(q) == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("code"));
}
}
diff --git a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelServiceImpl.java b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelServiceImpl.java
index fe6225c6..1a05eb4f 100644
--- a/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelServiceImpl.java
+++ b/chestnut-modules/chestnut-meta/src/main/java/com/chestnut/xmodel/service/impl/ModelServiceImpl.java
@@ -33,7 +33,8 @@ import com.chestnut.xmodel.core.MetaModelField;
import com.chestnut.xmodel.core.impl.MetaControlType_Input;
import com.chestnut.xmodel.domain.XModel;
import com.chestnut.xmodel.domain.XModelField;
-import com.chestnut.xmodel.dto.XModelDTO;
+import com.chestnut.xmodel.dto.CreateXModelRequest;
+import com.chestnut.xmodel.dto.UpdateXModelRequest;
import com.chestnut.xmodel.exception.MetaErrorCode;
import com.chestnut.xmodel.mapper.XModelFieldMapper;
import com.chestnut.xmodel.mapper.XModelMapper;
@@ -102,25 +103,25 @@ public class ModelServiceImpl extends ServiceImpl
@Override
@Transactional(rollbackFor = Exception.class)
- public void addModel(XModelDTO dto) {
- IMetaModelType mmt = XModelUtils.getMetaModelType(dto.getOwnerType());
- if (StringUtils.isEmpty(dto.getTableName())) {
- dto.setTableName(mmt.getDefaultTable());
+ public void addModel(CreateXModelRequest req) {
+ IMetaModelType mmt = XModelUtils.getMetaModelType(req.getOwnerType());
+ if (StringUtils.isEmpty(req.getTableName())) {
+ req.setTableName(mmt.getDefaultTable());
}
- if (!mmt.getDefaultTable().equalsIgnoreCase(dto.getTableName())) {
- List dbTables = this.dbService.listTables(dto.getTableName());
- Assert.isFalse(dbTables.isEmpty(), () -> MetaErrorCode.META_TABLE_NOT_EXISTS.exception(dto.getTableName()));
+ if (!mmt.getDefaultTable().equalsIgnoreCase(req.getTableName())) {
+ List dbTables = this.dbService.listTables(req.getTableName());
+ Assert.isFalse(dbTables.isEmpty(), () -> MetaErrorCode.META_TABLE_NOT_EXISTS.exception(req.getTableName()));
}
XModel model = new XModel();
- BeanUtils.copyProperties(dto, model, "modelId");
+ BeanUtils.copyProperties(req, model, "modelId");
model.setModelId(IdUtils.getSnowflakeId());
- model.createBy(dto.getOperator().getUsername());
+ model.createBy(req.getOperator().getUsername());
this.save(model);
List fixedFields = mmt.getFixedFields().stream().map(MetaModelField::getFieldName).toList();
// 自定义表直接初始化非固定字段
- if (!mmt.getDefaultTable().equalsIgnoreCase(dto.getTableName())) {
- List tables = this.dbService.listTables(dto.getTableName());
+ if (!mmt.getDefaultTable().equalsIgnoreCase(req.getTableName())) {
+ List tables = this.dbService.listTables(req.getTableName());
if (!tables.isEmpty()) {
List listTableColumn = tables.get(0).getColumns();
for (DBTableColumn column : listTableColumn) {
@@ -133,7 +134,7 @@ public class ModelServiceImpl extends ServiceImpl
field.setFieldName(column.getName());
field.setControlType(MetaControlType_Input.TYPE);
field.setDefaultValue(column.getDefaultValue());
- field.createBy(dto.getOperator().getUsername());
+ field.createBy(req.getOperator().getUsername());
this.modelFieldMapper.insert(field);
}
}
@@ -142,12 +143,12 @@ public class ModelServiceImpl extends ServiceImpl
}
@Override
- public void editModel(XModelDTO dto) {
- XModel model = this.getById(dto.getModelId());
- Assert.notNull(model, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("modelId", dto.getModelId()));
+ public void editModel(UpdateXModelRequest req) {
+ XModel model = this.getById(req.getModelId());
+ Assert.notNull(model, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("modelId", req.getModelId()));
- BeanUtils.copyProperties(dto, model, "modelId", "ownerType", "ownerId", "tableName");
- model.updateBy(dto.getOperator().getUsername());
+ BeanUtils.copyProperties(req, model, "modelId", "ownerType", "ownerId", "tableName");
+ model.updateBy(req.getOperator().getUsername());
this.updateById(model);
this.clearMetaModelCache(model.getModelId());
}
diff --git a/chestnut-modules/chestnut-meta/src/main/resources/i18n/messages_zh_TW.properties b/chestnut-modules/chestnut-meta/src/main/resources/i18n/messages_zh_TW.properties
index d7672bf2..38278b43 100644
--- a/chestnut-modules/chestnut-meta/src/main/resources/i18n/messages_zh_TW.properties
+++ b/chestnut-modules/chestnut-meta/src/main/resources/i18n/messages_zh_TW.properties
@@ -40,14 +40,15 @@ META.Validation.Regex=欄位”{0}“正則表達式校驗失敗
MONITORED.CACHE.XMODEL=元數據模型
-SYS.XMODEL_FIELD.ID=模型字段ID
+SYS.XMODEL_FIELD.ID=模型欄位ID
SYS.XMODEL_FIELD.MODEL_ID=所屬模型ID
SYS.XMODEL_FIELD.NAME=名稱
SYS.XMODEL_FIELD.CODE=編碼
SYS.XMODEL_FIELD.TYPE=類型
-SYS.XMODEL_FIELD.FIELD_NAME=數據庫字段名
-SYS.XMODEL_FIELD.CONTROL_TYPE=控件類型
+SYS.XMODEL_FIELD.FIELD_NAME=資料庫欄位名
+SYS.XMODEL_FIELD.CONTROL_TYPE=控制項類型
SYS.XMODEL_FIELD.OPTIONS=可選項
-SYS.XMODEL_FIELD.DEFAULT_VALUE=默認值
+SYS.XMODEL_FIELD.DEFAULT_VALUE=預設值
SYS.XMODEL_FIELD.VALIDATIONS=校驗規則
-SYS.XMODEL_FIELD.VALUE=字段值
+SYS.XMODEL_FIELD.VALUE=欄位值
+
diff --git a/chestnut-modules/chestnut-monitor/pom.xml b/chestnut-modules/chestnut-monitor/pom.xml
index 2719cae6..22eaa033 100644
--- a/chestnut-modules/chestnut-monitor/pom.xml
+++ b/chestnut-modules/chestnut-monitor/pom.xml
@@ -6,7 +6,7 @@
com.chestnut
chestnut-modules
- 1.5.7
+ 1.5.8
chestnut-monitor
diff --git a/chestnut-modules/chestnut-search/pom.xml b/chestnut-modules/chestnut-search/pom.xml
index 56fb58bc..1f3ee409 100644
--- a/chestnut-modules/chestnut-search/pom.xml
+++ b/chestnut-modules/chestnut-search/pom.xml
@@ -3,7 +3,7 @@
chestnut-modules
com.chestnut
- 1.5.7
+ 1.5.8
4.0.0
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/DictWordController.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/DictWordController.java
index 9e064f0e..14adf0ef 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/DictWordController.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/DictWordController.java
@@ -28,15 +28,17 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.security.web.PageRequest;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.search.domain.DictWord;
-import com.chestnut.search.domain.dto.DictWordDTO;
-import com.chestnut.search.domain.dto.WordAnalyzeDTO;
+import com.chestnut.search.domain.dto.CreateDictWordRequest;
+import com.chestnut.search.domain.dto.WordAnalyzeRequest;
+import com.chestnut.search.fixed.dict.SearchDictWordType;
import com.chestnut.search.service.IDictWordService;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
-import jakarta.servlet.http.HttpServletRequest;
+import com.chestnut.system.validator.Dict;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -55,7 +57,7 @@ public class DictWordController extends BaseRestController {
@Priv(type = AdminUserType.TYPE)
@GetMapping
- public R getPageList(@RequestParam(value = "query", required = false) String query) {
+ public R getPageList(@RequestParam(required = false) @Length(max = 100) String query) {
PageRequest pr = this.getPageRequest();
LambdaQueryWrapper q = new LambdaQueryWrapper().like(StringUtils.isNotEmpty(query),
DictWord::getWord, query);
@@ -66,9 +68,8 @@ public class DictWordController extends BaseRestController {
@Log(title = "新增检索词", businessType = BusinessType.UPDATE)
@Priv(type = AdminUserType.TYPE)
@PostMapping
- public R add(@RequestBody @Validated DictWordDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.dictWordService.batchAddDictWords(dto);
+ public R add(@RequestBody @Validated CreateDictWordRequest req) {
+ this.dictWordService.batchAddDictWords(req);
return R.ok();
}
@@ -82,12 +83,9 @@ public class DictWordController extends BaseRestController {
/**
* 检查词库是否有变更
- *
- * @param request
- * @param response
*/
@RequestMapping(value = "/ik/{type}", method = RequestMethod.HEAD)
- public void checkDictNewest(@PathVariable("type") @NotEmpty String type, HttpServletRequest request,
+ public void checkDictNewest(@PathVariable("type") @NotEmpty String type,
HttpServletResponse response) {
String lastModified = this.dictWordService.getLastModified(type);
response.setHeader("Last-Modified", StringUtils.isEmpty(lastModified) ? "0" : lastModified);
@@ -99,7 +97,7 @@ public class DictWordController extends BaseRestController {
* @return 词库字符串，每行一个词
*/
@RequestMapping(value = "/ik/{type}", method = RequestMethod.GET, produces = { "text/html;charset=utf-8" })
- public String dictNewest(@PathVariable("type") @NotEmpty String type) {
+ public String dictNewest(@PathVariable("type") @NotBlank @Dict(SearchDictWordType.TYPE) String type) {
String words = this.dictWordService.lambdaQuery().eq(DictWord::getWordType, type).list().stream()
.map(DictWord::getWord).collect(Collectors.joining("\n"));
return words;
@@ -109,8 +107,8 @@ public class DictWordController extends BaseRestController {
* 分词测试
*/
@PostMapping("/analyze")
- public R wordAnalyze(@RequestBody WordAnalyzeDTO dto) throws IOException {
- AnalyzeRequest analyzeRequest = new AnalyzeRequest.Builder().analyzer(dto.getType()).text(dto.getText()).build();
+ public R wordAnalyze(@RequestBody WordAnalyzeRequest req) throws IOException {
+ AnalyzeRequest analyzeRequest = new AnalyzeRequest.Builder().analyzer(req.getType()).text(req.getText()).build();
AnalyzeResponse analyzeResponse = this.esClient.indices().analyze(analyzeRequest);
String result = analyzeResponse.tokens().stream().map(
token -> token.token() + "/" + token.type()
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java
index 431cff2f..f54b2d28 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchLogController.java
@@ -28,6 +28,7 @@ import com.chestnut.search.service.ISearchLogService;
import com.chestnut.system.security.AdminUserType;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -41,7 +42,7 @@ public class SearchLogController extends BaseRestController {
@Priv(type = AdminUserType.TYPE)
@GetMapping
- public R getPageList(@RequestParam(value = "query", required = false) String query) {
+ public R getPageList(@RequestParam(required = false) @Length(max = 255) String query) {
PageRequest pr = this.getPageRequest();
Page page = this.searchLogService.lambdaQuery()
.like(StringUtils.isNotEmpty(query), SearchLog::getWord, query)
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java
index a64c3af7..b715fb9a 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/controller/SearchWordController.java
@@ -26,14 +26,18 @@ import com.chestnut.common.utils.DateUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.search.domain.SearchWord;
import com.chestnut.search.domain.SearchWordHourStat;
-import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+import com.chestnut.search.domain.dto.CreateSearchWordRequest;
+import com.chestnut.search.domain.dto.SearchWordToppingRequest;
+import com.chestnut.search.domain.dto.UpdateSearchWordRequest;
import com.chestnut.search.service.ISearchWordHourStatService;
import com.chestnut.search.service.ISearchWordService;
import com.chestnut.system.security.AdminUserType;
import com.chestnut.system.security.StpAdminUtil;
-import jakarta.validation.constraints.Min;
+import com.chestnut.system.validator.LongId;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -51,7 +55,7 @@ public class SearchWordController extends BaseRestController {
private final ISearchWordHourStatService searchWordHourStatService;
@GetMapping
- public R getPageList(@RequestParam(value = "query", required = false) String query) {
+ public R getPageList(@RequestParam(required = false) @Length(max = 255) String query) {
PageRequest pr = this.getPageRequest();
Page page = this.searchWordStatService.lambdaQuery()
.like(StringUtils.isNotEmpty(query), SearchWord::getWord, query)
@@ -62,7 +66,7 @@ public class SearchWordController extends BaseRestController {
@GetMapping("/trend")
public R getTrendStatData(
- @RequestParam @Min(1) Long wordId,
+ @RequestParam @LongId Long wordId,
@RequestParam LocalDateTime beginTime,
@RequestParam LocalDateTime endTime
) {
@@ -96,25 +100,22 @@ public class SearchWordController extends BaseRestController {
@Log(title = "新增搜索词", businessType = BusinessType.INSERT)
@PostMapping
- public R addWord(@RequestBody SearchWord wordStat) {
- wordStat.createBy(StpAdminUtil.getLoginUser().getUsername());
- this.searchWordStatService.addWord(wordStat);
+ public R addWord(@RequestBody CreateSearchWordRequest req) {
+ this.searchWordStatService.addWord(req);
return R.ok();
}
@Log(title = "编辑搜索词", businessType = BusinessType.UPDATE)
@PutMapping
- public R editWord(@RequestBody SearchWord wordStat) {
- wordStat.updateBy(StpAdminUtil.getLoginUser().getUsername());
- this.searchWordStatService.editWord(wordStat);
+ public R editWord(@RequestBody @Validated UpdateSearchWordRequest req) {
+ this.searchWordStatService.editWord(req);
return R.ok();
}
@Log(title = "编辑搜索词", businessType = BusinessType.UPDATE)
@PutMapping("/set_top")
- public R setTop(@RequestBody SearchWordToppingDTO dto) {
- dto.setOperator(StpAdminUtil.getLoginUser());
- this.searchWordStatService.setTop(dto);
+ public R setTop(@RequestBody SearchWordToppingRequest req) {
+ this.searchWordStatService.setTop(req);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/DictWordDTO.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateDictWordRequest.java
similarity index 79%
rename from chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/DictWordDTO.java
rename to chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateDictWordRequest.java
index 0dc0e52c..21c5f2ca 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/DictWordDTO.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateDictWordRequest.java
@@ -15,19 +15,22 @@
*/
package com.chestnut.search.domain.dto;
-import java.util.List;
-
import com.chestnut.common.security.domain.BaseDTO;
-
+import com.chestnut.search.fixed.dict.SearchDictWordType;
+import com.chestnut.system.validator.Dict;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
import lombok.Setter;
+import java.util.List;
+
@Getter
@Setter
-public class DictWordDTO extends BaseDTO {
+public class CreateDictWordRequest extends BaseDTO {
- @NotEmpty
+ @NotBlank
+ @Dict(SearchDictWordType.TYPE)
private String wordType;
/**
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchLogDTO.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateSearchWordRequest.java
similarity index 66%
rename from chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchLogDTO.java
rename to chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateSearchWordRequest.java
index c1ebebc0..b6421a91 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchLogDTO.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/CreateSearchWordRequest.java
@@ -15,41 +15,38 @@
*/
package com.chestnut.search.domain.dto;
+import com.chestnut.common.security.domain.BaseDTO;
+import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
-import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
-import java.time.LocalDateTime;
-
+/**
+ * CreateSearchWordRequest
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
@Getter
@Setter
-public class SearchLogDTO {
+public class CreateSearchWordRequest extends BaseDTO {
- /**
+ /**
* 搜索词
*/
- @NotBlank
+ @NotBlank
+ @Length(max = 255)
private String word;
-
- /**
- * Header:UserAgent
- */
- private String userAgent;
-
- /**
- * IP地址
- */
- private String ip;
- private String location;
-
/**
- * Header:Referer
+ * 历史总搜索次数
*/
- private String referer;
-
- private LocalDateTime logTime;
+ @Min(0)
+ private Long searchTotal;
+ /**
+ * 来源标识，例如：cms:siteId
+ */
private String source;
-}
\ No newline at end of file
+}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingRequest.java
similarity index 94%
rename from chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java
rename to chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingRequest.java
index e543a5c8..e6f355e3 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingDTO.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/SearchWordToppingRequest.java
@@ -25,7 +25,7 @@ import java.util.List;
@Getter
@Setter
-public class SearchWordToppingDTO extends BaseDTO {
+public class SearchWordToppingRequest extends BaseDTO {
/**
* 搜索词IDs
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/UpdateSearchWordRequest.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/UpdateSearchWordRequest.java
new file mode 100644
index 00000000..aae3466c
--- /dev/null
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/UpdateSearchWordRequest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022-2025 兮玥(190785909@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.chestnut.search.domain.dto;
+
+import com.chestnut.system.validator.LongId;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * UpdateSearchWordRequest
+ *
+ * @author 兮玥
+ * @email 190785909@qq.com
+ */
+@Getter
+@Setter
+public class UpdateSearchWordRequest extends CreateSearchWordRequest {
+
+ @LongId
+ private Long wordId;
+}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeDTO.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeRequest.java
similarity index 88%
rename from chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeDTO.java
rename to chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeRequest.java
index 72741691..889ce34a 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeDTO.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/domain/dto/WordAnalyzeRequest.java
@@ -15,17 +15,17 @@
*/
package com.chestnut.search.domain.dto;
-import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
-public class WordAnalyzeDTO {
+public class WordAnalyzeRequest {
- @NotEmpty
+ @NotBlank
private String type;
- @NotEmpty
+ @NotBlank
private String text;
}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/IDictWordService.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/IDictWordService.java
index 8ca8d604..01259c72 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/IDictWordService.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/IDictWordService.java
@@ -15,11 +15,11 @@
*/
package com.chestnut.search.service;
-import java.util.List;
-
import com.baomidou.mybatisplus.extension.service.IService;
import com.chestnut.search.domain.DictWord;
-import com.chestnut.search.domain.dto.DictWordDTO;
+import com.chestnut.search.domain.dto.CreateDictWordRequest;
+
+import java.util.List;
public interface IDictWordService extends IService {
@@ -31,16 +31,14 @@ public interface IDictWordService extends IService {
/**
* 批量导入词库新词
*
- * @param words
- * @return
+ * @param req 新词
*/
- void batchAddDictWords(DictWordDTO dto);
+ void batchAddDictWords(CreateDictWordRequest req);
/**
* 删除词库新词
*
- * @param dictWordIds
- * @return
+ * @param dictWordIds 词库ID列表
*/
void deleteDictWord(List dictWordIds);
}
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchLogService.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchLogService.java
index bac4132c..05d6be48 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchLogService.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchLogService.java
@@ -17,18 +17,9 @@ package com.chestnut.search.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chestnut.search.domain.SearchLog;
-import com.chestnut.search.domain.dto.SearchLogDTO;
import jakarta.servlet.http.HttpServletRequest;
public interface ISearchLogService extends IService {
- /**
- * 添加搜索日志
- *
- * @param dto
- * @return
- */
- void addSearchLog(SearchLogDTO dto);
-
void addSearchLog(String source, String query, HttpServletRequest request);
}
\ No newline at end of file
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java
index 7653ef44..5bfe55ad 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/ISearchWordService.java
@@ -17,7 +17,9 @@ package com.chestnut.search.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chestnut.search.domain.SearchWord;
-import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+import com.chestnut.search.domain.dto.CreateSearchWordRequest;
+import com.chestnut.search.domain.dto.SearchWordToppingRequest;
+import com.chestnut.search.domain.dto.UpdateSearchWordRequest;
import java.util.List;
@@ -31,12 +33,12 @@ public interface ISearchWordService extends IService {
/**
* 创建搜索词数据
*/
- void addWord(SearchWord word);
+ void addWord(CreateSearchWordRequest req);
/**
* 编辑搜索词数据
*/
- void editWord(SearchWord word);
+ void editWord(UpdateSearchWordRequest req);
/**
* 删除搜索词数据
@@ -46,7 +48,7 @@ public interface ISearchWordService extends IService {
/**
* 搜索词置顶
*/
- void setTop(SearchWordToppingDTO dto);
+ void setTop(SearchWordToppingRequest dto);
/**
* 搜索词取消置顶
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/DictWordServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/DictWordServiceImpl.java
index 08b77a3d..9070696a 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/DictWordServiceImpl.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/DictWordServiceImpl.java
@@ -21,7 +21,7 @@ import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.IdUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.search.domain.DictWord;
-import com.chestnut.search.domain.dto.DictWordDTO;
+import com.chestnut.search.domain.dto.CreateDictWordRequest;
import com.chestnut.search.exception.SearchErrorCode;
import com.chestnut.search.mapper.DictWordMapper;
import com.chestnut.search.service.IDictWordService;
@@ -46,9 +46,9 @@ public class DictWordServiceImpl extends ServiceImpl i
private final RedisCache redisCache;
@Override
- public void batchAddDictWords(DictWordDTO dto) {
+ public void batchAddDictWords(CreateDictWordRequest req) {
List dictWords = new ArrayList<>();
- for (String word : dto.getWords()) {
+ for (String word : req.getWords()) {
if (StringUtils.isBlank(word)) {
continue;
}
@@ -57,13 +57,13 @@ public class DictWordServiceImpl extends ServiceImpl i
DictWord dictWord = new DictWord();
dictWord.setWordId(IdUtils.getSnowflakeId());
- dictWord.setWordType(dto.getWordType());
+ dictWord.setWordType(req.getWordType());
dictWord.setWord(word);
- dictWord.createBy(dto.getOperator().getUsername());
+ dictWord.createBy(req.getOperator().getUsername());
dictWords.add(dictWord);
}
this.saveBatch(dictWords);
- this.redisCache.setCacheObject(MODIFY_CACHE_KEY + dto.getWordType(), LocalDateTime.now().format(FORMATTER));
+ this.redisCache.setCacheObject(MODIFY_CACHE_KEY + req.getWordType(), LocalDateTime.now().format(FORMATTER));
}
@Override
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
index a1ab6919..c4c9effd 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchLogServiceImpl.java
@@ -22,7 +22,6 @@ import com.chestnut.common.utils.IdUtils;
import com.chestnut.common.utils.ServletUtils;
import com.chestnut.search.domain.SearchLog;
import com.chestnut.search.domain.SearchWord;
-import com.chestnut.search.domain.dto.SearchLogDTO;
import com.chestnut.search.mapper.SearchLogMapper;
import com.chestnut.search.service.ISearchLogService;
import com.chestnut.search.service.ISearchWordHourStatService;
@@ -43,27 +42,6 @@ public class SearchLogServiceImpl extends ServiceImpl {
- SearchLog sLog = new SearchLog();
- sLog.setLogId(IdUtils.getSnowflakeId());
- sLog.setWord(dto.getWord());
- sLog.setIp(dto.getIp());
- sLog.setLocation(IP2RegionUtils.ip2Region(dto.getIp()));
- sLog.setLogTime(dto.getLogTime());
- sLog.setUserAgent(dto.getUserAgent());
- sLog.setReferer(dto.getReferer());
- sLog.setSource(dto.getSource());
- sLog.setClientType(ServletUtils.getDeviceType(dto.getUserAgent()));
- this.save(sLog);
-
- SearchWord searchWord = searchWordStatService.getSearchWord(sLog.getWord(), sLog.getSource());
- searchWordStatService.increaseSearchCount(searchWord);
- searchWordHourStatService.handleSearchLog(searchWord, sLog.getLogTime());
- });
- }
-
@Override
public void addSearchLog(String source, String query, HttpServletRequest request) {
final String userAgent = ServletUtils.getUserAgent(request);
diff --git a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java
index 87de6dca..92308883 100644
--- a/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java
+++ b/chestnut-modules/chestnut-search/src/main/java/com/chestnut/search/service/impl/SearchWordServiceImpl.java
@@ -25,7 +25,9 @@ import com.chestnut.common.utils.IdUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.search.domain.SearchWord;
import com.chestnut.search.domain.SearchWordHourStat;
-import com.chestnut.search.domain.dto.SearchWordToppingDTO;
+import com.chestnut.search.domain.dto.CreateSearchWordRequest;
+import com.chestnut.search.domain.dto.SearchWordToppingRequest;
+import com.chestnut.search.domain.dto.UpdateSearchWordRequest;
import com.chestnut.search.mapper.SearchWordMapper;
import com.chestnut.search.service.ISearchWordHourStatService;
import com.chestnut.search.service.ISearchWordService;
@@ -68,27 +70,31 @@ public class SearchWordServiceImpl extends ServiceImpl CommonErrorCode.DATA_CONFLICT.exception("word"));
+ public void addWord(CreateSearchWordRequest req) {
+ Long count = this.lambdaQuery().eq(SearchWord::getWord, req.getWord()).count();
+ Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("req"));
- word.setWordId(IdUtils.getSnowflakeId());
- word.setTopFlag(0L);
- this.save(word);
+ SearchWord searchWord = new SearchWord();
+ searchWord.setWordId(IdUtils.getSnowflakeId());
+ searchWord.setTopFlag(0L);
+ searchWord.setWord(req.getWord());
+ searchWord.setSearchTotal(req.getSearchTotal());
+ searchWord.createBy(req.getOperator().getUsername());
+ this.save(searchWord);
}
@Override
- public void editWord(SearchWord word) {
- Long count = this.lambdaQuery().eq(SearchWord::getWord, word.getWord())
- .ne(SearchWord::getWord, word.getWord()).count();
- Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("word"));
+ public void editWord(UpdateSearchWordRequest req) {
+ Long count = this.lambdaQuery().eq(SearchWord::getWord, req.getWord())
+ .ne(SearchWord::getWord, req.getWord()).count();
+ Assert.isTrue(count == 0, () -> CommonErrorCode.DATA_CONFLICT.exception("req"));
- SearchWord dbWord = this.getById(word.getWordId());
- dbWord.setWord(word.getWord());
- dbWord.setSearchTotal(word.getSearchTotal());
- dbWord.setTopFlag(word.getTopFlag());
- dbWord.setTopDate(word.getTopDate());
- dbWord.updateBy(word.getUpdateBy());
+ SearchWord dbWord = this.getById(req.getWordId());
+ Assert.notNull(dbWord, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception("wordId", req.getWordId()));
+
+ dbWord.setWord(req.getWord());
+ dbWord.setSearchTotal(req.getSearchTotal());
+ dbWord.updateBy(req.getOperator().getUsername());
this.updateById(dbWord);
}
@@ -104,12 +110,12 @@ public class SearchWordServiceImpl extends ServiceImpl wordStats = this.listByIds(dto.getWordIds());
+ public void setTop(SearchWordToppingRequest req) {
+ List wordStats = this.listByIds(req.getWordIds());
for (SearchWord wordStat : wordStats) {
wordStat.setTopFlag(Instant.now().toEpochMilli());
- wordStat.setTopDate(dto.getTopEndTime());
- wordStat.updateBy(dto.getOperator().getUsername());
+ wordStat.setTopDate(req.getTopEndTime());
+ wordStat.updateBy(req.getOperator().getUsername());
}
this.updateBatchById(wordStats);
}
diff --git a/chestnut-modules/chestnut-stat/pom.xml b/chestnut-modules/chestnut-stat/pom.xml
index 813aba66..91016c98 100644
--- a/chestnut-modules/chestnut-stat/pom.xml
+++ b/chestnut-modules/chestnut-stat/pom.xml
@@ -6,7 +6,7 @@
chestnut-modules
com.chestnut
- 1.5.7
+ 1.5.8
4.0.0
diff --git a/chestnut-modules/chestnut-stat/src/main/java/com/chestnut/stat/controller/front/StatApiController.java b/chestnut-modules/chestnut-stat/src/main/java/com/chestnut/stat/controller/front/StatApiController.java
index bdca4c80..ffcd3aa6 100644
--- a/chestnut-modules/chestnut-stat/src/main/java/com/chestnut/stat/controller/front/StatApiController.java
+++ b/chestnut-modules/chestnut-stat/src/main/java/com/chestnut/stat/controller/front/StatApiController.java
@@ -22,7 +22,9 @@ import com.chestnut.common.utils.StringUtils;
import com.chestnut.stat.core.StatEvent;
import com.chestnut.stat.service.impl.StatEventService;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Length;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -45,7 +47,7 @@ public class StatApiController extends BaseRestController {
* 统计API
*/
@GetMapping("/api/stat/evt")
- public void statEvent(@RequestParam("t") String type, @RequestParam(required = false) String data) {
+ public void statEvent(@RequestParam("t") @NotBlank @Length(max = 20) String type, @RequestParam(required = false) String data) {
StatEvent evt = new StatEvent();
evt.setType(type);
if (StringUtils.isNotEmpty(data)) {
diff --git a/chestnut-modules/chestnut-system/pom.xml b/chestnut-modules/chestnut-system/pom.xml
index ef5aed01..dd4b4b90 100644
--- a/chestnut-modules/chestnut-system/pom.xml
+++ b/chestnut-modules/chestnut-system/pom.xml
@@ -5,7 +5,7 @@
chestnut-modules
com.chestnut
- 1.5.7
+ 1.5.8
4.0.0
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/CacheController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/CacheController.java
index d39ee417..c2d44888 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/CacheController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/CacheController.java
@@ -24,13 +24,14 @@ import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.JacksonUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysCache;
-import com.chestnut.system.domain.dto.ClearCacheDTO;
+import com.chestnut.system.domain.dto.ClearCacheRequest;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
import jakarta.validation.constraints.NotBlank;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.RedisCallback;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -87,7 +88,7 @@ public class CacheController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.MonitorCacheList)
@GetMapping("/getKeys/{monitoredId}")
- public R getCacheKeys(@PathVariable String monitoredId) {
+ public R getCacheKeys(@PathVariable @NotBlank String monitoredId) {
IMonitoredCache iMonitoredCache = this.monitoredCaches.get(IMonitoredCache.BEAN_PREFIX + monitoredId);
Assert.notNull(iMonitoredCache, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception(monitoredId));
@@ -122,7 +123,7 @@ public class CacheController {
IMonitoredCache iMonitoredCache = this.monitoredCaches.get(IMonitoredCache.BEAN_PREFIX + monitoredId);
Assert.notNull(iMonitoredCache, () -> CommonErrorCode.DATA_NOT_FOUND_BY_ID.exception(monitoredId));
Collection cacheKeys = redisTemplate.keys(iMonitoredCache.getCacheKey() + "*");
- if (Objects.nonNull(cacheKeys)) {
+ if (StringUtils.isNotEmpty(cacheKeys)) {
redisTemplate.delete(cacheKeys);
}
return R.ok();
@@ -130,7 +131,7 @@ public class CacheController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.MonitorCacheClear)
@PostMapping("/clearCacheKey")
- public R clearCacheKey(@RequestBody ClearCacheDTO dto) {
+ public R clearCacheKey(@RequestBody @Validated ClearCacheRequest dto) {
redisTemplate.delete(dto.getCacheKey());
return R.ok();
}
@@ -139,7 +140,7 @@ public class CacheController {
@PostMapping("/clearCacheAll")
public R clearCacheAll() {
Collection cacheKeys = redisTemplate.keys("*");
- if (Objects.nonNull(cacheKeys)) {
+ if (StringUtils.isNotEmpty(cacheKeys)) {
redisTemplate.delete(cacheKeys);
}
return R.ok();
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/LogController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/LogController.java
index c2e7ad02..52a0b19a 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/LogController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/LogController.java
@@ -39,7 +39,7 @@ public class LogController extends BaseRestController {
@Priv(type = AdminUserType.TYPE)
@GetMapping
- public R getMenus() throws Exception {
+ public R getMenus() {
return this.bindDataTable(this.logMenus);
}
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysConfigController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysConfigController.java
index 1ebdbd11..7e4cbbe1 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysConfigController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysConfigController.java
@@ -29,12 +29,16 @@ import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.IdUtils;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysConfig;
+import com.chestnut.system.domain.dto.CreateConfigRequest;
+import com.chestnut.system.domain.dto.QueryConfigRequest;
+import com.chestnut.system.domain.dto.UpdateConfigRequest;
import com.chestnut.system.fixed.FixedConfigUtils;
import com.chestnut.system.fixed.dict.YesOrNo;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.service.ISysConfigService;
+import com.chestnut.system.validator.LongId;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -61,11 +65,10 @@ public class SysConfigController extends BaseRestController {
@ExcelExportable(SysConfig.class)
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysConfigList)
@GetMapping("/list")
- public R list(SysConfig config) {
+ public R list(@Validated QueryConfigRequest req) {
PageRequest pr = this.getPageRequest();
Page page = this.configService.lambdaQuery()
- .like(StringUtils.isNotEmpty(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
- .like(StringUtils.isNotEmpty(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
+ .like(StringUtils.isNotEmpty(req.getConfigKey()), SysConfig::getConfigKey, req.getConfigKey())
.orderByDesc(SysConfig::getConfigKey)
.page(new Page<>(pr.getPageNumber(), pr.getPageSize()));
page.getRecords().forEach(conf -> {
@@ -80,7 +83,7 @@ public class SysConfigController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysConfigList)
@GetMapping(value = "/{configId}")
- public R getInfo(@PathVariable Long configId) {
+ public R getInfo(@PathVariable @LongId Long configId) {
SysConfig config = this.configService.getById(configId);
I18nUtils.replaceI18nFields(config);
return R.ok(config);
@@ -91,7 +94,7 @@ public class SysConfigController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE)
@GetMapping(value = "/configKey/{configKey}")
- public R getConfigKey(@PathVariable String configKey) {
+ public R getConfigKey(@PathVariable @NotBlank String configKey) {
return R.ok(configService.selectConfigByKey(configKey));
}
@@ -101,9 +104,8 @@ public class SysConfigController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysConfigAdd)
@Log(title = "参数管理", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@Validated @RequestBody SysConfig config) {
- config.setCreateBy(StpAdminUtil.getLoginUser().getUsername());
- configService.insertConfig(config);
+ public R add(@Validated @RequestBody CreateConfigRequest req) {
+ configService.insertConfig(req);
return R.ok();
}
@@ -113,9 +115,8 @@ public class SysConfigController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysConfigEdit)
@Log(title = "参数管理", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@Validated @RequestBody SysConfig config) {
- config.setUpdateBy(StpAdminUtil.getLoginUser().getUsername());
- configService.updateConfig(config);
+ public R edit(@Validated @RequestBody UpdateConfigRequest req) {
+ configService.updateConfig(req);
return R.ok();
}
@@ -126,7 +127,7 @@ public class SysConfigController extends BaseRestController {
@Log(title = "参数管理", businessType = BusinessType.DELETE)
@PostMapping("/delete")
public R remove(@RequestBody @NotEmpty List configIds) {
- Assert.isTrue(IdUtils.validate(configIds), () -> CommonErrorCode.INVALID_REQUEST_ARG.exception());
+ Assert.isTrue(IdUtils.validate(configIds), CommonErrorCode.INVALID_REQUEST_ARG::exception);
configService.deleteConfigByIds(configIds);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDeptController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDeptController.java
index aff74514..1400c09f 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDeptController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDeptController.java
@@ -15,18 +15,6 @@
*/
package com.chestnut.system.controller;
-import java.util.List;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.chestnut.common.domain.R;
import com.chestnut.common.exception.CommonErrorCode;
@@ -37,13 +25,18 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysDept;
+import com.chestnut.system.domain.dto.CreateDeptRequest;
+import com.chestnut.system.domain.dto.QueryDeptRequest;
+import com.chestnut.system.domain.dto.UpdateDeptRequest;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.service.ISysDeptService;
import com.chestnut.system.validator.LongId;
-
import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 部门信息
@@ -63,10 +56,10 @@ public class SysDeptController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDeptList)
@GetMapping("/list")
- public R list(SysDept dept) {
+ public R list(@Validated QueryDeptRequest req) {
LambdaQueryWrapper q = new LambdaQueryWrapper()
- .like(StringUtils.isNotEmpty(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
- .eq(StringUtils.isNotEmpty(dept.getStatus()), SysDept::getStatus, dept.getStatus())
+ .like(StringUtils.isNotEmpty(req.getDeptName()), SysDept::getDeptName, req.getDeptName())
+ .eq(StringUtils.isNotEmpty(req.getStatus()), SysDept::getStatus, req.getStatus())
.orderByAsc(SysDept::getParentId).orderByAsc(SysDept::getOrderNum);
List list = deptService.list(q);
return bindDataTable(list);
@@ -90,9 +83,8 @@ public class SysDeptController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDeptAdd)
@Log(title = "部门管理", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@Validated @RequestBody SysDept dept) {
- dept.setCreateBy(StpAdminUtil.getLoginUser().getUsername());
- deptService.insertDept(dept);
+ public R add(@Validated @RequestBody CreateDeptRequest req) {
+ deptService.insertDept(req);
return R.ok();
}
@@ -102,9 +94,8 @@ public class SysDeptController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDeptEdit)
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@Validated @RequestBody SysDept dept) {
- dept.setUpdateBy(StpAdminUtil.getLoginUser().getUsername());
- deptService.updateDept(dept);
+ public R edit(@Validated @RequestBody UpdateDeptRequest req) {
+ deptService.updateDept(req);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictDataController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictDataController.java
index 514438ad..2cd822be 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictDataController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictDataController.java
@@ -26,13 +26,17 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.security.web.PageRequest;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysDictData;
+import com.chestnut.system.domain.dto.CreateDictDataRequest;
+import com.chestnut.system.domain.dto.QueryDictDataRequest;
+import com.chestnut.system.domain.dto.UpdateDictDataRequest;
import com.chestnut.system.fixed.FixedDictUtils;
import com.chestnut.system.fixed.dict.YesOrNo;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.service.ISysDictDataService;
import com.chestnut.system.service.ISysDictTypeService;
+import com.chestnut.system.validator.LongId;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.context.i18n.LocaleContextHolder;
@@ -59,12 +63,11 @@ public class SysDictDataController extends BaseRestController {
@ExcelExportable(SysDictData.class)
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictList)
@GetMapping("/list")
- public R list(SysDictData dictData) {
+ public R list(@Validated QueryDictDataRequest req) {
PageRequest pr = this.getPageRequest();
Page page = dictDataService.lambdaQuery()
- .like(StringUtils.isNotEmpty(dictData.getDictLabel()), SysDictData::getDictLabel,
- dictData.getDictLabel())
- .eq(StringUtils.isNotEmpty(dictData.getDictType()), SysDictData::getDictType, dictData.getDictType())
+ .like(StringUtils.isNotEmpty(req.getDictValue()), SysDictData::getDictValue, req.getDictValue())
+ .eq(StringUtils.isNotEmpty(req.getDictType()), SysDictData::getDictType, req.getDictType())
.orderByAsc(SysDictData::getDictSort)
.page(new Page<>(pr.getPageNumber(), pr.getPageSize()));
page.getRecords().forEach(dt -> {
@@ -79,7 +82,7 @@ public class SysDictDataController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictList)
@GetMapping(value = "/{dictCode}")
- public R getInfo(@PathVariable Long dictCode) {
+ public R getInfo(@PathVariable @LongId Long dictCode) {
SysDictData data = dictDataService.getById(dictCode);
I18nUtils.replaceI18nFields(data);
return R.ok(data);
@@ -90,7 +93,7 @@ public class SysDictDataController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE)
@GetMapping(value = "/type/{dictType}")
- public R getDictDatasByType(@PathVariable String dictType) {
+ public R getDictDatasByType(@PathVariable @NotBlank String dictType) {
List datas = dictTypeService.selectDictDatasByType(dictType);
I18nUtils.replaceI18nFields(datas);
return R.ok(datas);
@@ -102,9 +105,8 @@ public class SysDictDataController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictAdd)
@Log(title = "字典数据", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@Validated @RequestBody SysDictData dict) {
- dict.setCreateBy(StpAdminUtil.getLoginUser().getUsername());
- dictDataService.insertDictData(dict);
+ public R add(@Validated @RequestBody CreateDictDataRequest req) {
+ dictDataService.insertDictData(req);
return R.ok();
}
@@ -114,9 +116,8 @@ public class SysDictDataController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictEdit)
@Log(title = "字典数据", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@Validated @RequestBody SysDictData dict) {
- dict.setUpdateBy(StpAdminUtil.getLoginUser().getUsername());
- dictDataService.updateDictData(dict);
+ public R edit(@Validated @RequestBody UpdateDictDataRequest req) {
+ dictDataService.updateDictData(req);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictTypeController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictTypeController.java
index 5cbf4561..41bf39b8 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictTypeController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysDictTypeController.java
@@ -26,13 +26,15 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.security.web.PageRequest;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysDictType;
+import com.chestnut.system.domain.dto.CreateDictTypeRequest;
+import com.chestnut.system.domain.dto.QueryDictTypeRequest;
+import com.chestnut.system.domain.dto.UpdateDictTypeRequest;
import com.chestnut.system.fixed.FixedDictUtils;
import com.chestnut.system.fixed.dict.YesOrNo;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
-import com.chestnut.system.security.StpAdminUtil;
import com.chestnut.system.service.ISysDictTypeService;
-import jakarta.servlet.http.HttpServletResponse;
+import com.chestnut.system.validator.LongId;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.context.i18n.LocaleContextHolder;
@@ -56,12 +58,11 @@ public class SysDictTypeController extends BaseRestController {
@ExcelExportable(SysDictType.class)
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictList)
- @GetMapping("/list")
- public R list(SysDictType dictType) {
+ @GetMapping(value = "/list")
+ public R list(@Validated QueryDictTypeRequest req) {
PageRequest pr = this.getPageRequest();
Page page = dictTypeService.lambdaQuery()
- .like(StringUtils.isNotEmpty(dictType.getDictName()), SysDictType::getDictName, dictType.getDictName())
- .like(StringUtils.isNotEmpty(dictType.getDictType()), SysDictType::getDictType, dictType.getDictType())
+ .like(StringUtils.isNotEmpty(req.getDictType()), SysDictType::getDictType, req.getDictType())
.orderByDesc(SysDictType::getDictType)
.page(new Page<>(pr.getPageNumber(), pr.getPageSize()));
page.getRecords().forEach(dt -> {
@@ -76,7 +77,7 @@ public class SysDictTypeController extends BaseRestController {
*/
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictList)
@GetMapping(value = "/{dictId}")
- public R getInfo(@PathVariable Long dictId) {
+ public R getInfo(@PathVariable @LongId Long dictId) {
SysDictType dictType = dictTypeService.getById(dictId);
I18nUtils.replaceI18nFields(dictType);
return R.ok(dictType);
@@ -88,9 +89,8 @@ public class SysDictTypeController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictAdd)
@Log(title = "字典类型", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@Validated @RequestBody SysDictType dict) {
- dict.setCreateBy(StpAdminUtil.getLoginUser().getUsername());
- dictTypeService.insertDictType(dict);
+ public R add(@Validated @RequestBody CreateDictTypeRequest req) {
+ dictTypeService.insertDictType(req);
return R.ok();
}
@@ -100,9 +100,8 @@ public class SysDictTypeController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysDictEdit)
@Log(title = "字典类型", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@Validated @RequestBody SysDictType dict) {
- dict.setUpdateBy(StpAdminUtil.getLoginUser().getUsername());
- dictTypeService.updateDictType(dict);
+ public R edit(@Validated @RequestBody UpdateDictTypeRequest req) {
+ dictTypeService.updateDictType(req);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysI18nDictController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysI18nDictController.java
index 95498a6c..f43b4969 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysI18nDictController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysI18nDictController.java
@@ -31,11 +31,17 @@ import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.config.I18nMessageSource;
import com.chestnut.system.domain.SysDictData;
import com.chestnut.system.domain.SysI18nDict;
+import com.chestnut.system.domain.dto.BatchSaveI18nDictRequest;
+import com.chestnut.system.domain.dto.CreateI18nDictRequest;
+import com.chestnut.system.domain.dto.QueryI18nDictRequest;
+import com.chestnut.system.domain.dto.UpdateI18nDictRequest;
import com.chestnut.system.fixed.dict.I18nDictType;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
import com.chestnut.system.service.ISysDictTypeService;
import com.chestnut.system.service.ISysI18nDictService;
+import com.chestnut.system.validator.LongId;
+import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.context.i18n.LocaleContextHolder;
@@ -45,7 +51,6 @@ import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.Optional;
/**
@@ -68,12 +73,12 @@ public class SysI18nDictController extends BaseRestController {
@ExcelExportable(SysI18nDict.class)
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysI18NDictList)
@GetMapping("/list")
- public R list(SysI18nDict dict) {
+ public R list(@Validated QueryI18nDictRequest req) {
PageRequest pr = this.getPageRequest();
LambdaQueryWrapper q = new LambdaQueryWrapper()
- .like(StringUtils.isNotEmpty(dict.getLangTag()), SysI18nDict::getLangTag, dict.getLangTag())
- .like(StringUtils.isNotEmpty(dict.getLangKey()), SysI18nDict::getLangKey, dict.getLangKey())
- .like(StringUtils.isNotEmpty(dict.getLangValue()), SysI18nDict::getLangValue, dict.getLangValue())
+ .like(StringUtils.isNotEmpty(req.getLangTag()), SysI18nDict::getLangTag, req.getLangTag())
+ .like(StringUtils.isNotEmpty(req.getLangKey()), SysI18nDict::getLangKey, req.getLangKey())
+ .like(StringUtils.isNotEmpty(req.getLangValue()), SysI18nDict::getLangValue, req.getLangValue())
.orderByDesc(SysI18nDict::getLangTag);
Page page = i18nDictService.page(new Page<>(pr.getPageNumber(), pr.getPageSize()), q);
return bindDataTable(page);
@@ -83,18 +88,18 @@ public class SysI18nDictController extends BaseRestController {
public R bindLanguageOptions() {
List list = dictTypeService.selectDictDatasByType(I18nDictType.TYPE);
I18nUtils.replaceI18nFields(list, LocaleContextHolder.getLocale());
- return R.ok(list.stream().map(d -> Map.of("value", d.getDictValue(), "label", d.getDictLabel())).toList());
+ return bindSelectOptions(list, SysDictData::getDictValue, SysDictData::getDictLabel);
}
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysI18NDictList)
@GetMapping(value = "/{i18nDictId}")
- public R getInfo(@PathVariable Long i18nDictId) {
+ public R getInfo(@PathVariable @LongId Long i18nDictId) {
return R.ok(this.i18nDictService.getById(i18nDictId));
}
@Priv(type = AdminUserType.TYPE)
@GetMapping(value = "/langKey/{langKey}")
- public R listByLangKey(@PathVariable @NotEmpty String langKey) {
+ public R listByLangKey(@PathVariable @NotBlank String langKey) {
LambdaQueryWrapper q = new LambdaQueryWrapper()
.eq(SysI18nDict::getLangKey, langKey);
List list = i18nDictService.list(q);
@@ -106,7 +111,7 @@ public class SysI18nDictController extends BaseRestController {
SysI18nDict d = new SysI18nDict();
d.setLangTag(data.getDictValue());
d.setLangKey(langKey);
- d.setLangValue(I18nUtils.get("{" + langKey + "}", Locale.forLanguageTag(data.getDictValue())));
+ d.setLangValue(I18nUtils.parse(langKey, Locale.forLanguageTag(data.getDictValue())));
list.add(d);
}
}
@@ -116,23 +121,23 @@ public class SysI18nDictController extends BaseRestController {
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysI18NDictAdd)
@Log(title = "国际化管理", businessType = BusinessType.INSERT)
@PostMapping
- public R add(@Validated @RequestBody SysI18nDict config) {
- i18nDictService.insertI18nDict(config);
+ public R add(@Validated @RequestBody CreateI18nDictRequest req) {
+ i18nDictService.insertI18nDict(req);
return R.ok();
}
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysI18NDictEdit)
@Log(title = "国际化管理", businessType = BusinessType.UPDATE)
@PutMapping
- public R edit(@Validated @RequestBody SysI18nDict dict) {
- i18nDictService.updateI18nDict(dict);
+ public R edit(@Validated @RequestBody UpdateI18nDictRequest req) {
+ i18nDictService.updateI18nDict(req);
return R.ok();
}
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysI18NDictEdit)
@Log(title = "国际化管理", businessType = BusinessType.UPDATE)
@PutMapping("/batch")
- public R batchSave(@RequestBody @NotEmpty @Validated List i18nDicts) {
+ public R batchSave(@RequestBody @NotEmpty @Validated List i18nDicts) {
i18nDictService.batchSaveI18nDicts(i18nDicts);
return R.ok();
}
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLoginController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLoginController.java
index 889caf95..51e7bcb6 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLoginController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLoginController.java
@@ -25,6 +25,7 @@ import com.chestnut.system.config.SystemConfig;
import com.chestnut.system.domain.SysMenu;
import com.chestnut.system.domain.SysUser;
import com.chestnut.system.domain.dto.LoginBody;
+import com.chestnut.system.domain.vo.LoginUserInfoVO;
import com.chestnut.system.fixed.dict.LoginLogType;
import com.chestnut.system.fixed.dict.SuccessOrFail;
import com.chestnut.system.security.AdminUserType;
@@ -35,6 +36,7 @@ import com.chestnut.system.service.ISysMenuService;
import com.chestnut.system.service.ISysPermissionService;
import com.chestnut.system.service.ISysRoleService;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -43,7 +45,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import java.util.Map;
/**
* 登录验证
@@ -51,6 +52,7 @@ import java.util.Map;
* @author 兮玥
* @email 190785909@qq.com
*/
+@Slf4j
@RestController
@RequiredArgsConstructor
public class SysLoginController extends BaseRestController {
@@ -76,18 +78,22 @@ public class SysLoginController extends BaseRestController {
return R.ok(token);
}
- @PostMapping("logout")
+ @PostMapping("/logout")
public void logout() {
+ if (!StpAdminUtil.isLogin()) {
+ return;
+ }
+ LoginUser loginUser = StpAdminUtil.getLoginUser();
try {
- if (StpAdminUtil.isLogin()) {
- LoginUser loginUser = StpAdminUtil.getLoginUser();
- StpAdminUtil.logout();
- this.logininfoService.recordLogininfor(loginUser.getUserType(),
- loginUser.getUserId(), loginUser.getUsername(), LoginLogType.LOGOUT, SuccessOrFail.SUCCESS,
- StringUtils.EMPTY);
- }
+ StpAdminUtil.logout();
+ this.logininfoService.recordLogininfor(loginUser.getUserType(),
+ loginUser.getUserId(), loginUser.getUsername(), LoginLogType.LOGOUT, SuccessOrFail.SUCCESS,
+ StringUtils.EMPTY);
} catch (Exception e) {
-
+ this.logininfoService.recordLogininfor(loginUser.getUserType(),
+ loginUser.getUserId(), loginUser.getUsername(), LoginLogType.LOGOUT, SuccessOrFail.FAIL,
+ e.getMessage());
+ log.error("Logout fail.", e);
}
}
@@ -97,7 +103,7 @@ public class SysLoginController extends BaseRestController {
* @return 用户信息
*/
@Priv(type = AdminUserType.TYPE)
- @GetMapping("getInfo")
+ @GetMapping("/getInfo")
public R getInfo() {
LoginUser loginUser = StpAdminUtil.getLoginUser();
SysUser user = (SysUser) loginUser.getUser();
@@ -106,7 +112,11 @@ public class SysLoginController extends BaseRestController {
List roles = this.roleService.selectRoleKeysByUserId(user.getUserId());
// 权限集合
List permissions = loginUser.getPermissions();
- return R.ok(Map.of("user", user, "roles", roles, "permissions", permissions));
+ LoginUserInfoVO vo = new LoginUserInfoVO();
+ vo.setUser(user);
+ vo.setRoles(roles);
+ vo.setPermissions(permissions);
+ return R.ok(vo);
}
/**
@@ -115,7 +125,7 @@ public class SysLoginController extends BaseRestController {
* @return 路由信息
*/
@Priv(type = AdminUserType.TYPE)
- @GetMapping("getRouters")
+ @GetMapping("/getRouters")
public R getRouters() {
List menus = this.menuService.lambdaQuery().orderByAsc(SysMenu::getOrderNum).list();
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLogininforController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLogininforController.java
index aa546833..6f338bf3 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLogininforController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysLogininforController.java
@@ -31,7 +31,6 @@ import com.chestnut.system.fixed.dict.LoginLogType;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
import com.chestnut.system.service.ISysLogininforService;
-import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -55,7 +54,7 @@ public class SysLogininforController extends BaseRestController {
@ExcelExportable(SysLogininfor.class)
@GetMapping("/list")
- public R> list(SysLogininfor logininfor, HttpServletRequest request) {
+ public R> list(SysLogininfor logininfor) {
PageRequest pr = this.getPageRequest();
LambdaQueryWrapper q = new LambdaQueryWrapper()
.like(StringUtils.isNotEmpty(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
diff --git a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
index 7e173b18..b12821e7 100644
--- a/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
+++ b/chestnut-modules/chestnut-system/src/main/java/com/chestnut/system/controller/SysMenuController.java
@@ -27,7 +27,11 @@ import com.chestnut.common.security.web.BaseRestController;
import com.chestnut.common.utils.Assert;
import com.chestnut.common.utils.StringUtils;
import com.chestnut.system.domain.SysMenu;
+import com.chestnut.system.domain.dto.CreateMenuRequest;
+import com.chestnut.system.domain.dto.QueryMenuRequest;
+import com.chestnut.system.domain.dto.UpdateMenuRequest;
import com.chestnut.system.enums.MenuType;
+import com.chestnut.system.fixed.dict.EnableOrDisable;
import com.chestnut.system.fixed.dict.YesOrNo;
import com.chestnut.system.permission.SysMenuPriv;
import com.chestnut.system.security.AdminUserType;
@@ -55,17 +59,14 @@ public class SysMenuController extends BaseRestController {
private final ISysMenuService menuService;
- private final ISysPermissionService permissionService;
-
/**
* 获取菜单列表
*/
@Priv(type = AdminUserType.TYPE, value = SysMenuPriv.SysMenuList)
@GetMapping("/list")
- public R list(SysMenu menu) {
+ public R list(@Validated QueryMenuRequest req) {
LambdaQueryWrapper