From 8f5d9a13d86dbdd2258172772bea3ea747446b9b Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Wed, 5 Nov 2025 15:39:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LedgerScale/controller/LedgerScaleController.java    | 6 +++---
 .../diagram/LedgerScale/service/LedgerScaleService.java  | 3 +--
 .../LedgerScale/service/impl/LedgerScaleServiceImpl.java | 9 ++++++---
 .../terminal/mysqlTerminal/mapper/mapping/LineMapper.xml | 4 ++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
index d391e4b..d2adf74 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
@@ -94,12 +94,12 @@ public class LedgerScaleController extends BaseController {
 
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @GetMapping("/clickImage")
+    @PostMapping("/clickImage")
     @ApiOperation("一次接线图点击事件")
     @ApiImplicitParam(name = "lineId", value = "查询参数", required = true)
-    public HttpResult<EventLedgerVO> clickImage(@RequestParam("lineId")String lineId) {
+    public HttpResult<EventLedgerVO> clickImage(@RequestBody LargeScreenCountParam param) {
         String methodDescribe = getMethodDescribe("clickImage");
-        EventLedgerVO result = ledgerScaleService.clickImage(lineId);
+        EventLedgerVO result = ledgerScaleService.clickImage(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
index 34ed669..50b070f 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
@@ -30,8 +30,7 @@ public interface LedgerScaleService {
     List<EventLedgerVO> hasUpEventList(LargeScreenCountParam param);
 
 
-    EventLedgerVO clickImage(String lineId);
-
+    EventLedgerVO clickImage(LargeScreenCountParam param);
     Page<EventDetailVO> eventList(LargeScreenCountParam param);
 
     Page<EventDetailVO> eventListByLineId(LargeScreenCountParam param);
diff --git a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
index 97c0cbc..f87ab8a 100644
--- a/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
+++ b/cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
@@ -281,16 +281,18 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     }
 
     @Override
-    public EventLedgerVO clickImage(String lineId) {
-        List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(lineId).collect(Collectors.toList()));
+    public EventLedgerVO clickImage(LargeScreenCountParam param) {
+        List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(param.getLineId()).collect(Collectors.toList()));
         if (CollUtil.isEmpty(ledgerBaseInfoList)) {
             throw new BusinessException(CommonResponseEnum.FAIL, "当前节点未查询到测点信息");
         }
 
         EventLedgerVO eventLedgerVO = new EventLedgerVO();
         BeanUtil.copyProperties(ledgerBaseInfoList.get(0), eventLedgerVO);
+        DateTime start = DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime()));
+        DateTime end = DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime()));
         LambdaQueryWrapper<RmpEventDetailPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(RmpEventDetailPO::getLineId, lineId);
+        lambdaQueryWrapper.eq(RmpEventDetailPO::getLineId, param.getLineId()).between(RmpEventDetailPO::getStartTime, start, end).orderByDesc(RmpEventDetailPO::getStartTime);;
         List<RmpEventDetailPO> rmpEventDetailPOList = rmpEventDetailMapper.selectList(lambdaQueryWrapper);
 
         List<DictData> dictDataList = dictDataMapper.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode());
@@ -301,6 +303,7 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
     }
 
 
+
     @Override
     public Page<EventDetailVO> eventList(LargeScreenCountParam param) {
         Page<EventDetailVO> result = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param));
diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml
index 3c4f6e0..1e326db 100644
--- a/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml
+++ b/cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml
@@ -93,7 +93,7 @@
             and (dev.name like CONCAT('%', #{searchValue}, '%')
             or a.name like CONCAT('%', #{searchValue}, '%'))
         </if>
-        order by c.name,a.name
+<!--        order by c.name,a.name-->
     </select>
 
     <select id="getLineList" resultType="TerminalShowVO">
@@ -131,7 +131,7 @@
             or a.name like CONCAT('%', #{searchValue}, '%')
             or c.name like CONCAT('%', #{searchValue}, '%'))
         </if>
-        order by c.name,a.name
+<!--        order by c.name,a.name-->
     </select>
 
     <select id="getMonitorDetail" resultType="com.njcn.product.terminal.mysqlTerminal.pojo.dto.LineDevGetDTO">