From 0c64c11b58a66cc93dc488da927f9aa353dfd07c Mon Sep 17 00:00:00 2001 From: wanxiaoli Date: Wed, 24 Dec 2025 16:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/controller/EventController.java | 36 ++++++------------- .../css/controller/ProjectController.java | 6 ---- .../css/service/impl/ProjectServiceImpl.java | 19 +++++----- 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/business-css/src/main/java/com/yfd/business/css/controller/EventController.java b/business-css/src/main/java/com/yfd/business/css/controller/EventController.java index 1042be0..1b10ea7 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/EventController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/EventController.java @@ -1,10 +1,12 @@ package com.yfd.business.css.controller; +import com.yfd.business.css.domain.Device; import com.yfd.business.css.domain.Event; import com.yfd.business.css.service.EventService; import com.yfd.platform.system.service.IUserService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.Authentication; import org.springframework.security.authentication.AnonymousAuthenticationToken; @@ -26,15 +28,13 @@ import com.yfd.business.css.dto.EventAttrPoint; @RequestMapping("/events") public class EventController { - private final EventService eventService; - private final ObjectMapper objectMapper; - private final IUserService userService; + @Resource + private EventService eventService; + @Resource + private ObjectMapper objectMapper; + @Resource + private IUserService userService; - public EventController(EventService eventService, ObjectMapper objectMapper, IUserService userService) { - this.eventService = eventService; - this.objectMapper = objectMapper; - this.userService = userService; - } /** * 新增始发事件 @@ -58,24 +58,10 @@ public class EventController { * @param event 事件对象 * @return 修改结果 */ - @PutMapping("/{eventId}") - public ResponseEntity> updateEvent(@PathVariable String eventId, - @RequestBody Event event) { - event.setEventId(eventId); + @PutMapping + public boolean update(@RequestBody Event event) { event.setModifier(currentUsername()); - event.setUpdatedAt(LocalDateTime.now()); - boolean ok = eventService.updateById(event); - if (!ok) { - return ResponseEntity.badRequest().body(Map.of( - "code", 1, - "msg", "修改失败" - )); - } - return ResponseEntity.ok(Map.of( - "code", 0, - "msg", "修改成功", - "data", event - )); + return eventService.updateById(event); } /** diff --git a/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java b/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java index 3a8e8d2..f675f4f 100644 --- a/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java +++ b/business-css/src/main/java/com/yfd/business/css/controller/ProjectController.java @@ -19,12 +19,6 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; import jakarta.annotation.Resource; import java.util.List; import java.util.Map; -import java.io.ByteArrayOutputStream; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import java.time.format.DateTimeFormatter; import java.time.LocalDateTime; @RestController diff --git a/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java b/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java index adaf3c4..cfc4f8c 100644 --- a/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java +++ b/business-css/src/main/java/com/yfd/business/css/service/impl/ProjectServiceImpl.java @@ -487,11 +487,13 @@ public class ProjectServiceImpl out.put("scenarioId", scenarioId); List issues = new ArrayList<>(); out.put("issues", issues); + List> frames = new ArrayList<>(); try { Project p = this.getById(projectId); if (p == null || p.getTopology() == null || p.getTopology().isBlank()) { issues.add("topology为空"); out.put("generated", Map.of("events", 0, "snapshots", 0)); + out.put("frames", frames); return out; } JsonNode root = objectMapper.readTree(p.getTopology()); @@ -503,6 +505,7 @@ public class ProjectServiceImpl if (devs.isEmpty()) { issues.add("devices为空"); out.put("generated", Map.of("events", 0, "snapshots", 0)); + out.put("frames", frames); return out; } Map> devStatic = new HashMap<>(); @@ -517,7 +520,6 @@ public class ProjectServiceImpl .eq("scenario_id", scenarioId) ); Map valueProviders = buildValueProviders(events, issues); - List all = new ArrayList<>(); int snapshots = 0; for (long t = start; t <= end; t += stepSec) { int stepIndex = (int) ((t - start) / stepSec); @@ -582,22 +584,21 @@ public class ProjectServiceImpl } state.put("materials", materialsState); deviceStates.put(did, state); - ScenarioResult sr = new ScenarioResult(); - sr.setScenarioId(scenarioId); - sr.setDeviceId(did); - sr.setStep(stepIndex); - sr.setAttrState(objectMapper.writeValueAsString(state)); - sr.setKeffValue(null); - all.add(sr); } snapshots += devs.size(); + Map frame = new HashMap<>(); + frame.put("time", t); + frame.put("step", stepIndex); + frame.put("devices", deviceStates); + frames.add(frame); } - if (!all.isEmpty()) scenarioResultService.saveBatch(all); out.put("generated", Map.of("events", events.size(), "snapshots", snapshots)); + out.put("frames", frames); return out; } catch (Exception ex) { issues.add("初始化失败:" + ex.getMessage()); out.put("generated", Map.of("events", 0, "snapshots", 0)); + out.put("frames", frames); return out; } }