From 1869db087444c774d189a9abb0edcda74ec07ace Mon Sep 17 00:00:00 2001 From: wuyw <373811525@qq.com> Date: Wed, 14 Aug 2024 08:00:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E9=97=A8=E6=89=93=E5=BC=80=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicedetail/DeviceDetailController.java | 17 +++++++++++----- .../devicedetail/IDeviceDetailService.java | 6 +++++- .../impl/DeviceDetailServiceImpl.java | 20 ++++++++++++++++++- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java index b6f2cc5..0129411 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java @@ -1,13 +1,13 @@ package com.fastbee.data.controller.devicedetail; -import com.alibaba.fastjson2.JSONObject; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; +import com.fastbee.common.core.domain.CommonResult; import com.fastbee.common.model.vo.iot.QueryLogVo; -import com.fastbee.common.utils.StringUtils; import com.fastbee.data.service.devicedetail.IDeviceDetailService; import com.fastbee.iot.domain.Device; -import com.fastbee.iot.model.DeviceHistoryParam; +import com.fastbee.iot.model.haiwei.CmdHaiWeiVo; +import com.fastbee.iot.model.haiwei.dto.CmdHaiWeiDto; import com.fastbee.waterele.domain.MaWatereleRecord; import com.fastbee.waterele.domain.dto.MaGuangaiRecordDto; import com.fastbee.waterele.domain.dto.MaWatereleRecordDto; @@ -15,10 +15,8 @@ import com.fastbee.xunjian.domain.XjInspectionRecords; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; @Api(tags = "设备详情数据") @@ -112,6 +110,15 @@ public class DeviceDetailController extends BaseController { return AjaxResult.success(list); } + @ApiOperation("箱门打开控制") + @PostMapping("/hwcmd") + public CommonResult cmdDevices(@RequestBody CmdHaiWeiDto cmdHwDto) { + return deviceDetailService.cmdDevices(cmdHwDto); + } + + + + diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java index e0d7b35..ce3a978 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java @@ -1,14 +1,16 @@ package com.fastbee.data.service.devicedetail; +import com.fastbee.common.core.domain.CommonResult; import com.fastbee.common.model.vo.iot.QueryLogVo; import com.fastbee.iot.domain.Device; +import com.fastbee.iot.model.haiwei.CmdHaiWeiVo; +import com.fastbee.iot.model.haiwei.dto.CmdHaiWeiDto; import com.fastbee.waterele.domain.MaWatereleRecord; import com.fastbee.waterele.domain.dto.MaGuangaiRecordDto; import com.fastbee.waterele.domain.dto.MaWatereleRecordDto; import com.fastbee.xunjian.domain.XjInspectionRecords; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; public interface IDeviceDetailService { @@ -27,4 +29,6 @@ public interface IDeviceDetailService { ArrayList gongdianChart(QueryLogVo queryLogVo); List xunjianRecord(QueryLogVo queryLogVo); + + CommonResult cmdDevices(CmdHaiWeiDto cmdHaiWeiDto); } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java index 10ed663..589da5d 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java @@ -1,11 +1,15 @@ package com.fastbee.data.service.devicedetail.impl; +import com.fastbee.common.core.domain.CommonResult; import com.fastbee.common.model.vo.iot.QueryLogVo; import com.fastbee.common.utils.DevParamsUtils; +import com.fastbee.common.utils.StringUtils; import com.fastbee.data.service.devicedetail.IDeviceDetailService; import com.fastbee.iot.domain.Device; -import com.fastbee.iot.domain.ThingsModel; +import com.fastbee.iot.haiwei.service.HaiWeiService; import com.fastbee.iot.mapper.DeviceMapper; +import com.fastbee.iot.model.haiwei.CmdHaiWeiVo; +import com.fastbee.iot.model.haiwei.dto.CmdHaiWeiDto; import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.service.IThingsModelService; import com.fastbee.waterele.domain.MaWatereleRecord; @@ -33,6 +37,8 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService { private XjInspectionRoutesMapper xjInspectionRoutesMapper; @Autowired private XjInspectionRecordsMapper xjInspectionRecordsMapper; + @Autowired + private HaiWeiService haiWeiService; public DeviceDetailServiceImpl(DeviceMapper deviceMapper) { this.deviceMapper = deviceMapper; } @@ -110,6 +116,18 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService { return new ArrayList<>(); } + @Override + public CommonResult cmdDevices(CmdHaiWeiDto cmdHaiWeiDto) { + String url = "https://cloud.haiwell.com/api/project/machine/datagroup/setTagsValue"; + Device deviceEntity = deviceMapper.selectDeviceByDeviceId(cmdHaiWeiDto.getDeviceId()); + Map devParams1 = DevParamsUtils.getDevParams(deviceEntity.getDevParams()); + String guimenIds = devParams1.get("guimenIds").toString(); + if (StringUtils.isEmpty(guimenIds)) { + return null; + } + cmdHaiWeiDto.setDeviceId(Long.valueOf(guimenIds)); + return haiWeiService.cmdDevices(cmdHaiWeiDto); + } }