ClientApps/CN_Product
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug修改

Browse Source
This commit is contained in:
cdf
2025-11-05 15:39:35 +08:00
parent a8c1498738
commit 8f5d9a13d8
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/controller/LedgerScaleController.java
View File

@@ -94,12 +94,12 @@ public class LedgerScaleController extends BaseController {
@OperateInfo(info = LogEnum.SYSTEM_COMMON) @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/clickImage") @PostMapping("/clickImage")
@ApiOperation("一次接线图点击事件") @ApiOperation("一次接线图点击事件")
@ApiImplicitParam(name = "lineId", value = "查询参数", required = true) @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"); String methodDescribe = getMethodDescribe("clickImage");
EventLedgerVO result = ledgerScaleService.clickImage(lineId); EventLedgerVO result = ledgerScaleService.clickImage(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }

3
cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/LedgerScaleService.java
View File

@@ -30,8 +30,7 @@ public interface LedgerScaleService {
List<EventLedgerVO> hasUpEventList(LargeScreenCountParam param); List<EventLedgerVO> hasUpEventList(LargeScreenCountParam param);
EventLedgerVO clickImage(String lineId); EventLedgerVO clickImage(LargeScreenCountParam param);
Page<EventDetailVO> eventList(LargeScreenCountParam param); Page<EventDetailVO> eventList(LargeScreenCountParam param);
Page<EventDetailVO> eventListByLineId(LargeScreenCountParam param); Page<EventDetailVO> eventListByLineId(LargeScreenCountParam param);

9
cn-diagram/src/main/java/com/njcn/product/diagram/LedgerScale/service/impl/LedgerScaleServiceImpl.java
View File

@@ -281,16 +281,18 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
} }
@Override @Override
public EventLedgerVO clickImage(String lineId) { public EventLedgerVO clickImage(LargeScreenCountParam param) {
List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(lineId).collect(Collectors.toList())); List<LedgerBaseInfo> ledgerBaseInfoList = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(param.getLineId()).collect(Collectors.toList()));
if (CollUtil.isEmpty(ledgerBaseInfoList)) { if (CollUtil.isEmpty(ledgerBaseInfoList)) {
throw new BusinessException(CommonResponseEnum.FAIL, "当前节点未查询到测点信息"); throw new BusinessException(CommonResponseEnum.FAIL, "当前节点未查询到测点信息");
} }
EventLedgerVO eventLedgerVO = new EventLedgerVO(); EventLedgerVO eventLedgerVO = new EventLedgerVO();
BeanUtil.copyProperties(ledgerBaseInfoList.get(0), 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<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<RmpEventDetailPO> rmpEventDetailPOList = rmpEventDetailMapper.selectList(lambdaQueryWrapper);
List<DictData> dictDataList = dictDataMapper.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()); List<DictData> dictDataList = dictDataMapper.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode());
@@ -301,6 +303,7 @@ public class LedgerScaleServiceImpl implements LedgerScaleService {
} }
@Override @Override
public Page<EventDetailVO> eventList(LargeScreenCountParam param) { public Page<EventDetailVO> eventList(LargeScreenCountParam param) {
Page<EventDetailVO> result = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)); Page<EventDetailVO> result = new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param));

4
cn-terminal/src/main/java/com/njcn/product/terminal/mysqlTerminal/mapper/mapping/LineMapper.xml
View File

@@ -93,7 +93,7 @@
and (dev.name like CONCAT('%', #{searchValue}, '%') and (dev.name like CONCAT('%', #{searchValue}, '%')
or a.name like CONCAT('%', #{searchValue}, '%')) or a.name like CONCAT('%', #{searchValue}, '%'))
</if> </if>
order by c.name,a.name <!-- order by c.name,a.name-->
</select> </select>
<select id="getLineList" resultType="TerminalShowVO"> <select id="getLineList" resultType="TerminalShowVO">
@@ -131,7 +131,7 @@
or a.name like CONCAT('%', #{searchValue}, '%') or a.name like CONCAT('%', #{searchValue}, '%')
or c.name like CONCAT('%', #{searchValue}, '%')) or c.name like CONCAT('%', #{searchValue}, '%'))
</if> </if>
order by c.name,a.name <!-- order by c.name,a.name-->
</select> </select>
<select id="getMonitorDetail" resultType="com.njcn.product.terminal.mysqlTerminal.pojo.dto.LineDevGetDTO"> <select id="getMonitorDetail" resultType="com.njcn.product.terminal.mysqlTerminal.pojo.dto.LineDevGetDTO">