From a4a5e8e957ee9e390b53c876c9c996aa892a6375 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 14:05:29 +0800
Subject: [PATCH] Changes
---
dao/src/main/resources/mapper/LightMapper.xml | 2 +-
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 9 ++++++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
index bac6c57..45469c7 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
import java.io.Serializable;
import java.time.LocalDateTime;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
/**
* 璺伅琛�
@@ -16,6 +17,8 @@
*/
@TableName(value ="light")
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class Light implements Serializable {
/**
*
diff --git a/dao/src/main/resources/mapper/LightMapper.xml b/dao/src/main/resources/mapper/LightMapper.xml
index d8190e5..f764d06 100644
--- a/dao/src/main/resources/mapper/LightMapper.xml
+++ b/dao/src/main/resources/mapper/LightMapper.xml
@@ -8,7 +8,7 @@
<id property="lightId" column="light_id" jdbcType="BIGINT"/>
<result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="lighCount" column="light_count" jdbcType="INTEGER"/>
+ <result property="lightCount" column="light_count" jdbcType="INTEGER"/>
<result property="lightPercent" column="light_percent" jdbcType="INTEGER"/>
<result property="light2Percent" column="light2_percent" jdbcType="INTEGER"/>
<result property="power1" column="power1" jdbcType="INTEGER"/>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index e16802d..ce82c7a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -139,7 +139,7 @@
/**
* 璁剧疆鍔熺巼
*/
- @PostMapping("/setPower/{power1}/{power2}")
+ @PostMapping("/setPower")
public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
boolean resule= lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
--
Gitblit v1.9.3