From f48971282876f71651aceda2597847014ae237d0 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 07 三月 2024 10:01:10 +0800
Subject: [PATCH] 指标取值状态
---
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java | 5 ++
/dev/null | 10 -----
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java | 2 -
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java | 7 +++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java | 6 +++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java | 15 +++++--
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java | 5 ++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java | 10 +++++
dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java | 4 --
9 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java
index 6d14507..2d26eec 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsIndicatorInfoController.java
@@ -1,6 +1,7 @@
package org.dromara.demo.controller;
import java.util.List;
+import java.util.Map;
import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse;
@@ -102,4 +103,13 @@
@PathVariable String[] ids) {
return toAjax(rsIndicatorInfoService.deleteWithValidByIds(List.of(ids), true));
}
+
+ /**
+ * 鏌ヨ鎸囨爣鍙栧�肩姸鎬�
+ */
+ @GetMapping("/status")
+ public Map<String, Long> status() {
+ return rsIndicatorInfoService.status();
+ }
+
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
index 0569b08..fd1ac56 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/RsSceneryOperationDataController.java
@@ -42,8 +42,6 @@
public class RsSceneryOperationDataController extends BaseController {
private final IRsSceneryOperationDataService rsSceneryOperationDataService;
- private final StringBuilder successMsg = new StringBuilder();
- private final StringBuilder failureMsg = new StringBuilder();
/**
* 鏌ヨ鏅尯杩愯鏁版嵁鍒楄〃
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/TestJPAController.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/TestJPAController.java
deleted file mode 100644
index d671395..0000000
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/controller/TestJPAController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.dromara.demo.controller;
-
-import org.dromara.demo.domain.Student;
-import org.dromara.demo.service.IStudentRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.graphql.data.method.annotation.Argument;
-import org.springframework.graphql.data.method.annotation.QueryMapping;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class TestJPAController {
- @Autowired
- private IStudentRepository studentRepository;
-
-
- @QueryMapping
- public void addStudent(@Argument Student student){
- studentRepository.save(student);
- }
- @QueryMapping
- public Student getStudent(@Argument Long id){
- return studentRepository.findById(id).orElse(null);
- }
-
-}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java
index 5669173..29eb431 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/RsIndicatorInfo.java
@@ -27,6 +27,11 @@
private String id;
/**
+ * 鎸囨爣閿悕
+ */
+ private String indicatorKey;
+
+ /**
* 鎸囨爣鍚嶇О
*/
private String indicatorName;
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/Student.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/Student.java
deleted file mode 100644
index 2383842..0000000
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/Student.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.dromara.demo.domain;
-
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Entity
-@Table(name = "t_student_demo")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class Student {
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY) // 涓婚敭鑷闀�
- @Column(name = "id")
- private Long id;
- @Column(name = "name")
- private String name;
- @Column(name = "age")
- private Integer age;
-}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java
index 6dc038e..9aff2d8 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsIndicatorInfoBo.java
@@ -27,6 +27,11 @@
private String id;
/**
+ * 鎸囨爣閿悕
+ */
+ private String indicatorKey;
+
+ /**
* 鎸囨爣鍚嶇О
*/
private String indicatorName;
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
index f52a289..ecdb199 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/bo/RsSceneryOperationDataBo.java
@@ -53,25 +53,21 @@
/**
* 杞︽祦閲�
*/
- @NotNull(message = "杞︽祦閲忎笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long carFlowNum;
/**
* 浜烘祦閲�
*/
- @NotNull(message = "浜烘祦閲忎笉鑳戒负绌�", groups = { AddGroup.class, EditGroup.class })
private Long personFlowNum;
/**
* 娓稿棰勭害
*/
- @NotNull(message = "娓稿棰勭害涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private Long visitorSubNum;
/**
* 鍏ュ洯浜烘暟
*/
- @NotNull(message = "鍏ュ洯浜烘暟涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
private Long enterGardenNum;
/**
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java
index 3bc8069..7639f95 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/domain/vo/RsIndicatorInfoVo.java
@@ -35,6 +35,12 @@
private String id;
/**
+ * 鎸囨爣閿悕
+ */
+ @ExcelProperty(value = "鎸囨爣閿悕")
+ private String indicatorKey;
+
+ /**
* 鎸囨爣鍚嶇О
*/
@ExcelProperty(value = "鎸囨爣鍚嶇О")
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java
index 3bf0950..bd5e716 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IRsIndicatorInfoService.java
@@ -8,6 +8,7 @@
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* 鎸囨爣鍙栧�糞ervice鎺ュ彛
@@ -46,4 +47,10 @@
* 鏍￠獙骞舵壒閲忓垹闄ゆ寚鏍囧彇鍊间俊鎭�
*/
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+ /**
+ * 鎸囨爣鍙栧�肩姸鎬�
+ * @return 鐘舵��
+ */
+ Map<String, Long> status();
}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IStudentRepository.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IStudentRepository.java
deleted file mode 100644
index de2713a..0000000
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/IStudentRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.dromara.demo.service;
-
-import org.dromara.demo.domain.Student;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface IStudentRepository extends CrudRepository<Student,Long> {
-}
diff --git a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java
index 6a776f8..c624bd5 100644
--- a/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java
+++ b/dujy-modules/dujy-demo/src/main/java/org/dromara/demo/service/impl/RsIndicatorInfoServiceImpl.java
@@ -15,10 +15,7 @@
import org.dromara.demo.service.IRsIndicatorInfoService;
import org.springframework.stereotype.Service;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鎸囨爣鍙栧�糞ervice涓氬姟灞傚鐞�
@@ -109,4 +106,14 @@
}
return baseMapper.deleteBatchIds(ids) > 0;
}
+
+ @Override
+ public Map<String, Long> status() {
+ List<RsIndicatorInfo> list = baseMapper.selectList(new LambdaQueryWrapper<RsIndicatorInfo>().orderByDesc(RsIndicatorInfo::getCreateTime));
+ Map<String, Long> map = new HashMap<>();
+ for (RsIndicatorInfo info : list) {
+ map.put(info.getIndicatorKey(), info.getStatus());
+ }
+ return map;
+ }
}
--
Gitblit v1.8.0