From 72ce25c9c0a03c9279248dc473dbe3497b2d97dc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 14:54:09 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/LightMapper.xml | 1 +
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 5 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 13 +++++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 8 +++-----
4 files changed, 18 insertions(+), 9 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 5540329..bac6c57 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
@@ -34,6 +34,11 @@
private String remark;
/**
+ * 鐏ご鏁伴噺锛岄粯璁ゅ弻鐏ご銆�1锛氬崟鐏ご锛�2锛氬弻鐏ご
+ */
+ private int lightCount;
+
+ /**
* 鐏�1浜害鐧惧垎姣旓紝0-100
*/
private Integer lightPercent;
diff --git a/dao/src/main/resources/mapper/LightMapper.xml b/dao/src/main/resources/mapper/LightMapper.xml
index 93770f4..d8190e5 100644
--- a/dao/src/main/resources/mapper/LightMapper.xml
+++ b/dao/src/main/resources/mapper/LightMapper.xml
@@ -8,6 +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="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 b27bcc6..1e14ff3 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
@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LightControlParam;
+import com.sandu.ximon.admin.param.LightPowerSettingParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightReportDataService;
@@ -131,11 +132,8 @@
* 璁剧疆鍔熺巼
*/
@PostMapping("/setPower/{power1}/{power2}")
- public ResponseVO<Object> setPower(@RequestBody List<Long> ids, @PathVariable Integer power1,@PathVariable Integer power2) {
- if(ids.isEmpty()||power1==null||power2==null){
- return ResponseUtil.fail("id涓虹┖鎴栬�呭姛鐜囦负绌�");
- }
- boolean resule= lightService.setPower(ids,power1,power2);
+ public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
+ boolean resule= lightService.setPower(lightPowerSettingParam);
return ResponseUtil.success(resule);
}
}
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 f47039a..51e2048 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
@@ -19,6 +19,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightControlParam;
+import com.sandu.ximon.admin.param.LightPowerSettingParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -485,11 +486,15 @@
return CommonPage.restPage(list);
}
- public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
- List<Light> lights = listByIds(ids);
+ public boolean setPower(LightPowerSettingParam lightPowerSettingParam) {
+ if (lightPowerSettingParam.getLightIds().size() == 0) {
+ throw new BusinessException("鐏潌ID涓嶈兘涓虹┖");
+ }
+ List<Light> lights = listByIds(lightPowerSettingParam.getLightIds());
lights.forEach(light -> {
- light.setPower1(power1);
- light.setPower2(power2);
+ light.setPower1(lightPowerSettingParam.getPower1());
+ light.setPower2(lightPowerSettingParam.getPower2());
+ light.setLightCount(lightPowerSettingParam.getLightCount());
}
);
return updateBatchById(lights);
--
Gitblit v1.9.3