From 127e26e0d44d1bafe7917a79fedc619c2ebdf797 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Mon, 1 Sep 2025 16:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DeviceGroupController.java | 70 ++++++++++++++----- .../controller/device/HomePageController.java | 67 ++++++++++++++++++ .../device/WEBDeviceController.java | 3 +- .../web/service/device/DeviceBizService.java | 2 +- .../fuyuanshen/equipment/domain/Device.java | 7 ++ .../domain/query/DeviceQueryCriteria.java | 2 - .../domain/vo/AlarmInformationVo.java | 44 ++++++++++++ .../equipment/domain/vo/DataOverviewVo.java | 34 +++++++++ .../domain/vo/EquipmentClassificationVo.java | 29 ++++++++ .../domain/vo/LocationHistoryDetailVo.java | 10 +-- .../equipment/service/DeviceService.java | 7 ++ .../service/IDeviceGroupService.java | 10 ++- .../service/impl/DeviceGroupServiceImpl.java | 34 +++++++-- .../service/impl/DeviceServiceImpl.java | 13 ++++ .../service/impl/DeviceTypeServiceImpl.java | 10 +-- .../mapper/equipment/DeviceMapper.xml | 5 +- 16 files changed, 307 insertions(+), 40 deletions(-) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DataOverviewVo.java create mode 100644 fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/EquipmentClassificationVo.java diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java index 3e1018e9..ab2297d7 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java @@ -1,27 +1,27 @@ package com.fuyuanshen.web.controller.device; -import java.util.List; - -import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; -import com.fuyuanshen.common.log.annotation.Log; -import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.validate.AddGroup; import com.fuyuanshen.common.core.validate.EditGroup; -import com.fuyuanshen.common.log.enums.BusinessType; import com.fuyuanshen.common.excel.utils.ExcelUtil; -import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; +import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit; +import com.fuyuanshen.common.log.annotation.Log; +import com.fuyuanshen.common.log.enums.BusinessType; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo; +import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo; import com.fuyuanshen.equipment.service.IDeviceGroupService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 设备分组 @@ -51,6 +51,24 @@ public class DeviceGroupController extends BaseController { } + /** + * 查询设备分组列表(分页) + */ + @Operation(summary = "查询设备分组列表(分页)") + @SaCheckPermission("fys-equipment:group:list") + @GetMapping("/listPage") + public TableDataInfo listPage(DeviceGroupBo bo) { + List list = deviceGroupService.queryList(bo); + // return R.ok(list); + return null; + } + + // @GetMapping("/list") + // public TableDataInfo list(DeviceAlarmBo bo, PageQuery pageQuery) { + // return deviceAlarmService.queryPageList(bo, pageQuery); + // } + + /** * 导出设备分组列表 */ @@ -110,7 +128,7 @@ public class DeviceGroupController extends BaseController { @SaCheckPermission("fys-equipment:group:remove") @Log(title = "设备分组", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotNull(message = "主键不能为空") @PathVariable Long[] ids) { return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true)); } @@ -124,11 +142,25 @@ public class DeviceGroupController extends BaseController { @Operation(summary = "绑定设备分组") // @SaCheckPermission("fys-equipment:group:remove") @Log(title = "绑定设备分组", businessType = BusinessType.DELETE) - @GetMapping("/groupId/{deviceId}") - public R bindingDevice(@NotEmpty(message = "分组id 不能为空") @PathVariable Long groupId, - @NotEmpty(message = "设备id 不能为空") @PathVariable Long[] deviceId) { + @GetMapping("/groupId/{groupId}/{deviceId}") + public R bindingDevice(@NotNull(message = "分组id 不能为空") @PathVariable Long groupId, + @NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) { return toAjax(deviceGroupService.bindingDevice(groupId, deviceId)); } + /** + * 解绑设备分组 + * + * @param deviceId 设备id + */ + @Operation(summary = "解绑设备分组") + // @SaCheckPermission("fys-equipment:group:remove") + @Log(title = "解绑设备分组", businessType = BusinessType.DELETE) + @GetMapping("/groupUnbind/{deviceId}") + public R groupUnbind(@NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) { + return toAjax(deviceGroupService.groupUnbind(deviceId)); + } + + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java new file mode 100644 index 00000000..b8786bf7 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java @@ -0,0 +1,67 @@ +package com.fuyuanshen.web.controller.device; + +import com.fuyuanshen.common.core.domain.R; +import com.fuyuanshen.equipment.domain.vo.DataOverviewVo; +import com.fuyuanshen.equipment.service.DeviceService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 首页数据 + * + * @author: 默苍璃 + * @date: 2025-09-0113:46 + */ +@Tag(name = "首页数据", description = "首页数据") +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/api/device/homepage") +public class HomePageController { + + private final DeviceService deviceService; + + + /** + * 获取 数据总览 + * DataOverview + */ + @GetMapping("/getDataOverview") + public R getDataOverview() { + return R.ok(deviceService.getDataOverview()); + } + + + + + // 获取设备使用数据 + @GetMapping("/{deviceId}") + public Map getUsageData( + @PathVariable String deviceId, + @RequestParam String range) { + + Map response = new HashMap<>(); + + if ("halfYear".equals(range)) { + response.put("months", Arrays.asList("1月", "2月", "3月", "4月", "5月", "6月")); + response.put("data", Arrays.asList(45, 52, 38, 60, 56, 48)); + } else if ("oneYear".equals(range)) { + response.put("months", Arrays.asList("7月", "8月", "9月", "10月", "11月", "12月", + "1月", "2月", "3月", "4月", "5月", "6月")); + response.put("data", Arrays.asList(42, 38, 45, 48, 52, 55, 45, 52, 38, 60, 56, 48)); + } + + response.put("deviceId", deviceId); + response.put("range", range); + response.put("lastUpdate", new Date()); + + return response; + } +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java index b1e34d1d..c9580591 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java @@ -53,7 +53,7 @@ public class WEBDeviceController extends BaseController { */ @Operation(summary = "设备详情") @GetMapping(value = "/pc/detail/{id}") - public R getDevice(@PathVariable Long id) { + public R getDeviceDetail(@PathVariable Long id) { WebDeviceVo device = deviceService.getDevice(id); return R.ok(device); } @@ -101,7 +101,6 @@ public class WEBDeviceController extends BaseController { } - } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java index 0b02d7c7..bfd9d906 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java @@ -382,7 +382,7 @@ public class DeviceBizService { detailVo.setDeviceName(device.getDeviceName()); detailVo.setStartLocation(entry.getValue().get(0).getString("address")); detailVo.setEndLocation(entry.getValue().get(entry.getValue().size()-1).getString("address")); - detailVo.setDetailList(entry.getValue()); + // detailVo.setDetailList(entry.getValue()); result.add(detailVo); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java index 7ee0d622..2c9a452e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java @@ -25,6 +25,13 @@ public class Device extends TenantEntity { @Schema(title = "ID") private Long id; + /** + * 设备ID + */ + @TableField(exist = false) + @Schema(title = "设备ID") + private Long deviceId; + @Schema(title = "设备记录ID") @TableField(exist = false) private Long assignId; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java index b9643d6c..90f70113 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java @@ -101,13 +101,11 @@ public class DeviceQueryCriteria extends BaseEntity { */ private Boolean isAdmin = false; - /** * 设备所属分组 */ private Long groupId; - /** * 设备地区 */ diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java new file mode 100644 index 00000000..09e73b6d --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AlarmInformationVo.java @@ -0,0 +1,44 @@ +package com.fuyuanshen.equipment.domain.vo; + +import lombok.Data; + +/** + * 报警信息 + * + * @author: 默苍璃 + * @date: 2025-09-0114:24 + */ +@Data +public class AlarmInformationVo { + + /** + * 报警总数 + */ + private Integer alarmsTotal = 0; + + /** + * 总处理报警 + */ + private Integer processingAlarm = 0; + + /** + * 强制报警 + */ + private Integer alarmForced = 0; + + /** + * 撞击闯入 + */ + private Integer intrusionImpact = 0; + + /** + * 手动报警 + */ + private Integer alarmManual = 0; + + /** + * 电子围栏 + */ + private Integer fenceElectronic = 0; + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DataOverviewVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DataOverviewVo.java new file mode 100644 index 00000000..c8c016d7 --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DataOverviewVo.java @@ -0,0 +1,34 @@ +package com.fuyuanshen.equipment.domain.vo; + +import lombok.Data; + +/** + * 数据总览 + * + * @author: 默苍璃 + * @date: 2025-09-0114:24 + */ +@Data +public class DataOverviewVo { + + /** + * 设备数据量 + */ + private Integer devicesNumber = 0; + + /** + * 在线设备 + */ + private Integer equipmentOnline = 0; + + /** + * 新增绑定设备 + */ + private Integer bindingNew = 0; + + /** + * 异常设备 + */ + private Integer equipmentAbnormal = 0; + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/EquipmentClassificationVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/EquipmentClassificationVo.java new file mode 100644 index 00000000..d84f59ad --- /dev/null +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/EquipmentClassificationVo.java @@ -0,0 +1,29 @@ +package com.fuyuanshen.equipment.domain.vo; + +import lombok.Data; + +/** + * 设备分类 + * + * @author: 默苍璃 + * @date: 2025-09-0114:24 + */ +@Data +public class EquipmentClassificationVo { + + /** + * 4G设备 + */ + private Integer equipment4G = 0; + + /** + * 蓝牙设备 + */ + private Integer deviceBluetooth = 0; + + /** + * 4G & 蓝牙 设备 + */ + private Integer devices4GAndBluetooth = 0; + +} diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java index cf499741..0722ea6c 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java @@ -32,10 +32,10 @@ public class LocationHistoryDetailVo { @ExcelProperty(value = "结束地点") private String endLocation; - /** - * 轨迹详情 - */ - @ExcelProperty(value = "轨迹详情") - private List detailList; + // /** + // * 轨迹详情 + // */ + // @ExcelProperty(value = "轨迹详情") + // private List detailList; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java index 22d738d3..d2216b64 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java @@ -11,6 +11,7 @@ import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.vo.AppDeviceVo; import com.fuyuanshen.equipment.domain.vo.CustomerVo; +import com.fuyuanshen.equipment.domain.vo.DataOverviewVo; import java.io.IOException; import java.util.List; @@ -115,4 +116,10 @@ public interface DeviceService extends IService { */ int webUnBindDevice(Long id); + /** + * 获取数据总览 + * + * @return + */ + DataOverviewVo getDataOverview(); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java index 3be6a880..2f407aa9 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IDeviceGroupService.java @@ -66,5 +66,13 @@ public interface IDeviceGroupService { * @param deviceId 设备id * @return 是否绑定成功 */ - Boolean bindingDevice(@NotEmpty(message = "分组id 不能为空") Long groupId, @NotEmpty(message = "设备id 不能为空") Long[] deviceId); + Boolean bindingDevice(Long groupId, Long[] deviceId); + + /** + * 解绑设备分组 + * + * @param deviceId 设备id + * @return 是否解绑成功 + */ + Boolean groupUnbind( Long[] deviceId); } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java index ecf9a82a..bb02c2ce 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceGroupServiceImpl.java @@ -92,6 +92,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { vo.setId(group.getId()); vo.setGroupName(group.getGroupName()); vo.setStatus(group.getStatus() == 1 ? "正常" : "禁用"); + vo.setParentId(group.getParentId()); vo.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(group.getCreateTime())); return vo; } @@ -124,10 +125,12 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { throw new RuntimeException("分组名称已存在,请勿重复添加!!!"); } - // 验证父分组是否存在(如果提供了parentId) - DeviceGroup pDeviceGroup = baseMapper.selectById(bo.getParentId()); - if (bo.getParentId() != null && pDeviceGroup == null) { - throw new RuntimeException("父分组不存在!!!"); + if (bo.getParentId() != null) { + // 验证父分组是否存在(如果提供了parentId) + DeviceGroup pDeviceGroup = baseMapper.selectById(bo.getParentId()); + if (bo.getParentId() != null && pDeviceGroup == null) { + throw new RuntimeException("父分组不存在!!!"); + } } DeviceGroup add = MapstructUtils.convert(bo, DeviceGroup.class); @@ -199,4 +202,27 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService { return true; } + + /** + * 解绑设备分组 + * + * @param deviceId 设备id + * @return 是否解绑成功 + */ + @Override + public Boolean groupUnbind( Long[] deviceId) { + + if (deviceId != null && deviceId.length > 0) { + // 创建更新条件 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", Arrays.asList(deviceId)); + updateWrapper.set("group_id", null); + + // 执行批量更新 + deviceMapper.update(updateWrapper); + } + + return true; + } + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java index 357a82d1..2de40b42 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java @@ -30,6 +30,7 @@ import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria; import com.fuyuanshen.equipment.domain.vo.AppDeviceVo; import com.fuyuanshen.equipment.domain.vo.CustomerVo; +import com.fuyuanshen.equipment.domain.vo.DataOverviewVo; import com.fuyuanshen.equipment.enums.BindingStatusEnum; import com.fuyuanshen.equipment.enums.CommunicationModeEnum; import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum; @@ -595,6 +596,8 @@ public class DeviceServiceImpl extends ServiceImpl impleme } + + /** * 查询设备MAC号 * @@ -613,4 +616,14 @@ public class DeviceServiceImpl extends ServiceImpl impleme } + /** + * 获取数据总览 + * + * @return + */ + @Override + public DataOverviewVo getDataOverview() { + return null; + } + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java index cdeaacd4..d3cb540b 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java @@ -157,11 +157,11 @@ public class DeviceTypeServiceImpl extends ServiceImpl devices = deviceMapper.selectList(new QueryWrapper() - .eq("device_type", deviceTypeGrants.getDeviceTypeId())); - if (CollectionUtil.isNotEmpty(devices)) { - throw new RuntimeException("该设备类型已绑定设备,无法修改!!!"); - } + // List devices = deviceMapper.selectList(new QueryWrapper() + // .eq("device_type", deviceTypeGrants.getDeviceTypeId())); + // if (CollectionUtil.isNotEmpty(devices)) { + // throw new RuntimeException("该设备类型已绑定设备,无法修改!!!"); + // } // 校验设备类型名称 DeviceType dt = deviceTypeMapper.selectOne(new QueryWrapper().eq("type_name", resources.getTypeName())); diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index d12a65c4..661a4b37 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -41,7 +41,7 @@ SELECT * FROM ( SELECT - da.id AS id, d.device_name, d.bluetooth_name, + da.id AS id, d.id AS deviceId, d.device_name, d.bluetooth_name, d.pub_topic, d.sub_topic, d.device_pic, d.device_mac, d.device_sn, d.update_by, d.device_imei, d.update_time, dg.id AS device_type, @@ -71,6 +71,9 @@ and da.active = #{criteria.deviceStatus} + + and d.group_id = #{criteria.groupId} + and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}