Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.解决监测点实际安装位置

Browse Source 
2.解决稳态合格率统计表和图形数据问题
This commit is contained in:
wr
2025-05-06 16:04:06 +08:00
parent 8e5cab30c9
commit df1f744a7d
4 changed files with 176 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java
View File

@@ -201,4 +201,6 @@ public class LineParam {
@ApiModelProperty(name = "newStationId",value = "新能源场站信息ID")
private String newStationId;
@ApiModelProperty(name = "actualArea",value = "监测点实际安装位置")
private String actualArea;
}

20
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeptLineServiceImpl.java
View File

@@ -5,22 +5,25 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.device.biz.pojo.dto.SubGetBase;
import com.njcn.device.biz.pojo.dto.TerminalGetBase;
import com.njcn.device.biz.pojo.param.SubstationParam;
import com.njcn.device.pq.mapper.DeptLineMapper;
import com.njcn.device.pq.mapper.LineDetailMapper;
import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.pojo.po.DeptLine;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
import com.njcn.device.pq.service.DeptLineService;
import com.njcn.device.pq.constant.Param;
import com.njcn.system.api.DictTreeFeignClient;
import com.njcn.system.enums.DicTreeEnum;
import com.njcn.system.pojo.vo.DictTreeVO;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.pojo.param.DeptLineParam;
import com.njcn.web.utils.WebUtil;
import lombok.RequiredArgsConstructor;
@@ -46,6 +49,7 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
private final DeptFeignClient deptFeignClient;
private final LineMapper lineMapper;
private final DictTreeFeignClient dictTreeFeignClient;
private final LineDetailMapper detailMapper;
@Override
@@ -61,6 +65,20 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
deptLine.setLineId(id);
return deptLine;
}).collect(Collectors.toList());
List<String> ids = deptLineParam.getIds();
if (CollUtil.isNotEmpty(ids)) {
List<LineDetail> list = detailMapper.selectList(new LambdaQueryWrapper<LineDetail>()
.in(LineDetail::getId, ids)
.isNull(LineDetail::getActualArea)
);
if (CollUtil.isNotEmpty(list)) {
Dept data = deptFeignClient.getDeptById(deptLineParam.getId()).getData();
List<String> lineIds = list.stream().map(LineDetail::getId).collect(Collectors.toList());
detailMapper.update(null, new LambdaUpdateWrapper<LineDetail>()
.set(LineDetail::getActualArea, data.getArea())
.in(LineDetail::getId, lineIds));
}
}
this.saveBatch(deptLines);
}