ThbTech/JavaProjectRepo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop-business-css' of http://121.37.111.42:3000/ThbTech/JavaProjectRepo into develop-business-css

Browse Source
This commit is contained in:
limengnan 2026-01-15 17:27:30 +08:00
commit 10900e3e52
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
business-css/src/main/java/com/yfd/business/css/domain/CriticalData.java
View File

@ -53,9 +53,7 @@ public class CriticalData implements Serializable {
@TableField("keff_value")
private BigDecimal keffValue;
/** 属性状态 - JSON格式 */
@TableField("attr_state")
private String attrState;
/** 创建时间 */
@TableField("created_at")

9
business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java
View File

@ -1113,16 +1113,19 @@ public class ProjectServiceImpl
List<Project> projects = this.list(new QueryWrapper<Project>().eq("project_id", projectId));
List<Device> devices = deviceService.list(new QueryWrapper<Device>().eq("project_id", projectId));
List<Material> materials = materialService.list(new QueryWrapper<Material>().eq("project_id", projectId));
List<Scenario> scenarios = scenarioService.list(new QueryWrapper<Scenario>().eq("project_id", projectId));
List<Scenario> scenarios = scenarioService.list(new QueryWrapper<Scenario>().eq("project_id", projectId)
.orderByDesc("created_at"));
List<String> scenarioIds = scenarios.stream().map(Scenario::getScenarioId).toList();
List<Event> events = scenarioIds.isEmpty()
? List.of()
: eventService.list(new QueryWrapper<Event>()
.select("event_id","scenario_id","device_id","material_id","attr_changes","trigger_time","created_at","modifier")
.in("scenario_id", scenarioIds));
.in("scenario_id", scenarioIds)
.orderByDesc("created_at"));
List<ScenarioResult> results = scenarioIds.isEmpty()
? List.of()
: scenarioResultService.list(new QueryWrapper<ScenarioResult>().in("scenario_id", scenarioIds));
: scenarioResultService.list(new QueryWrapper<ScenarioResult>().in("scenario_id", scenarioIds)
.orderByAsc("step"));
Sheet s1 = wb.createSheet("projects");
String[] h1 = {"project_id","code","name","description","created_at","updated_at","modifier"};