Bladeren bron

增加特色场景

master
WendyYang 6 maanden geleden
bovenliggende
commit
197a7c4bf6
6 gewijzigde bestanden met toevoegingen van 15 en 0 verwijderingen
  1. +1
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java
  2. +3
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java
  3. +3
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java
  4. +3
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java
  5. +2
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java
  6. +3
    -0
      kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java

+ 1
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java Bestand weergeven

@@ -98,6 +98,7 @@ public class ZoneManage {
return CollUtils.convert(page.getRecords(),
w -> ZoneDetailVO.builder()
.id(w.getId())
.specialFeature(w.getSpecialFeature())
.zoneName(w.getZoneName())
.build());
}


+ 3
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java Bestand weergeven

@@ -34,6 +34,9 @@ public class Zone implements Serializable {
@ApiModelProperty("专区图标")
private String zoneIcon;

@ApiModelProperty("特色场景(附件)")
private String specialFeature;

@TableLogic
private Boolean deleted;



+ 3
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java Bestand weergeven

@@ -27,4 +27,7 @@ public class ZoneSaveReq {
@NotBlank(message = "专区图标不能为空")
private String zoneIcon;

@ApiModelProperty("特色场景")
private String specialFeature;

}

+ 3
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java Bestand weergeven

@@ -28,4 +28,7 @@ public class ZoneDetailVO {
@ApiModelProperty("窗口数量")
private Integer windowCount;

@ApiModelProperty("特色场景")
private String specialFeature;

}

+ 2
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java Bestand weergeven

@@ -133,10 +133,12 @@ public class MatterManage {
return CollUtils.convert(zones, w -> TreeVO.builder()
.name(w.getZoneName())
.zoneIcon(iconUrlMap.get(w.getId()))
.specialFeature(w.getSpecialFeature())
.type(ZzsfwMenuConstant.MENU_TYPE_ZONE)
.build());
}

@Deprecated
public List<TreeVO> getZonesOld() {
List<KqZzsfwMenu> matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class)
.orderByAsc(KqZzsfwMenu::getSort));


+ 3
- 0
kq-vas-api/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java Bestand weergeven

@@ -59,6 +59,9 @@ public class TreeVO {
@ApiModelProperty("子级")
private List<TreeVO> chilren;

@ApiModelProperty("特色场景")
private String specialFeature;

@Tolerate
public TreeVO() {
// 无参构造


Laden…
Annuleren
Opslaan