diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java index 772cf2c..223bfa0 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java @@ -24,7 +24,7 @@ public enum AlgorithmResponseEnum { ELEEPDPQD_DATA_ERROR ("A00506","统计指标据数据缺失"), FILE_SIZE_ERROR ("A00507","文件不能超过10M"), - DATA_EXIST ("A00508","删除失败,有子数据"), + DATA_EXIST ("A00508","组内有数据,请先移除数据"), LOSE_EFFICACY ("A00509","二维码失效，该设备已绑定"), DATA_LOSE ("A00510","未找到设备与主用户信息"), REPEAT_SHARE ("A00511","设备已分享完成,请勿再次分享"), diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java index bc710e7..a815f63 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java @@ -41,5 +41,8 @@ public class EnergyBaseParam implements Serializable { @DateTimeStrValid private String endTime; + @ApiModelProperty("searchValue") + private String searchValue; + } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java index a0688bb..ce1a535 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java @@ -22,6 +22,9 @@ public class DeviceManagerDetailVO { @ApiModelProperty("单位") private String unit; + @ApiModelProperty("相别") + private String phasic; + @ApiModelProperty("开始次数") private String startTimes; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java index 98c84fd..b4e3c0d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java @@ -56,11 +56,12 @@ public class CsGroupController extends BaseController { @ApiImplicitParam(name = "id", value = "tab选项id", required = true), @ApiImplicitParam(name = "pageNum", value = "页码", required = true), @ApiImplicitParam(name = "pageSize", value = "页面尺寸", required = true), - @ApiImplicitParam(name = "lineId", value = "监测点id", required = true) + @ApiImplicitParam(name = "lineId", value = "监测点id", required = true), + @ApiImplicitParam(name = "searchValue", value = "搜索值", required = true), }) - public HttpResult> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId){ + public HttpResult> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId, @RequestParam(value = "searchValue") String searchValue){ String methodDescribe = getMethodDescribe("getDeviceRtData"); - IPage list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId); + IPage list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java index 8cd17de..c1e14da 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java @@ -24,5 +24,5 @@ public interface CsGroupMapper extends BaseMapper { List getArrayData(@Param("list") List list); - Page getGroupDataList(IPage page, @Param("id") String id); + Page getGroupDataList(IPage page, @Param("id") String id, @Param("searchValue") String searchValue); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml index 750f3b2..9f5ca65 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml @@ -69,8 +69,10 @@ cs_group where data_set_id = #{id} and is_show = 1 - order by - sort + + and group_name like concat('%',#{searchValue},'%') + + order by sort \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java index 3e9db66..ae79009 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java @@ -29,7 +29,7 @@ public interface ICsGroupService extends IService { * 获取装置分组后的实时数据 * @return */ - IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId); + IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue); /** * 获取装置时间范围内的历史数据 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java index 97e8308..1631195 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java @@ -1,6 +1,5 @@ package com.njcn.csdevice.service.impl; -import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.mapper.CsDataArrayMapper; import com.njcn.csdevice.pojo.dto.DataArrayDTO; @@ -42,29 +41,32 @@ public class CsDataArrayServiceImpl extends ServiceImpl list = new ArrayList<>(); List l = this.baseMapper.getDictData(id).stream().map(CsDataArray::getDataId).collect(Collectors.toList()); List result = epdFeignClient.selectByIds(l).getData(); - result.forEach(item->{ + Map> map = result.stream().collect(Collectors.groupingBy(EleEpdPqd::getShowName,LinkedHashMap::new,Collectors.toList())); + for (Map.Entry> entry : map.entrySet()) { DeviceManagerDetailVO vo = new DeviceManagerDetailVO(); - if(Objects.equals(item.getPhase(),"M")) { - vo.setName(item.getShowName()); + EleEpdPqd eleEpdPqd = entry.getValue().get(0); + if (Objects.equals(eleEpdPqd.getPhase(),"M")){ + vo.setPhasic("/"); } else { - vo.setName(item.getPhase() + "相" +item.getShowName()); + vo.setPhasic(entry.getValue().stream().map(EleEpdPqd::getPhase).collect(Collectors.joining(","))); } - vo.setType(item.getType()); - vo.setUnit(item.getUnit()); - if (Objects.isNull(item.getHarmStart()) && Objects.isNull(item.getHarmEnd())){ - vo.setStartTimes("-"); - vo.setEndTimes("-"); + vo.setName(entry.getKey()); + vo.setType(eleEpdPqd.getType()); + vo.setUnit(eleEpdPqd.getUnit()); + if (Objects.isNull(eleEpdPqd.getHarmStart()) && Objects.isNull(eleEpdPqd.getHarmEnd())){ + vo.setStartTimes("/"); + vo.setEndTimes("/"); } else { - if(Objects.equals(item.getHarmStart(),1) && Objects.equals(item.getHarmEnd(),50)) { + if(Objects.equals(eleEpdPqd.getHarmStart(),1) && Objects.equals(eleEpdPqd.getHarmEnd(),50)) { vo.setStartTimes("0.5"); vo.setEndTimes("49.5"); } else { - vo.setStartTimes(Integer.toString(item.getHarmStart())); - vo.setEndTimes(Integer.toString(item.getHarmEnd())); + vo.setStartTimes(Integer.toString(eleEpdPqd.getHarmStart())); + vo.setEndTimes(Integer.toString(eleEpdPqd.getHarmEnd())); } } list.add(vo); - }); + } return list; } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index c294dab..d7cbeb3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -75,10 +75,10 @@ public class CsGroupServiceImpl extends ServiceImpl impl } @Override - public IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId) { + public IPage getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue) { IPage pageTurn = new Page<>(); List arrayList = new ArrayList<>(); - IPage pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize), id); + IPage pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize),id,searchValue); if (pageRes.getTotal() != 0) { List groupList = pageRes.getRecords(); List group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList()); @@ -121,7 +121,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl public IPage getDeviceHistoryData(EnergyBaseParam energyBaseParam) { IPage pageTurn = new Page<>(); List arrayList = new ArrayList<>(); - IPage pageRes = csGroupMapper.getGroupDataList(new Page<>(energyBaseParam.getPageNum(), energyBaseParam.getPageSize()), energyBaseParam.getId()); + IPage pageRes = csGroupMapper.getGroupDataList(new Page<>(energyBaseParam.getPageNum(), energyBaseParam.getPageSize()), energyBaseParam.getId(), energyBaseParam.getSearchValue()); if (pageRes.getTotal() != 0) { List groupList = pageRes.getRecords(); List group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());