From 5bcc4b8737ba70cc672fd5a1c64496a94c6ab7bd Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 07 六月 2023 14:43:32 +0800
Subject: [PATCH] 实时数据增加字段
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java | 10 +++++
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java | 9 ++++
doc/布署手册.docx | 0
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java | 9 ++++
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java | 6 +++
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java | 20 +++++++++
pom.xml | 5 +-
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java | 3 +
8 files changed, 58 insertions(+), 4 deletions(-)
diff --git "a/doc/\345\270\203\347\275\262\346\211\213\345\206\214.docx" "b/doc/\345\270\203\347\275\262\346\211\213\345\206\214.docx"
new file mode 100644
index 0000000..5e6aa21
--- /dev/null
+++ "b/doc/\345\270\203\347\275\262\346\211\213\345\206\214.docx"
Binary files differ
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
index 29c3e0b..65cf82c 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java
@@ -146,5 +146,15 @@
@ApiModelProperty(value = "鎿嶄綔浜�")
private String operator;
+ /**娓╁害瓒嬪娍*/
+ @ApiModelProperty(value = "娓╁害瓒嬪娍")
private String temps;
+
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double electric;
}
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java
index bac31a2..0b02308 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java
@@ -84,4 +84,13 @@
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private Integer tenantId;
+
+
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double electric;
}
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
index 4e611ac..7e91bd5 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
@@ -61,6 +61,15 @@
private Integer tenantId;
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double electric;
+
+
public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
this.fanFrequency = realTimeDataVo.getFanfrq();
this.weight = realTimeDataVo.getWeight3();
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
index c4d9107..34e0def 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java
@@ -83,7 +83,14 @@
/**绉熸埛id*/
@ApiModelProperty(value = "绉熸埛id", example = "1000")
private Integer tenantId;
- /**宸ュ崟鐘舵��*/
+ /**宸ュ崟鐘舵��
+ * 涓婃枡
+ * 缈绘枡
+ * 骞茬嚗
+ * 绉伴噸
+ * 鍑烘枡
+ *
+ * */
@ApiModelProperty(value = "宸ュ崟鐘舵��")
private String orderStatus;
/**鎿嶄綔浜�*/
@@ -92,6 +99,17 @@
private String operator;
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double electric;
+ /**鏁呴殰*/
+ @ApiModelProperty(value = "鏁呴殰")
+ private String fault;
+
@ApiModelProperty(value = "鏄庣粏鏁版嵁鍒楄〃")
private List<DryOrderTrendVo> detailList = new ArrayList<>();
@ApiModelProperty(value = "鏄庣粏")
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
index 6dbec23..22d3904 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
@@ -16,8 +16,9 @@
/**鑽潗鍚嶇О*/
private String name;
+ /**绉熸埛ID*/
private Integer tenantid;
-
+ /**璁惧缂栧彿*/
private String machineid;
/**鑽℃枡寤舵椂*/
private Integer delay;
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
index 2dc83a3..7924ad7 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.entity.DryEquipment;
+import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -52,6 +53,9 @@
public class DryEquipmentController extends JeecgController<DryEquipment, IDryEquipmentService> {
@Autowired
private IDryEquipmentService dryEquipmentService;
+
+ @Autowired
+ private IDryEqpTypeService dryEqpTypeService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -92,6 +96,7 @@
//------------------------------------------------------------------------------------------------
QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());
+ queryWrapper.orderByAsc("code");
List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
return Result.OK(eqps);
}
@@ -167,6 +172,7 @@
@GetMapping(value = "/queryById")
public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
DryEquipment dryEquipment = dryEquipmentService.getById(id);
+ dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
if(dryEquipment==null) {
return Result.error("鏈壘鍒板搴旀暟鎹�");
}
diff --git a/pom.xml b/pom.xml
index 6a36cbf..313f380 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<minidao.version>1.9.0</minidao.version>
<!-- 绉湪鎶ヨ〃-->
- <jimureport-spring-boot-starter.version>1.5.6</jimureport-spring-boot-starter.version>
+ <jimureport-spring-boot-starter.version>1.5.8</jimureport-spring-boot-starter.version>
<commons.version>2.6</commons.version>
<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
<aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -332,6 +332,7 @@
</exclusions>
</dependency>
<!-- 绉湪鎶ヨ〃-->
+
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
@@ -346,7 +347,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-nosql-starter</artifactId>
- <version>${jimureport-spring-boot-starter.version}</version>
+ <version>1.5.6</version>
</dependency>
</dependencies>
</dependencyManagement>
--
Gitblit v1.9.3