From 0bbba0fe5cfc2c37eafecfd70d45930165ba1930 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 08 三月 2022 14:05:56 +0800
Subject: [PATCH] 用户新增密码字段
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index c1329f8..4f3a6e3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -18,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* @Author liuhaonan
@@ -35,6 +37,11 @@
return ResponseUtil.success(playPlanNvService.addPlan(param));
}
+ @GetMapping("/getByPlanId/{planId}")
+ public ResponseVO<Object> getPlan(@PathVariable Long planId) {
+ return ResponseUtil.success(playPlanNvService.getByPlanId(planId));
+ }
+
@PostMapping("/update/{planId}")
public ResponseVO<Object> updateLEDPlan(@PathVariable Long planId,@RequestBody @Validated PlayPlanParam param) {
return ResponseUtil.success(playPlanNvService.updatePlan(planId, param));
@@ -45,7 +52,7 @@
return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
}
- @PostMapping("/push/{plianId}")
+ @PostMapping(value ="/push/{plianId}",produces = "application/json;charset=UTF-8")
public ResponseVO<Object> pushToLed(@PathVariable Long plianId,@RequestBody List<String> playerIds) {
return ResponseUtil.success(playPlanNvService.pushToLed(plianId,playerIds));
}
@@ -60,7 +67,12 @@
if(StrUtil.isNotBlank(keyword)){
wrapper.like(PlayPlanNv::getName,keyword);
}
- return ResponseUtil.successPage(playPlanNvService.list(wrapper));
+ List<PlayPlanNv> list = playPlanNvService.list(wrapper);
+ //PlayPlanParam param=new PlayPlanParam();
+ list.forEach(plan->{
+ plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
+ });
+ return ResponseUtil.successPage(list);
}
}
--
Gitblit v1.9.3