fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

WEB端解绑设备

Browse Source
This commit is contained in:
daiyongfei
2025-07-30 18:39:12 +08:00
parent 4fa4e5ec29
commit ceeda046ea
7 changed files with 267 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java
View File

@ -41,7 +41,6 @@ public class AppDeviceController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) { public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
return appDeviceService.queryAppDeviceList(bo,pageQuery); return appDeviceService.queryAppDeviceList(bo,pageQuery);
} }

116
fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
View File

@ -82,23 +82,23 @@ public class AppDeviceBizService {
public int sendMessage(AppDeviceSendMsgBo bo) { public int sendMessage(AppDeviceSendMsgBo bo) {
List<Long> deviceIds = bo.getDeviceIds(); List<Long> deviceIds = bo.getDeviceIds();
if(deviceIds == null || deviceIds.isEmpty()){ if (deviceIds == null || deviceIds.isEmpty()) {
throw new ServiceException("请选择设备"); throw new ServiceException("请选择设备");
} }
for (Long deviceId : deviceIds){ for (Long deviceId : deviceIds) {
Device deviceObj = deviceMapper.selectById(deviceId); Device deviceObj = deviceMapper.selectById(deviceId);
if(deviceObj==null) { if (deviceObj == null) {
throw new ServiceException("设备不存在"+deviceId); throw new ServiceException("设备不存在" + deviceId);
} }
byte[] msg = ReliableTextToBitmap.textToBitmapBytes(bo.getSendMsg()); byte[] msg = ReliableTextToBitmap.textToBitmapBytes(bo.getSendMsg());
ArrayList<Integer> intData = new ArrayList<>(); ArrayList<Integer> intData = new ArrayList<>();
intData.add(2); intData.add(2);
buildArr(convertHexToDecimal(msg),intData); buildArr(convertHexToDecimal(msg), intData);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 ,JSON.toJSONString(map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送设备消息：topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(),bo.getSendMsg()); log.info("发送设备消息：topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo.getSendMsg());
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>(); UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", deviceId) updateWrapper.eq("id", deviceId)
@ -147,7 +147,7 @@ public class AppDeviceBizService {
.set("update_time", new Date()) .set("update_time", new Date())
.set("binding_time", new Date()); .set("binding_time", new Date());
return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper); return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
}else{ } else {
AppDeviceBindRecord bindRecord = new AppDeviceBindRecord(); AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
bindRecord.setDeviceId(device.getId()); bindRecord.setDeviceId(device.getId());
bindRecord.setBindingUserId(userId); bindRecord.setBindingUserId(userId);
@ -183,7 +183,7 @@ public class AppDeviceBizService {
.set("binding_user_id", userId) .set("binding_user_id", userId)
.set("binding_time", new Date()); .set("binding_time", new Date());
return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper); return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
}else{ } else {
AppDeviceBindRecord bindRecord = new AppDeviceBindRecord(); AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
bindRecord.setDeviceId(device.getId()); bindRecord.setDeviceId(device.getId());
bindRecord.setBindingUserId(userId); bindRecord.setBindingUserId(userId);
@ -204,7 +204,12 @@ public class AppDeviceBizService {
} }
public int unBindDevice(Long id) { public int unBindDevice(Long id) {
return unBindDevice(id, null);
}
public int unBindDevice(Long id, Long userId) {
Device device = deviceMapper.selectById(id); Device device = deviceMapper.selectById(id);
if (device == null) { if (device == null) {
throw new RuntimeException("请先将设备入库！！！"); throw new RuntimeException("请先将设备入库！！！");
@ -216,7 +221,9 @@ public class AppDeviceBizService {
.set("binding_time", null); .set("binding_time", null);
deviceMapper.update(null, deviceUpdateWrapper); deviceMapper.update(null, deviceUpdateWrapper);
Long userId = AppLoginHelper.getUserId(); if (userId == null){
userId = AppLoginHelper.getUserId();
}
QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>(); QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
bindRecordQueryWrapper.eq("device_id", device.getId()); bindRecordQueryWrapper.eq("device_id", device.getId());
bindRecordQueryWrapper.eq("binding_user_id", userId); bindRecordQueryWrapper.eq("binding_user_id", userId);
@ -228,6 +235,7 @@ public class AppDeviceBizService {
return 1; return 1;
} }
public AppDeviceDetailVo getInfo(Long id) { public AppDeviceDetailVo getInfo(Long id) {
Device device = deviceMapper.selectById(id); Device device = deviceMapper.selectById(id);
if (device == null) { if (device == null) {
@ -241,7 +249,7 @@ public class AppDeviceBizService {
vo.setDeviceMac(device.getDeviceMac()); vo.setDeviceMac(device.getDeviceMac());
vo.setDeviceStatus(device.getDeviceStatus()); vo.setDeviceStatus(device.getDeviceStatus());
DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType()); DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
if(deviceType!=null){ if (deviceType != null) {
vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode())); vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
vo.setTypeName(deviceType.getTypeName()); vo.setTypeName(deviceType.getTypeName());
} }
@ -252,7 +260,7 @@ public class AppDeviceBizService {
QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>() QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
.eq("device_id", device.getId()); .eq("device_id", device.getId());
AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw); AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw);
if(appPersonnelInfo != null){ if (appPersonnelInfo != null) {
AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class); AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
vo.setPersonnelInfo(personnelInfoVo); vo.setPersonnelInfo(personnelInfoVo);
} }
@ -281,24 +289,24 @@ public class AppDeviceBizService {
// int[] a = new int[]{6,6,6,6,6,6}; // int[] a = new int[]{6,6,6,6,6,6};
ArrayList<Integer> intData = new ArrayList<>(); ArrayList<Integer> intData = new ArrayList<>();
intData.add(2); intData.add(2);
buildArr(convertHexToDecimal(unitName),intData); buildArr(convertHexToDecimal(unitName), intData);
buildArr(convertHexToDecimal(position),intData); buildArr(convertHexToDecimal(position), intData);
buildArr(convertHexToDecimal(name),intData); buildArr(convertHexToDecimal(name), intData);
buildArr(convertHexToDecimal(id),intData); buildArr(convertHexToDecimal(id), intData);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
System.out.println(JSON.toJSONString( map)); System.out.println(JSON.toJSONString(map));
} }
public boolean registerPersonInfo(AppPersonnelInfoBo bo) { public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
Long deviceId = bo.getDeviceId(); Long deviceId = bo.getDeviceId();
Device deviceObj = deviceMapper.selectById(deviceId); Device deviceObj = deviceMapper.selectById(deviceId);
if(deviceObj == null){ if (deviceObj == null) {
throw new RuntimeException("请先将设备入库！！！"); throw new RuntimeException("请先将设备入库！！！");
} }
QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>() QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
@ -311,30 +319,30 @@ public class AppDeviceBizService {
byte[] id = generateFixedBitmapData(bo.getCode(), 120); byte[] id = generateFixedBitmapData(bo.getCode(), 120);
ArrayList<Integer> intData = new ArrayList<>(); ArrayList<Integer> intData = new ArrayList<>();
intData.add(2); intData.add(2);
buildArr(convertHexToDecimal(unitName),intData); buildArr(convertHexToDecimal(unitName), intData);
buildArr(convertHexToDecimal(position),intData); buildArr(convertHexToDecimal(position), intData);
buildArr(convertHexToDecimal(name),intData); buildArr(convertHexToDecimal(name), intData);
buildArr(convertHexToDecimal(id),intData); buildArr(convertHexToDecimal(id), intData);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 , JSON.toJSONString( map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(),bo); log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
if(ObjectUtils.length(appPersonnelInfoVos) == 0){ if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class); AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo); return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
}else { } else {
UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>(); UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
uw.eq("device_id", deviceId) uw.eq("device_id", deviceId)
.set("name", bo.getName()) .set("name", bo.getName())
.set("position", bo.getPosition()) .set("position", bo.getPosition())
.set("unit_name", bo.getUnitName()) .set("unit_name", bo.getUnitName())
.set("code",bo.getCode()); .set("code", bo.getCode());
return appPersonnelInfoMapper.update(null, uw)>0; return appPersonnelInfoMapper.update(null, uw) > 0;
} }
@ -343,20 +351,20 @@ public class AppDeviceBizService {
public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) { public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
try { try {
Device device = deviceMapper.selectById(bo.getDeviceId()); Device device = deviceMapper.selectById(bo.getDeviceId());
if(device == null){ if (device == null) {
throw new ServiceException("设备不存在"); throw new ServiceException("设备不存在");
} }
MultipartFile file = bo.getFile(); MultipartFile file = bo.getFile();
byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80,25600); byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
System.out.println("长度："+largeData.length); System.out.println("长度：" + largeData.length);
System.out.println("原始数据大小: " + largeData.length + " 字节"); System.out.println("原始数据大小: " + largeData.length + " 字节");
int[] ints = convertHexToDecimal(largeData); int[] ints = convertHexToDecimal(largeData);
RedisUtils.setCacheObject("app_logo_data:"+device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30*60L)); RedisUtils.setCacheObject("app_logo_data:" + device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
String data = RedisUtils.getCacheObject("app_logo_data:"+device.getDeviceImei()); String data = RedisUtils.getCacheObject("app_logo_data:" + device.getDeviceImei());
byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data); byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512); byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
@ -366,16 +374,16 @@ public class AppDeviceBizService {
ArrayList<Integer> intData = new ArrayList<>(); ArrayList<Integer> intData = new ArrayList<>();
intData.add(3); intData.add(3);
intData.add(1); intData.add(1);
ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData); ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map)); log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), JSON.toJSONString(map));
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -388,7 +396,7 @@ public class AppDeviceBizService {
try { try {
Long deviceId = params.getLong("deviceId"); Long deviceId = params.getLong("deviceId");
Device device = deviceMapper.selectById(deviceId); Device device = deviceMapper.selectById(deviceId);
if(device == null){ if (device == null) {
throw new ServiceException("设备不存在"); throw new ServiceException("设备不存在");
} }
Integer instructValue = params.getInteger("instructValue"); Integer instructValue = params.getInteger("instructValue");
@ -400,19 +408,19 @@ public class AppDeviceBizService {
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map)); log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), JSON.toJSONString(map));
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
//灯光亮度设置 // 灯光亮度设置
public void lightBrightnessSettings(JSONObject params) { public void lightBrightnessSettings(JSONObject params) {
try { try {
Long deviceId = params.getLong("deviceId"); Long deviceId = params.getLong("deviceId");
Device device = deviceMapper.selectById(deviceId); Device device = deviceMapper.selectById(deviceId);
if(device == null){ if (device == null) {
throw new ServiceException("设备不存在"); throw new ServiceException("设备不存在");
} }
String instructValue = params.getString("instructValue"); String instructValue = params.getString("instructValue");
@ -421,10 +429,10 @@ public class AppDeviceBizService {
String[] values = instructValue.split("\\."); String[] values = instructValue.split("\\.");
String value1 = values[0]; String value1 = values[0];
String value2 = values[1]; String value2 = values[1];
if(StringUtils.isNoneBlank(value1)){ if (StringUtils.isNoneBlank(value1)) {
intData.add(Integer.parseInt(value1)); intData.add(Integer.parseInt(value1));
} }
if(StringUtils.isNoneBlank(value2)){ if (StringUtils.isNoneBlank(value2)) {
intData.add(Integer.parseInt(value2)); intData.add(Integer.parseInt(value2));
} }
intData.add(0); intData.add(0);
@ -432,19 +440,19 @@ public class AppDeviceBizService {
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map)); log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), JSON.toJSONString(map));
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
//激光模式设置 // 激光模式设置
public void laserModeSettings(JSONObject params) { public void laserModeSettings(JSONObject params) {
try { try {
Long deviceId = params.getLong("deviceId"); Long deviceId = params.getLong("deviceId");
Device device = deviceMapper.selectById(deviceId); Device device = deviceMapper.selectById(deviceId);
if(device == null){ if (device == null) {
throw new ServiceException("设备不存在"); throw new ServiceException("设备不存在");
} }
Integer instructValue = params.getInteger("instructValue"); Integer instructValue = params.getInteger("instructValue");
@ -456,9 +464,9 @@ public class AppDeviceBizService {
intData.add(0); intData.add(0);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("instruct", intData); map.put("instruct", intData);
mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map)); mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), 1, JSON.toJSONString(map));
log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map)); log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei(), JSON.toJSONString(map));
} catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -466,7 +474,7 @@ public class AppDeviceBizService {
public String mapReverseGeocoding(JSONObject params) { public String mapReverseGeocoding(JSONObject params) {
Long deviceId = params.getLong("deviceId"); Long deviceId = params.getLong("deviceId");
Device device = deviceMapper.selectById(deviceId); Device device = deviceMapper.selectById(deviceId);
if(device == null){ if (device == null) {
throw new ServiceException("设备不存在"); throw new ServiceException("设备不存在");
} }
return RedisUtils.getCacheObject("device:location:" + device.getDeviceImei()); return RedisUtils.getCacheObject("device:location:" + device.getDeviceImei());

2
fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
View File

@ -2,7 +2,7 @@ package com.fuyuanshen.global.mqtt.rule;
import com.fuyuanshen.common.json.utils.JsonUtils; import com.fuyuanshen.common.json.utils.JsonUtils;
import com.fuyuanshen.common.redis.utils.RedisUtils; import com.fuyuanshen.common.redis.utils.RedisUtils;
import com.fuyuanshen.equipment.utils.c.map.GetAddressFromLatUtil; import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
import com.fuyuanshen.global.mqtt.base.MqttMessageRule; import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
import com.fuyuanshen.global.mqtt.base.MqttRuleContext; import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
import com.fuyuanshen.global.mqtt.config.MqttGateway; import com.fuyuanshen.global.mqtt.config.MqttGateway;

72
fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java Normal file
View File

@ -0,0 +1,72 @@
package com.fuyuanshen.web.controller.device;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuyuanshen.common.core.domain.R;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.utils.file.FileUtil;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.web.core.BaseController;
import com.fuyuanshen.customer.mapper.CustomerMapper;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
import com.fuyuanshen.equipment.domain.dto.ImportResult;
import com.fuyuanshen.equipment.domain.form.DeviceForm;
import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
import com.fuyuanshen.equipment.domain.vo.CustomerVo;
import com.fuyuanshen.equipment.excel.DeviceImportParams;
import com.fuyuanshen.equipment.excel.UploadDeviceDataListener;
import com.fuyuanshen.equipment.mapper.DeviceMapper;
import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
import com.fuyuanshen.equipment.service.DeviceTypeService;
import com.fuyuanshen.equipment.service.impl.DeviceExportService;
import com.fuyuanshen.system.service.ISysOssService;
import com.fuyuanshen.web.service.WEBDeviceService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.undertow.util.BadRequestException;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.List;
/**
* @Description:
* @Author: WY
* @Date: 2025/5/16
**/
@Slf4j
@Tag(name = "web:设备管理", description = "web:设备管理")
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/device")
public class WEBDeviceController extends BaseController {
private final WEBDeviceService deviceService;
/**
* @param id
* @return
* @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
* 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
*/
// @Log("解绑设备")
@Operation(summary = "WEB端解绑设备")
@DeleteMapping(value = "/unbind")
public R<Void> unbindDevice(Long id, Long userId) {
return toAjax(deviceService.webUnBindDevice(id, userId));
}
}

32
fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java Normal file
View File

@ -0,0 +1,32 @@
package com.fuyuanshen.web.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
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 java.io.IOException;
import java.util.List;
/**
* @Description:
* @Author: WY
* @Date: 2025/5/16
**/
public interface WEBDeviceService extends IService<Device> {
/**
* WEB端解绑设备
*
* @param id
* @return
*/
int webUnBindDevice(Long id, Long userId);
}

87
fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java Normal file
View File

@ -0,0 +1,87 @@
package com.fuyuanshen.web.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuyuanshen.app.service.AppDeviceBizService;
import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.exception.BadRequestException;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.customer.domain.Customer;
import com.fuyuanshen.customer.mapper.CustomerMapper;
import com.fuyuanshen.equipment.constants.DeviceConstants;
import com.fuyuanshen.equipment.domain.Device;
import com.fuyuanshen.equipment.domain.DeviceAssignments;
import com.fuyuanshen.equipment.domain.DeviceType;
import com.fuyuanshen.equipment.domain.DeviceTypeGrants;
import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
import com.fuyuanshen.equipment.domain.form.DeviceForm;
import com.fuyuanshen.equipment.domain.query.DeviceAssignmentQuery;
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.enums.BindingStatusEnum;
import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
import com.fuyuanshen.equipment.mapper.DeviceMapper;
import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
import com.fuyuanshen.equipment.service.DeviceAssignmentsService;
import com.fuyuanshen.equipment.service.DeviceTypeGrantsService;
import com.fuyuanshen.system.domain.vo.SysOssVo;
import com.fuyuanshen.system.service.ISysOssService;
import com.fuyuanshen.web.service.WEBDeviceService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
/**
* @Description:
* @Author: WY
* @Date: 2025/5/16
**/
@Slf4j
@Service
@RequiredArgsConstructor
public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
private final AppDeviceBizService appDeviceService;
/**
* WEB端解绑设备
*
* @param id
* @return
*/
@Override
public int webUnBindDevice(Long id, Long userId) {
return appDeviceService.unBindDevice(id,userId);
}
}

26
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
View File

@ -147,19 +147,19 @@ public class DeviceController extends BaseController {
return R.ok(); return R.ok();
} }
//
/** // /**
* @param id // * @param id
* @return // * @return
* @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters） // * @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
* 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。 // * 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
*/ // */
// @Log("解绑设备") // // @Log("解绑设备")
@Operation(summary = "WEB端解绑设备") // @Operation(summary = "WEB端解绑设备")
@GetMapping(value = "/unbind") // @GetMapping(value = "/unbind")
public R<Void> unbindDevice(@Validated Long id) { // public R<Void> unbindDevice(@Validated Long id) {
return toAjax(deviceService.webUnBindDevice(id)); // return toAjax(deviceService.webUnBindDevice(id));
} // }
@Operation(summary = "导出数据设备") @Operation(summary = "导出数据设备")