From 04194d1dc7a81b31121722cca64380714da04a07 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 21 四月 2022 10:42:18 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 6 ++++++
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 22 ++++++++++++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java | 2 +-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index ae519d8..25cad9f 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
-import lombok.Data;
/**
* led骞垮憡灞忎富琛�
+ *
* @TableName pole_lightemit
*/
-@TableName(value ="pole_lightemit")
+@TableName(value = "pole_lightemit")
@Data
public class PoleLightemitEntity implements Serializable {
/**
@@ -82,11 +85,15 @@
/**
* 缁戝畾鐏潌ID
*/
+
+ @TableField(exist = false)
+ private Long streetlightId;
+ @JsonIgnore
@TableField(exist = false)
private Long poleId;
/**
- *
+ *
*/
private LocalDateTime createTime;
@@ -99,10 +106,17 @@
@TableField(exist = false)
private Boolean isOpen;
- /*
+ /*
* 鐏潌鍚嶇О
*/
@TableField(exist = false)
+ private String streetlightName;
+
+ /*
+ * 鐏潌鍚嶇О
+ */
+ @JsonIgnore
+ @TableField(exist = false)
private String poleName;
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index e7ea677..874acf9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -194,6 +194,12 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
+ poleLightemitEntityList.forEach(
+ led->{
+ led.setStreetlightId(led.getPoleId());
+ led.setStreetlightName(led.getPoleName());
+ }
+ );
CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
int size = poleLightemitEntityList.size();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
index a8f8841..d1793e3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/stringTest.java
@@ -44,7 +44,7 @@
// int total=(i1*3600+i2*60);
// BigDecimal energySaving = BigDecimal.valueOf(((100-v1.getBrightness())/100)*totalTime/24);
// BigDecimal energySaving =BigDecimal.valueOf((100-v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
- BigDecimal energySaving =new BigDecimal(100).subtract(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
+ BigDecimal energySaving =new BigDecimal(100).subtract(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24),2);
System.out.println(energySaving);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index ab96cf4..a87ceb4 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -356,7 +356,7 @@
BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
BigDecimal totalTime = (hour.add(min));
- BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
+ BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24),2);
System.out.println(energySaving);
return energySaving;
}
--
Gitblit v1.9.3