doum
9 小时以前 f09e6937bf52bdc3d87d29d1d5b3180735e39664
最新版本541200007
已修改2个文件
17 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java
@@ -15,5 +15,4 @@
private String deviceIndexCode    ;//String    false    设备编号,根据[查询消防设备列表]@[智慧园区管理平台V1.4.301-API列表-报警检测-消防应用服务-消防功能接口#查询消防设备列表]接口获取返回报文中的devSerialNum字段
private Integer pageNo    ;//Number    true    目标页码,默认从1开始,表示第一页
private Integer pageSize;//    Number    true    每页记录数,每页最大数量1000,默认20
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -282,12 +282,11 @@
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                            p.setDeviceList(new ArrayList<>());
                        }
                        p.getCarmeraList().add(c);
                        p.getDeviceList().add(c);
                    }
                }
            }
@@ -299,12 +298,11 @@
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
                        if(p.getSensorList()==null){
                            p.setSensorList(new ArrayList<>());
                        }
                        p.getCarmeraList().add(c);
                        p.getSensorList().add(c);
                    }
                }
            }