Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.13:3000/root/govern

Browse Source
This commit is contained in:
huangzj
2023-07-05 13:55:06 +08:00
parent e2a1818dd3 7c49f4dda7
commit 9a112bb384
9 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/enums/AlgorithmResponseEnum.java
View File

@@ -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","设备已分享完成,请勿再次分享"),

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/EnergyBaseParam.java
View File

@@ -41,5 +41,8 @@ public class EnergyBaseParam implements Serializable {
@DateTimeStrValid
private String endTime;
@ApiModelProperty("searchValue")
private String searchValue;
}

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DeviceManagerDetailVO.java
View File

@@ -22,6 +22,9 @@ public class DeviceManagerDetailVO {
@ApiModelProperty("单位")
private String unit;
@ApiModelProperty("相别")
private String phasic;
@ApiModelProperty("开始次数")
private String startTimes;

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroupController.java
View File

@@ -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<IPage<DataGroupTemplateVO>> getDeviceRtData(@RequestParam("id") String id, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam(value = "lineId")String lineId){
public HttpResult<IPage<DataGroupTemplateVO>> 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<DataGroupTemplateVO> list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId);
IPage<DataGroupTemplateVO> list = csGroupService.getDeviceRtData(id, pageNum, pageSize,lineId,searchValue);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java
View File

@@ -24,5 +24,5 @@ public interface CsGroupMapper extends BaseMapper<CsGroup> {
List<CsGroupVO> getArrayData(@Param("list") List<String> list);
Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id);
Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id, @Param("searchValue") String searchValue);
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsGroupMapper.xml
View File

@@ -69,8 +69,10 @@
cs_group
where
data_set_id = #{id} and is_show = 1
order by
sort
<if test="searchValue != null and searchValue !=''">
and group_name like concat('%',#{searchValue},'%')
</if>
order by sort
</select>
</mapper>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsGroupService.java
View File

@@ -29,7 +29,7 @@ public interface ICsGroupService extends IService<CsGroup> {
* 获取装置分组后的实时数据
* @return
*/
IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId);
IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue);
/**
* 获取装置时间范围内的历史数据

30
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
View File

@@ -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<CsDataArrayMapper, CsDat
List<DeviceManagerDetailVO> list = new ArrayList<>();
List<String> l = this.baseMapper.getDictData(id).stream().map(CsDataArray::getDataId).collect(Collectors.toList());
List<EleEpdPqd> result = epdFeignClient.selectByIds(l).getData();
result.forEach(item->{
Map<String,List<EleEpdPqd>> map = result.stream().collect(Collectors.groupingBy(EleEpdPqd::getShowName,LinkedHashMap::new,Collectors.toList()));
for (Map.Entry<String, List<EleEpdPqd>> 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;
}

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
View File

@@ -75,10 +75,10 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
}
@Override
public IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId) {
public IPage<DataGroupTemplateVO> getDeviceRtData(String id, Integer pageNum, Integer pageSize, String lineId, String searchValue) {
IPage<DataGroupTemplateVO> pageTurn = new Page<>();
List<EnergyTemplateVO> arrayList = new ArrayList<>();
IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize), id);
IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(pageNum, pageSize),id,searchValue);
if (pageRes.getTotal() != 0) {
List<DataGroupTemplateVO> groupList = pageRes.getRecords();
List<String> group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());
@@ -121,7 +121,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
public IPage<DataGroupTemplateVO> getDeviceHistoryData(EnergyBaseParam energyBaseParam) {
IPage<DataGroupTemplateVO> pageTurn = new Page<>();
List<EnergyTemplateVO> arrayList = new ArrayList<>();
IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(energyBaseParam.getPageNum(), energyBaseParam.getPageSize()), energyBaseParam.getId());
IPage<DataGroupTemplateVO> pageRes = csGroupMapper.getGroupDataList(new Page<>(energyBaseParam.getPageNum(), energyBaseParam.getPageSize()), energyBaseParam.getId(), energyBaseParam.getSearchValue());
if (pageRes.getTotal() != 0) {
List<DataGroupTemplateVO> groupList = pageRes.getRecords();
List<String> group = groupList.stream().map(DataGroupTemplateVO::getId).collect(Collectors.toList());