From ce7e6574a1f9942fc090d989b52aceaa11ba8f3e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 四月 2024 21:54:08 +0800
Subject: [PATCH] 1.得分计算部分调整； 2.大屏得分计算；
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
index a095d17..7ef5bc1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbBasicDataConfigController.java
@@ -11,19 +11,26 @@
import com.ruoyi.system.dto.ShowHideDTO;
import com.ruoyi.system.dto.update.BasicDataConfigUpdateDTO;
import com.ruoyi.system.query.BasicDataConfigQuery;
+import com.ruoyi.system.query.FieldQuery;
import com.ruoyi.system.service.TbBasicDataCategoryService;
import com.ruoyi.system.service.TbBasicDataConfigService;
+import com.ruoyi.system.service.TbFieldService;
import com.ruoyi.system.vo.BasicDataCategoryVO;
import com.ruoyi.system.vo.BasicDataConfigDetailVO;
import com.ruoyi.system.vo.BasicDataConfigVO;
+import com.ruoyi.system.vo.FieldVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import java.util.List;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
@@ -42,16 +49,19 @@
private final TbBasicDataConfigService tbBasicDataConfigService;
private final TbBasicDataCategoryService tbBasicDataCategoryService;
+ private final TbFieldService tbFieldService;
/**
* 获取分类列表
- * @return R<List<BasicDataCategoryVO>>
+ *
+ * @return R<List < BasicDataCategoryVO>>
*/
@GetMapping("/categories")
@ApiOperation(value = "获取分类列表")
public R<List<BasicDataCategoryVO>> queryBasicDataCategories() {
try {
- List<TbBasicDataCategory> list = tbBasicDataCategoryService.lambdaQuery().eq(TbBasicDataCategory::getStatus, ShowStatusEnum.SHOW).list();
+ List<TbBasicDataCategory> list = tbBasicDataCategoryService.lambdaQuery()
+ .eq(TbBasicDataCategory::getStatus, ShowStatusEnum.SHOW).list();
return R.ok(BeanUtils.copyList(list, BasicDataCategoryVO.class));
} catch (Exception e) {
if (e instanceof ServiceException) {
@@ -63,7 +73,45 @@
}
/**
+ * 分页条件查询字段
+ *
+ * @param query 字段条件查询对象
+ * @return R<PageDTO < FieldVO>>
+ */
+ @PostMapping("/page-fields")
+ @ApiOperation(value = "分页条件查询字段", notes = "基础数据配置、大屏数据配置")
+ public R<PageDTO<FieldVO>> page(@Validated @RequestBody FieldQuery query) {
+ try {
+ return R.ok(tbFieldService.queryShowPage(query));
+ } catch (Exception e) {
+ if (e instanceof ServiceException) {
+ return R.fail(e.getMessage());
+ }
+ log.error("分页条件查询异常", e);
+ return R.fail();
+ }
+ }
+
+ /**
+ * 分页条件查询字段
+ *
+ * @param query 字段条件查询对象
+ * @return R<PageDTO < FieldVO>>
+ */
+ @GetMapping("/list-fields")
+ @ApiOperation(value = "查询状态为展示中字段列表", notes = "基础数据配置、大屏数据配置")
+ public R<List<FieldVO>> listFields() {
+ try {
+ return R.ok(tbFieldService.listFields());
+ } catch (Exception e) {
+ log.error("查询状态为展示中字段列表异常", e);
+ return R.fail();
+ }
+ }
+
+ /**
* 添加
+ *
* @param dto 基础数据配置数据传输对象
* @return R<Void>
*/
@@ -84,6 +132,7 @@
/**
* 编辑
+ *
* @param dto 基础数据配置数据传输对象
* @return R<Void>
*/
@@ -104,12 +153,13 @@
/**
* 获取详情
+ *
* @param id id
* @return R<BasicDataConfigDetailVO>
*/
@GetMapping("/get-details")
@ApiOperation("获取详情")
- public R<BasicDataConfigDetailVO> getDetails(Integer id) {
+ public R<BasicDataConfigDetailVO> getDetails(Long id) {
try {
BasicDataConfigDetailVO details = tbBasicDataConfigService.getDetails(id);
return R.ok(details);
@@ -124,12 +174,13 @@
/**
* 删除
+ *
* @param id id
* @return R<Void>
*/
@DeleteMapping("/delete")
@ApiOperation("删除")
- public R<Void> delete(Integer id) {
+ public R<Void> delete(Long id) {
try {
tbBasicDataConfigService.delete(id);
} catch (Exception e) {
@@ -144,6 +195,7 @@
/**
* 隐藏显示操作
+ *
* @param dto 显示隐藏操作数据传输对象
* @return R<Void>
*/
@@ -164,14 +216,16 @@
/**
* 分页条件查询
+ *
* @param query 基础数据条件查询对象
- * @return R<PageDTO<BasicDataConfigVO>>
+ * @return R<PageDTO < BasicDataConfigVO>>
*/
@PostMapping("/page")
@ApiOperation("分页条件查询")
public R<PageDTO<BasicDataConfigVO>> page(@Validated @RequestBody BasicDataConfigQuery query) {
try {
- PageDTO<BasicDataConfigVO> basicDataConfigVOPageDTO = tbBasicDataConfigService.queryPage(query);
+ PageDTO<BasicDataConfigVO> basicDataConfigVOPageDTO = tbBasicDataConfigService.queryPage(
+ query);
return R.ok(basicDataConfigVOPageDTO);
} catch (Exception e) {
if (e instanceof ServiceException) {
--
Gitblit v1.7.1