Commit 1d59db45 authored by yaobaizheng's avatar yaobaizheng

默认图修改

parent f8303fb9
...@@ -15,8 +15,8 @@ import java.util.Map; ...@@ -15,8 +15,8 @@ import java.util.Map;
@Data @Data
public class DevelopmentInfoAllVO { public class DevelopmentInfoAllVO {
// @JsonSerialize(using = DefaultImgUrlList.class) @JsonSerialize(using = DefaultImgUrlList.class)
private List<SysCarouselInfo> sysCarouselInfos= new ArrayList<>(); private List<String> sysCarouselInfos= new ArrayList<>();
private DevelopmentInfoVO developmentInfoVO = new DevelopmentInfoVO(); private DevelopmentInfoVO developmentInfoVO = new DevelopmentInfoVO();
private List<ParkInfoListVO> ParkInfoListVO = new ArrayList<>(); private List<ParkInfoListVO> ParkInfoListVO = new ArrayList<>();
// private List<DevelopmentTrafficInfo> developmentTrafficInfoList = new ArrayList<>(); // private List<DevelopmentTrafficInfo> developmentTrafficInfoList = new ArrayList<>();
......
...@@ -24,8 +24,8 @@ public class ParkInfoAllVO implements Serializable { ...@@ -24,8 +24,8 @@ public class ParkInfoAllVO implements Serializable {
private List<ParkTrafficInfo> parkTrafficInfo = new ArrayList<>(); private List<ParkTrafficInfo> parkTrafficInfo = new ArrayList<>();
private JSONArray parkTrafficInfoVOs =new JSONArray(); private JSONArray parkTrafficInfoVOs =new JSONArray();
private List<String> parkCarrierInfo = new ArrayList<>(); private List<String> parkCarrierInfo = new ArrayList<>();
// @JsonSerialize(using = DefaultImgUrlList.class) @JsonSerialize(using = DefaultImgUrlList.class)
private List<SysCarouselInfo> sysCarouselInfos= new ArrayList<>(); private List<String> sysCarouselInfos= new ArrayList<>();
private List<CarrierInfoTypeListVO> carrierInfoVO = new ArrayList<>(); private List<CarrierInfoTypeListVO> carrierInfoVO = new ArrayList<>();
private List<ParkInvestmentDirectionInfo> parkInvestmentDirectionInfos = new ArrayList<>(); private List<ParkInvestmentDirectionInfo> parkInvestmentDirectionInfos = new ArrayList<>();
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -47,7 +47,7 @@ public class DevelopmentInfoController extends BaseController { ...@@ -47,7 +47,7 @@ public class DevelopmentInfoController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段(可为空,传类属性)", type = "String"), @ApiImplicitParam(name = "orderByColumn", value = "排序字段(可为空,传类属性)", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段(可为空,请传asc或者desc)", type = "String") @ApiImplicitParam(name = "isAsc", value = "排序字段(可为空,请传asc或者desc)", type = "String")
}) })
@EncryptBusiness // @EncryptBusiness
public TableDataInfo list(DevelopmentInfoParam developmentInfoParam) { public TableDataInfo list(DevelopmentInfoParam developmentInfoParam) {
boolean login = isLogin(); boolean login = isLogin();
String status = DevelopmentStatusEnum.STATUS_YRZ.getCode()+","+DevelopmentStatusEnum.STATUS_DRZ.getCode(); String status = DevelopmentStatusEnum.STATUS_YRZ.getCode()+","+DevelopmentStatusEnum.STATUS_DRZ.getCode();
...@@ -73,7 +73,7 @@ public class DevelopmentInfoController extends BaseController { ...@@ -73,7 +73,7 @@ public class DevelopmentInfoController extends BaseController {
@ResponseBody @ResponseBody
@ApiOperation(value = "某个开发区信息",notes = "rest风格传参,将参数拼接在url上") @ApiOperation(value = "某个开发区信息",notes = "rest风格传参,将参数拼接在url上")
@ApiImplicitParam(name = "id", value = "开发区id", type = "Long") @ApiImplicitParam(name = "id", value = "开发区id", type = "Long")
@EncryptBusiness // @EncryptBusiness
public DevelopmentInfoAllVO get(@PathVariable Long id) { public DevelopmentInfoAllVO get(@PathVariable Long id) {
return developmentInfoSerivce.getDevelopmentInfo(id,getUserInfo().getUserId(),getUserInfo().getIsMembership()); return developmentInfoSerivce.getDevelopmentInfo(id,getUserInfo().getUserId(),getUserInfo().getIsMembership());
} }
......
...@@ -57,7 +57,7 @@ public class ParkInfoController extends BaseController { ...@@ -57,7 +57,7 @@ public class ParkInfoController extends BaseController {
@ApiImplicitParam(name = "orderByColumn", value = "排序字段(可为空,传类属性)", type = "String"), @ApiImplicitParam(name = "orderByColumn", value = "排序字段(可为空,传类属性)", type = "String"),
@ApiImplicitParam(name = "isAsc", value = "排序字段(可为空,请传asc或者desc)", type = "String") @ApiImplicitParam(name = "isAsc", value = "排序字段(可为空,请传asc或者desc)", type = "String")
}) })
@EncryptBusiness // @EncryptBusiness
public TableDataInfo list(ParkInfoParam parkInfoParam) { public TableDataInfo list(ParkInfoParam parkInfoParam) {
boolean login = isLogin(); boolean login = isLogin();
String status = ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode(); String status = ParkInfoEnum.STATUS_YRZ.getCode()+","+ParkInfoEnum.STATUS_DRZ.getCode();
...@@ -87,7 +87,7 @@ public class ParkInfoController extends BaseController { ...@@ -87,7 +87,7 @@ public class ParkInfoController extends BaseController {
@ResponseBody @ResponseBody
@ApiOperation(value = "获取某个园区信息", notes = "rest风格传参,将参数拼接在url上") @ApiOperation(value = "获取某个园区信息", notes = "rest风格传参,将参数拼接在url上")
@ApiImplicitParam(name = "id", value = "园区id", type = "Long") @ApiImplicitParam(name = "id", value = "园区id", type = "Long")
@EncryptBusiness // @EncryptBusiness
public ParkInfoAllVO get(@PathVariable Long id) { public ParkInfoAllVO get(@PathVariable Long id) {
return parkInfoService.getParkInfo(id, getUserInfo().getUserId(), getUserInfo().getIsMembership()); return parkInfoService.getParkInfo(id, getUserInfo().getUserId(), getUserInfo().getIsMembership());
} }
......
...@@ -385,12 +385,9 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe ...@@ -385,12 +385,9 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
tWrapper.eq(SysCarouselInfo::getType, yuanquId).eq(SysCarouselInfo::getAssociationId, id) tWrapper.eq(SysCarouselInfo::getType, yuanquId).eq(SysCarouselInfo::getAssociationId, id)
.eq(SysCarouselInfo::getUrlType,UrlTypeEnum.PIC.getCode()).eq(SysCarouselInfo::getStatus, StatusEnum.ENABLE.getCode()); .eq(SysCarouselInfo::getUrlType,UrlTypeEnum.PIC.getCode()).eq(SysCarouselInfo::getStatus, StatusEnum.ENABLE.getCode());
List<SysCarouselInfo> sysCarouselInfos = sysCarouselInfoService.list(tWrapper); List<SysCarouselInfo> sysCarouselInfos = sysCarouselInfoService.list(tWrapper);
if(CollectionUtils.isEmpty(sysCarouselInfos)){ List<String> collect = sysCarouselInfos.stream().map(data -> data.getImgUrl()).collect(Collectors.toList());
SysCarouselInfo sysCarouselInfo = new SysCarouselInfo();
sysCarouselInfo.setImgUrl("https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/b0ec7298f5fb3f30e1ef974ba2b987e.jpg"); developmentInfoAllVO.setSysCarouselInfos(collect);
sysCarouselInfos.add(sysCarouselInfo);
}
developmentInfoAllVO.setSysCarouselInfos(sysCarouselInfos);
return developmentInfoAllVO; return developmentInfoAllVO;
} }
......
...@@ -404,12 +404,8 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i ...@@ -404,12 +404,8 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
tWrapper.eq(SysCarouselInfo::getType, yuanquId).eq(SysCarouselInfo::getAssociationId, id) tWrapper.eq(SysCarouselInfo::getType, yuanquId).eq(SysCarouselInfo::getAssociationId, id)
.eq(SysCarouselInfo::getUrlType, UrlTypeEnum.PIC.getCode()).eq(SysCarouselInfo::getStatus, StatusEnum.ENABLE.getCode()); .eq(SysCarouselInfo::getUrlType, UrlTypeEnum.PIC.getCode()).eq(SysCarouselInfo::getStatus, StatusEnum.ENABLE.getCode());
List<SysCarouselInfo> sysCarouselInfos = sysCarouselInfoService.list(tWrapper); List<SysCarouselInfo> sysCarouselInfos = sysCarouselInfoService.list(tWrapper);
if(CollectionUtils.isEmpty(sysCarouselInfos)){ List<String> collect = sysCarouselInfos.stream().map(data -> data.getImgUrl()).collect(Collectors.toList());
SysCarouselInfo sysCarouselInfo = new SysCarouselInfo(); parkInfoAllVO.setSysCarouselInfos(collect);
sysCarouselInfo.setImgUrl("https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/b0ec7298f5fb3f30e1ef974ba2b987e.jpg");
sysCarouselInfos.add(sysCarouselInfo);
}
parkInfoAllVO.setSysCarouselInfos(sysCarouselInfos);
return parkInfoAllVO; return parkInfoAllVO;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment