From 58dac809d5d3a78ca9578edbf2e9ff80ff4b6e57 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 10:45:20 +0800
Subject: [PATCH] 实时界面资产信息管理查询所有的变更记录
---
src/main/java/com/whyc/service/StationInfService.java | 10 +++++++---
src/main/java/com/whyc/service/BattInfService.java | 12 +++---------
src/main/java/com/whyc/dto/InfoDto.java | 3 ---
src/main/java/com/whyc/pojo/db_station/PowerInf.java | 3 +++
src/main/java/com/whyc/service/PowerInfService.java | 6 ++++++
src/main/java/com/whyc/pojo/db_station/StationInf.java | 4 ++++
src/main/java/com/whyc/pojo/db_station/BattInf.java | 4 ++++
7 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/dto/InfoDto.java b/src/main/java/com/whyc/dto/InfoDto.java
index 6bb9a60..97a1f60 100644
--- a/src/main/java/com/whyc/dto/InfoDto.java
+++ b/src/main/java/com/whyc/dto/InfoDto.java
@@ -79,7 +79,6 @@
@ApiModelProperty(value = "鏁存祦鍣ㄤ娇鑳絒bit0-妯″潡1 bit15-妯″潡16]銆�1-鍙敤 0-涓嶅彲浠ャ��")
private Long modelCfg;
- private List<PowerInfChange> pinfChangeList;
@ApiModelProperty(value = "璁惧id")
@@ -132,8 +131,6 @@
@ApiModelProperty(value = "鏍囪瘑鏄惁鍔犲叆鐢垫睜缁�1:娣诲姞锛�0涓嶆坊鍔�")
private Integer addBinfFlag;
-
- private List<BattInfChange> binfChangeList;
@ApiModelProperty(value = "鍙樻洿鍘熷洜")
private String updateReason;
diff --git a/src/main/java/com/whyc/pojo/db_station/BattInf.java b/src/main/java/com/whyc/pojo/db_station/BattInf.java
index cd43901..ea09391 100644
--- a/src/main/java/com/whyc/pojo/db_station/BattInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/BattInf.java
@@ -10,6 +10,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -118,4 +119,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍖呮満缁勫悕绉�")
private String baojiGroupName;
+
+ @TableField(exist = false)
+ private List<BattInfChange> binfChangeList;
}
diff --git a/src/main/java/com/whyc/pojo/db_station/PowerInf.java b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
index b4c3749..d3cee97 100644
--- a/src/main/java/com/whyc/pojo/db_station/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
@@ -13,6 +13,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -89,5 +90,7 @@
@TableField(exist = false)
private String stationType;
+ @TableField(exist = false)
+ private List<PowerInfChange> pinfChangeList;
}
diff --git a/src/main/java/com/whyc/pojo/db_station/StationInf.java b/src/main/java/com/whyc/pojo/db_station/StationInf.java
index 3622a47..9ba535a 100644
--- a/src/main/java/com/whyc/pojo/db_station/StationInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/StationInf.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_station;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
+import java.util.List;
/**
* <p>
@@ -65,4 +67,6 @@
@ApiModelProperty(value = "绔欑偣绫诲瀷[0-闈炶妭鐐圭珯锛�1-鑺傜偣绔橾")
private Integer nodeStation;
+ @TableField(exist = false)
+ private List<StationInfChange> sinfChangeList;
}
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 00043eb..2fee615 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -43,6 +43,7 @@
@Autowired(required = false)
private InfoChangeService changeService;
+
/*鏂板缓鐢垫睜缁勶紙鏂扮殑璁惧鏂扮殑鐢垫睜缁勶級
* @param binf
* 1.鍦ㄧ數婧愪笅鏂板缓璁惧锛岃褰曡澶囩紪鍙凤紝devNum,璁惧鍚嶇О涓鸿澶囩被鍨�+devNum
@@ -368,15 +369,6 @@
dto.setUid(user.getId());
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<InfoDto> list=mapper.getInfo(dto);
- for (InfoDto infoDto:list) {
- //鑾峰彇鏈烘埧锛岀數婧愶紝鐢垫睜缁勫彉鏇磋褰�
- List<StationInfChange> sinfChangeList=changeService.getSinfChange(infoDto.getStationId());
- infoDto.setSinfChangeList(sinfChangeList);
- List<PowerInfChange> pinfChangeList=changeService.getPinfChange(infoDto.getPowerId());
- infoDto.setPinfChangeList(pinfChangeList);
- List<BattInfChange> binfChangeList=changeService.getBinfChange(infoDto.getBattgroupId());
- infoDto.setBinfChangeList(binfChangeList);
- }
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫睜");
}
@@ -415,6 +407,8 @@
wrapper.eq("battgroup_id",battgroupId);
wrapper.last("limit 1");
BattInf binf=mapper.selectOne(wrapper);
+ List<BattInfChange> binfChangeList=changeService.getBinfChange(battgroupId);
+ binf.setBinfChangeList(binfChangeList);
return binf;
}
//褰撴病鏈夊唴鍔╂祴璇曟椂鍒濆鍐呴樆鍊间负鏍囩О鍐呴樆
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 85e362f..c787e3c 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -17,6 +17,7 @@
import com.whyc.mapper.StationInfMapper;
import com.whyc.pojo.db_station.BattInf;
import com.whyc.pojo.db_station.PowerInf;
+import com.whyc.pojo.db_station.PowerInfChange;
import com.whyc.pojo.db_station.StationInf;
import com.whyc.pojo.db_user.BaojigroupPower;
import com.whyc.pojo.db_user.BaojigroupUsr;
@@ -44,6 +45,9 @@
@Autowired(required = false)
private BaojigroupPowerMapper bjPowerMapper;
+
+ @Autowired(required = false)
+ private InfoChangeService changeService;
/*娣诲姞鐢垫簮
1.鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏄寘缁勭敤鎴�
@@ -144,6 +148,8 @@
wrapper.eq("power_id",powerId);
wrapper.last("limit 1");
PowerInf pinf=mapper.selectOne(wrapper);
+ List<PowerInfChange> pinfChangeList=changeService.getPinfChange(powerId);
+ pinf.setPinfChangeList(pinfChangeList);
return pinf;
}
//鐢垫簮淇℃伅缁熻
diff --git a/src/main/java/com/whyc/service/StationInfService.java b/src/main/java/com/whyc/service/StationInfService.java
index e7c3953..e7b3654 100644
--- a/src/main/java/com/whyc/service/StationInfService.java
+++ b/src/main/java/com/whyc/service/StationInfService.java
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.dto.InfoDto;
import com.whyc.dto.Response;
import com.whyc.dto.Station.Provice;
import com.whyc.dto.Statistic.StationStic;
import com.whyc.mapper.StationInfMapper;
-import com.whyc.pojo.db_station.PowerInf;
-import com.whyc.pojo.db_station.StationInf;
+import com.whyc.pojo.db_station.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,7 +20,8 @@
@Autowired(required = false)
private StationInfMapper mapper;
-
+ @Autowired(required = false)
+ private InfoChangeService changeService;
//鑾峰彇宸︿晶鍒楄〃
public Response getLeftStation(int uid) {
List<Provice> list=mapper.getLeftStation(uid);
@@ -86,6 +87,9 @@
wrapper.eq("station_id",stationId);
wrapper.last("limit 1");
StationInf sinf=mapper.selectOne(wrapper);
+ //鑾峰彇鏈烘埧锛岀數婧愶紝鐢垫睜缁勫彉鏇磋褰�
+ List<StationInfChange> sinfChangeList=changeService.getSinfChange(sinf.getStationId());
+ sinf.setSinfChangeList(sinfChangeList);
return sinf;
}
--
Gitblit v1.9.1