From 3969e50566519083630bea62a7c9b6dd3b315ee8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 29 Aug 2025 10:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=88=97=E8=A1=A8(web)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/DeviceAlarmController.java | 21 ++--- .../device/DeviceShareController.java | 43 ++++++++++ .../web/service/DeviceShareService.java | 83 +++++++++++-------- .../service/impl/WEBDeviceServiceImpl.java | 2 +- .../app/domain/bo/AppDeviceShareBo.java | 19 ++++- .../app/mapper/AppDeviceShareMapper.java | 10 ++- .../mapper/app/AppDeviceShareMapper.xml | 55 ++++++++---- 7 files changed, 169 insertions(+), 64 deletions(-) create mode 100644 fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java index 1741190a..a7b16c01 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java @@ -31,7 +31,7 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/equipment/alarm") +@RequestMapping("api/equipment/alarm") public class DeviceAlarmController extends BaseController { private final IDeviceAlarmService deviceAlarmService; @@ -39,17 +39,17 @@ public class DeviceAlarmController extends BaseController { /** * 查询设备告警列表 */ - @SaCheckPermission("equipment:alarm:list") + // @SaCheckPermission("equipment:alarm:list") @GetMapping("/list") public TableDataInfo list(DeviceAlarmBo bo, PageQuery pageQuery) { return deviceAlarmService.queryPageList(bo, pageQuery); } /** - * 设备告警列表 + * 导出设备告警列表 */ - @SaCheckPermission("equipment:alarm:export") - @Log(title = "设备告警", businessType = BusinessType.EXPORT) + // @SaCheckPermission("equipment:alarm:export") + @Log(title = "导出设备告警列表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DeviceAlarmBo bo, HttpServletResponse response) { List list = deviceAlarmService.queryList(bo); @@ -61,17 +61,17 @@ public class DeviceAlarmController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("equipment:alarm:query") + // @SaCheckPermission("equipment:alarm:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(deviceAlarmService.queryById(id)); } /** * 新增设备告警 */ - @SaCheckPermission("equipment:alarm:add") + // @SaCheckPermission("equipment:alarm:add") @Log(title = "设备告警", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -82,7 +82,7 @@ public class DeviceAlarmController extends BaseController { /** * 修改设备告警 */ - @SaCheckPermission("equipment:alarm:edit") + // @SaCheckPermission("equipment:alarm:edit") @Log(title = "设备告警", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -95,11 +95,12 @@ public class DeviceAlarmController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("equipment:alarm:remove") + // @SaCheckPermission("equipment:alarm:remove") @Log(title = "设备告警", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true)); } + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java new file mode 100644 index 00000000..e623e9d6 --- /dev/null +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java @@ -0,0 +1,43 @@ +package com.fuyuanshen.web.controller.device; + +import com.fuyuanshen.app.domain.bo.AppDeviceShareBo; +import com.fuyuanshen.app.domain.vo.AppDeviceShareVo; +import com.fuyuanshen.common.mybatis.core.page.PageQuery; +import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; +import com.fuyuanshen.common.web.core.BaseController; +import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; +import com.fuyuanshen.web.service.DeviceShareService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 设备分享管理 + * + * @author Lion Li + * @date 2025-08-28 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("api/equipment/share") +public class DeviceShareController extends BaseController { + + private final DeviceShareService appDeviceShareService; + + + /** + *查询设备分享列表(web) + */ + // @SaCheckPermission("equipment:alarm:list") + @GetMapping("/list") + public TableDataInfo list(AppDeviceShareBo bo, PageQuery pageQuery) { + return appDeviceShareService.queryWebList(bo, pageQuery); + } + + + +} diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java index d73eaa7f..9e493b14 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java @@ -43,7 +43,7 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*; public class DeviceShareService { private final AppDeviceShareMapper appDeviceShareMapper; - + private final DeviceMapper deviceMapper; private final DeviceTypeMapper deviceTypeMapper; @@ -61,32 +61,32 @@ public class DeviceShareService { } private static void buildDeviceStatus(AppDeviceShareVo item) { - //设备在线状态 - String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); - if(StringUtils.isNotBlank(onlineStatus)){ + // 设备在线状态 + String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); + if (StringUtils.isNotBlank(onlineStatus)) { item.setOnlineStatus(1); - }else{ + } else { item.setOnlineStatus(0); } - String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX); + String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX); // 获取电量 - if(StringUtils.isNotBlank(deviceStatus)){ + if (StringUtils.isNotBlank(deviceStatus)) { JSONObject jsonObject = JSONObject.parseObject(deviceStatus); item.setBattery(jsonObject.getString("batteryPercentage")); - }else{ + } else { item.setBattery("0"); } - String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX); - if(StringUtils.isNotBlank(location)){ + String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX); + if (StringUtils.isNotBlank(location)) { JSONObject jsonObject = JSONObject.parseObject(location); item.setLatitude(jsonObject.getString("latitude")); item.setLongitude(jsonObject.getString("longitude")); } - String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX); - if(StringUtils.isNotBlank(alarmStatus)){ + String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); + if (StringUtils.isNotBlank(alarmStatus)) { item.setAlarmStatus(alarmStatus); } } @@ -96,7 +96,7 @@ public class DeviceShareService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(AppDeviceShare::getId, id); List appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper); - if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){ + if (appDeviceShareVos == null || appDeviceShareVos.isEmpty()) { return null; } @@ -113,7 +113,7 @@ public class DeviceShareService { shareDetailVo.setDeviceMac(device.getDeviceMac()); DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); - if(deviceType!=null){ + if (deviceType != null) { shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode())); } shareDetailVo.setDevicePic(device.getDevicePic()); @@ -125,52 +125,53 @@ public class DeviceShareService { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(AppPersonnelInfo::getDeviceId, device.getId()); List appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw); - if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){ + if (appPersonnelInfoVos != null && !appPersonnelInfoVos.isEmpty()) { shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0)); } - //设备在线状态 - String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); - if(StringUtils.isNotBlank(onlineStatus)){ + // 设备在线状态 + String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX); + if (StringUtils.isNotBlank(onlineStatus)) { shareDetailVo.setOnlineStatus(1); - }else{ + } else { shareDetailVo.setOnlineStatus(0); } - String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX); + String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX); // 获取电量 - if(StringUtils.isNotBlank(deviceStatus)){ + if (StringUtils.isNotBlank(deviceStatus)) { JSONObject jsonObject = JSONObject.parseObject(deviceStatus); shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode")); shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode")); shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage")); shareDetailVo.setChargeState(jsonObject.getString("chargeState")); shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime")); - }else{ + } else { shareDetailVo.setBatteryPercentage("0"); } // 获取经度纬度 - String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX; + String locationKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX; String locationInfo = RedisUtils.getCacheObject(locationKey); - if(StringUtils.isNotBlank(locationInfo)){ + if (StringUtils.isNotBlank(locationInfo)) { JSONObject jsonObject = JSONObject.parseObject(locationInfo); shareDetailVo.setLongitude(jsonObject.get("longitude").toString()); shareDetailVo.setLatitude(jsonObject.get("latitude").toString()); - shareDetailVo.setAddress((String)jsonObject.get("address")); + shareDetailVo.setAddress((String) jsonObject.get("address")); } - String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX); - if(StringUtils.isNotBlank(alarmStatus)){ + String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX); + if (StringUtils.isNotBlank(alarmStatus)) { shareDetailVo.setAlarmStatus(alarmStatus); } - String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX); - if(StringUtils.isNotBlank(lightBrightness)){ + String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX); + if (StringUtils.isNotBlank(lightBrightness)) { shareDetailVo.setLightBrightness(lightBrightness); } return shareDetailVo; } + /** * 校验短信验证码 */ @@ -181,14 +182,15 @@ public class DeviceShareService { } return code.equals(smsCode); } + public int deviceShare(AppDeviceShareBo bo) { boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode()); - if(!flag){ + if (!flag) { throw new ServiceException("验证码错误"); } Device device = deviceMapper.selectById(bo.getDeviceId()); - if(device==null){ + if (device == null) { throw new ServiceException("设备不存在"); } Long userId = AppLoginHelper.getUserId(); @@ -196,7 +198,7 @@ public class DeviceShareService { lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId()); lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber()); Long count = appDeviceShareMapper.selectCount(lqw); - if(count>0){ + if (count > 0) { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("device_id", bo.getDeviceId()); @@ -206,7 +208,7 @@ public class DeviceShareService { uw.set("update_time", new Date()); return appDeviceShareMapper.update(uw); - }else { + } else { AppDeviceShare appDeviceShare = new AppDeviceShare(); appDeviceShare.setDeviceId(bo.getDeviceId()); appDeviceShare.setPhonenumber(bo.getPhonenumber()); @@ -232,4 +234,19 @@ public class DeviceShareService { } + /** + * 查询设备分享列表(web) + * + * @param bo + * @param pageQuery + * @return + */ + public TableDataInfo queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) { + Page page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + Page result = appDeviceShareMapper.selectWebDeviceShareList(bo, page); + List records = result.getRecords(); + records.forEach(DeviceShareService::buildDeviceStatus); + return TableDataInfo.build(result); + } + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java index cc6ae262..cc927804 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java @@ -145,7 +145,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl */ @Override public List getAlarmRecord(Long deviceId) { - List alarmList = deviceAlarmMapper.selectList ( + List alarmList = deviceAlarmMapper.selectList( new QueryWrapper().eq("device_id", deviceId) .orderByDesc("create_time")); List deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class); diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java index 07fe7e0f..0262567c 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java @@ -1,5 +1,7 @@ package com.fuyuanshen.app.domain.bo; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fuyuanshen.app.domain.AppDeviceShare; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; import io.github.linpeilie.annotations.AutoMapper; @@ -7,6 +9,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; +import java.util.Date; + /** * 设备分享业务对象 app_device_share * @@ -35,10 +39,16 @@ public class AppDeviceShareBo extends BaseEntity { /** * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息） -以逗号分隔 + * 以逗号分隔 */ private String permission; + /** + * 分享用户 + * share_user + */ + private String shareUser; + /** * 备注 */ @@ -46,4 +56,11 @@ public class AppDeviceShareBo extends BaseEntity { private String smsCode; + + /** + * 分享时间 + */ + private Date shareStartTime; + private Date shareEndTime; + } diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java index 1de4c14a..99bc47c0 100644 --- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java +++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java @@ -18,5 +18,13 @@ import org.apache.ibatis.annotations.Param; public interface AppDeviceShareMapper extends BaseMapperPlus { IPage otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); - Page selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo,Page page); + Page selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); + + /** + * 查询设备分享列表(web) + * + * @param bo 设备分享 + * @return 设备分享 + */ + Page selectWebDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page page); } diff --git a/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml b/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml index 137f67ff..0b76a8e3 100644 --- a/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml +++ b/fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml @@ -1,27 +1,27 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + +