@@ -98,6 +98,7 @@ public class ZoneManage { | |||||
return CollUtils.convert(page.getRecords(), | return CollUtils.convert(page.getRecords(), | ||||
w -> ZoneDetailVO.builder() | w -> ZoneDetailVO.builder() | ||||
.id(w.getId()) | .id(w.getId()) | ||||
.specialFeature(w.getSpecialFeature()) | |||||
.zoneName(w.getZoneName()) | .zoneName(w.getZoneName()) | ||||
.build()); | .build()); | ||||
} | } | ||||
@@ -34,6 +34,9 @@ public class Zone implements Serializable { | |||||
@ApiModelProperty("专区图标") | @ApiModelProperty("专区图标") | ||||
private String zoneIcon; | private String zoneIcon; | ||||
@ApiModelProperty("特色场景(附件)") | |||||
private String specialFeature; | |||||
@TableLogic | @TableLogic | ||||
private Boolean deleted; | private Boolean deleted; | ||||
@@ -27,4 +27,7 @@ public class ZoneSaveReq { | |||||
@NotBlank(message = "专区图标不能为空") | @NotBlank(message = "专区图标不能为空") | ||||
private String zoneIcon; | private String zoneIcon; | ||||
@ApiModelProperty("特色场景") | |||||
private String specialFeature; | |||||
} | } |
@@ -28,4 +28,7 @@ public class ZoneDetailVO { | |||||
@ApiModelProperty("窗口数量") | @ApiModelProperty("窗口数量") | ||||
private Integer windowCount; | private Integer windowCount; | ||||
@ApiModelProperty("特色场景") | |||||
private String specialFeature; | |||||
} | } |
@@ -133,10 +133,12 @@ public class MatterManage { | |||||
return CollUtils.convert(zones, w -> TreeVO.builder() | return CollUtils.convert(zones, w -> TreeVO.builder() | ||||
.name(w.getZoneName()) | .name(w.getZoneName()) | ||||
.zoneIcon(iconUrlMap.get(w.getId())) | .zoneIcon(iconUrlMap.get(w.getId())) | ||||
.specialFeature(w.getSpecialFeature()) | |||||
.type(ZzsfwMenuConstant.MENU_TYPE_ZONE) | .type(ZzsfwMenuConstant.MENU_TYPE_ZONE) | ||||
.build()); | .build()); | ||||
} | } | ||||
@Deprecated | |||||
public List<TreeVO> getZonesOld() { | public List<TreeVO> getZonesOld() { | ||||
List<KqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) | List<KqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) | ||||
.orderByAsc(KqZzsfwMenu::getSort)); | .orderByAsc(KqZzsfwMenu::getSort)); | ||||
@@ -59,6 +59,9 @@ public class TreeVO { | |||||
@ApiModelProperty("子级") | @ApiModelProperty("子级") | ||||
private List<TreeVO> chilren; | private List<TreeVO> chilren; | ||||
@ApiModelProperty("特色场景") | |||||
private String specialFeature; | |||||
@Tolerate | @Tolerate | ||||
public TreeVO() { | public TreeVO() { | ||||
// 无参构造 | // 无参构造 | ||||