From 14ce780fb9977acad2b6dabf9033635b076f590b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 14:49:12 +0800
Subject: [PATCH] Changes
---
dao/src/main/resources/mapper/PlayPlanNvMapper.xml | 3 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 10 +---
dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java | 19 ++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 13 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 6 +--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 19 ++++-----
dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java | 4 -
9 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java
index 2af19e0..6758481 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java
@@ -4,15 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.common.mybatis.JsonIntegerArrayTypeHandler;
import com.sandu.ximon.dao.bo.SchedulesDTO;
import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* 鎾斁璁″垝琛�
@@ -103,12 +102,20 @@
private String endTime;
/**
- * schedule瀹炰綋
+ * 瀹氭椂schedule瀹炰綋
*/
@JsonIgnore
private String schedule;
/**
+ * 鑺傜洰鐢╯chedules瀹炰綋
+ */
+ @JsonIgnore
+ private String schedules;
+
+
+
+ /**
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java
index d5e3ee0..65aad29 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java
@@ -13,6 +13,6 @@
@Data
public class PushToLed implements Serializable {
- private String schedule;
+ private String schedules;
private String pages;
}
diff --git a/dao/src/main/resources/mapper/PlayPlanNvMapper.xml b/dao/src/main/resources/mapper/PlayPlanNvMapper.xml
index 51459e1..c680eee 100644
--- a/dao/src/main/resources/mapper/PlayPlanNvMapper.xml
+++ b/dao/src/main/resources/mapper/PlayPlanNvMapper.xml
@@ -20,6 +20,7 @@
<result property="startTime" column="start_time" jdbcType="VARCHAR"/>
<result property="endTime" column="end_time" jdbcType="VARCHAR"/>
<result property="schedule" column="schedule" jdbcType="VARCHAR"/>
+ <result property="schedules" column="schedules" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
@@ -35,7 +36,7 @@
<select id="pushToLed" resultType="com.sandu.ximon.dao.domain.PushToLed" parameterType="java.lang.Long">
SELECT
- t1.SCHEDULE,
+ t1.SCHEDULEs,
t2.pages
FROM
play_plan_nv t1
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 a3357e5..0cce77d 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,12 +1,12 @@
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;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.PermissionConfig;
@@ -14,16 +14,13 @@
import com.sandu.ximon.admin.service.PlayPlanNvService;
import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.dao.bo.SchedulesDTO;
-import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.PlayPlanNv;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* @Author liuhaonan
@@ -57,6 +54,7 @@
return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
}
+ @AnonymousAccess
@PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index ec4939c..bdda4e0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -1,14 +1,11 @@
package com.sandu.ximon.admin.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.VnnoxParam;
import com.sandu.ximon.admin.security.PermissionConfig;
-import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LedPlayerEntityService;
import com.sandu.ximon.admin.service.PoleBindingService;
import com.sandu.ximon.admin.service.PoleService;
@@ -17,10 +14,7 @@
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.LedV2RegisterResultEntity;
-import com.sandu.ximon.dao.domain.PoleBinding;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
-import com.sun.javafx.collections.MappingChange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -82,6 +76,7 @@
/**
* 鍚屾鎾斁
*/
+ @AnonymousAccess
@PostMapping("/syncPlay")
public ResponseVO<Object> syncPlay(@RequestBody Map map) {
List playIdlist = (List)map.get("playIdlist");
@@ -93,6 +88,7 @@
/**
* ntp瀵规椂
*/
+ @AnonymousAccess
@PostMapping("/ntp")
public ResponseVO<Object> ntp(@RequestBody Map map) {
boolean enable = (boolean)map.get("enable");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
index e8316ff..3c35399 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
@@ -1,7 +1,6 @@
package com.sandu.ximon.admin.dto.nova;
import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.dto.SchedulesDTO;
import com.sandu.ximon.admin.utils.request.VnnoxRequest;
import lombok.Data;
@@ -17,8 +16,7 @@
// 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
private List<String> playerIds;
// 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
-// private List<SchedulesDTO> schedules;
- private List<SchedulesDTO> schedules;
+ private Map schedules;
// 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
private List<Map<String,Object>> pages ;
// 鑺傜洰涓嬭浇杩涘害閫氱煡鎺ュ彛锛屼細閫氳繃姝ゆ帴鍙ｅ皢鑺傜洰鐨勪笅杞借繘搴﹀彂缁欏鎴凤紝鎺ュ彛鐨勫搷搴旀椂闂翠笉鑳借秴杩�3s
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index 8d2f4d5..f990228 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -660,7 +660,7 @@
BigDecimal totalTime = (hour.add(min));
- BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
+ BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
System.out.println(energySaving);
return energySaving;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index 6f3b801..94f8bbd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -103,7 +103,8 @@
schedulesDTOS.add(openDto);
}
- playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
+ playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+ playPlan.setSchedules(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -154,24 +155,23 @@
program.setPlayerIds(playerIds);
System.out.println(pushToLed.getPages());
+ //鑾峰彇鑺傜洰瀹炰綋
program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
-//
-// test test = JSON.parseObject(pushToLed.getSchedule(), test.class);
-//
-// SchedulesDTO schedulesDTO = new SchedulesDTO();
-// schedulesDTO.setExecTime(A.get);
- program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
+ //鑾峰彇鑺傜洰瀹氭椂瀹炰綋
+ program.setSchedules((JSON.parseObject(pushToLed.getSchedules(), Map.class)));
+ //鑾峰彇瀹氭椂寮�鍏冲睆骞�
+// program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
// Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
+// VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
- // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
List<String> success = new ArrayList<>();
List<String> fail = new ArrayList<>();
if (vnnoxResultResponse.getData() != null) {
@@ -201,7 +201,6 @@
return result;
// return program;
-
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
index 6aea084..b76aa07 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
@@ -39,6 +39,19 @@
return JSON.parseObject(result,VnnoxResultResponse.class);
}
+
+ public VnnoxResultResponse normalProgram(PlayerProgram program) {
+
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
+ program.toJson(),
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+ System.out.println(program.toJson());
+ LogUtils.error("鑺傜洰鎾斁response:"+result);
+ return JSON.parseObject(result,VnnoxResultResponse.class);
+ }
+
/**
* 瀹氭椂鑺傜洰鎾斁
* @param program
--
Gitblit v1.9.3