提交修改pom

iot-platform-common/src/main/java/com/platform/request/PageRequest.java

@@ -0,0 +1,20 @@
+package com.platform.request;
+
+import lombok.Data;
+
+
+/**
+ * @author PC
+ */
+@Data
+public class PageRequest {
+	/**
+	 * 当前页码
+	 */
+	private int page = 1;
+	/**
+	 * 每页数量
+	 */
+	private int pageSize = 10;
+
+}

iot-platform-manager/src/main/java/com/platform/manage/IotDeviceManage.java

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -30,6 +31,10 @@ import java.util.List;
 public class IotDeviceManage {
     private final IotDeviceService iotDeviceService;
     public Boolean addDevice(IotDeviceRequest request) {
+        IotDevice oneByName = iotDeviceService.getOneByName(request.getDeviceName());
+        if (Objects.nonNull(oneByName)){
+            throw new BusinessException("设备名称已存在");
+        }
         IotDevice iotDevice = IotDevice.toIotDevice(request);
         return iotDeviceService.save(iotDevice);
     }
@@ -45,11 +50,15 @@ public class IotDeviceManage {
     }
 
     public Boolean deleteDevice(String guid) {
-        return true;
+        return iotDeviceService.deleteDevice(guid);
     }
 
     public DeviceDetailResp getDeviceDetail(DeviceDetailReq req) {
+        IotDevice oneByGuid = iotDeviceService.getOneByGuid(req.getGuid());
+        DeviceDetailResp instance = DeviceDetailResp.getInstance();
+        DeviceDetailResp.toDeviceDetailResp(oneByGuid);
         return null;
+
     }
 
     public DevicePageResp pageDeviceDetail(DeviceDetailReq req) {

iot-platform-manager/src/main/java/com/platform/mapper/SaasEquipmentManageMapper.java

@@ -2,6 +2,7 @@ package com.platform.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.platform.entity.SaasEquipmentManage;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * @Author: 马超伟
@@ -10,6 +11,6 @@ import com.platform.entity.SaasEquipmentManage;
  * @Version: 1.0
  */
 
-@mapper
+@Mapper
 public interface SaasEquipmentManageMapper extends BaseMapper<SaasEquipmentManage> {
 }

iot-platform-manager/src/main/java/com/platform/request/device/DeviceDetailReq.java

@@ -1,5 +1,6 @@
 package com.platform.request.device;
 
+import com.platform.request.PageRequest;
 import lombok.Data;
 
 /**
@@ -11,6 +12,6 @@ import lombok.Data;
 
 
 @Data
-public class DeviceDetailReq {
+public class DeviceDetailReq extends PageRequest {
     private String guid;
 }

iot-platform-manager/src/main/java/com/platform/response/device/DeviceDetailResp.java

@@ -1,5 +1,6 @@
 package com.platform.response.device;
 
+import com.platform.entity.IotDevice;
 import lombok.Data;
 
 /**
@@ -113,4 +114,34 @@ public class DeviceDetailResp {
      * 设备类别
      */
     private Long egId;
+
+    public static DeviceDetailResp getInstance(){
+    	return new DeviceDetailResp();
+    }
+
+    public static DeviceDetailResp toDeviceDetailResp(IotDevice iotDevice) {
+        DeviceDetailResp instance = DeviceDetailResp.getInstance();
+        instance.setId(iotDevice.getId());
+        instance.setTenantId(iotDevice.getTenantId());
+        instance.setCompanyId(iotDevice.getCompanyId());
+        instance.setGuid(iotDevice.getGuid());
+        instance.setDeviceCode(iotDevice.getDeviceCode());
+        instance.setSn(iotDevice.getSn());
+        instance.setModCode(iotDevice.getModCode());
+        instance.setDeviceName(iotDevice.getDeviceName());
+        instance.setBrand(iotDevice.getBrand());
+        instance.setModelCode(iotDevice.getModelCode());
+        instance.setDescription(iotDevice.getDescription());
+        instance.setRemarks(iotDevice.getRemarks());
+        instance.setStatus(iotDevice.getStatus());
+        instance.setLongitude(iotDevice.getLongitude());
+        instance.setLatitude(iotDevice.getLatitude());
+        instance.setHigh(iotDevice.getHigh());
+        instance.setCreateUser(iotDevice.getCreateUser());
+        instance.setUpdateUser(iotDevice.getUpdateUser());
+        instance.setDelFlag(iotDevice.getDelFlag());
+        instance.setEgId(iotDevice.getEgId());
+        return instance;
+
+    }
 }

iot-platform-manager/src/main/java/com/platform/service/IotDeviceService.java

@@ -12,4 +12,9 @@ import com.platform.entity.IotDevice;
 
 
 public interface IotDeviceService extends IService<IotDevice> {
+    IotDevice getOneByName(String deviceName);
+
+    Boolean deleteDevice(String guid);
+
+    IotDevice getOneByGuid(String guid);
 }

iot-platform-manager/src/main/java/com/platform/service/impl/IotDeviceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.platform.entity.IotDevice;
 import com.platform.mapper.IotDeviceMapper;
@@ -15,4 +16,25 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class IotDeviceServiceImpl extends ServiceImpl<IotDeviceMapper, IotDevice> implements IotDeviceService {
+    @Override
+    public IotDevice getOneByName(String deviceName) {
+        return getOne(Wrappers.<IotDevice>lambdaQuery()
+                .eq(IotDevice::getDeviceName,deviceName)
+                .last("limit 1"));
+    }
+
+    @Override
+    public Boolean deleteDevice(String guid) {
+        IotDevice iotDevice = new IotDevice();
+        iotDevice.setDelFlag(1);
+        return update(iotDevice,Wrappers.<IotDevice>lambdaQuery()
+                .eq(IotDevice::getGuid, guid));
+    }
+
+    @Override
+    public IotDevice getOneByGuid(String guid) {
+        return getOne(Wrappers.<IotDevice>lambdaQuery()
+                .eq(IotDevice::getGuid,guid)
+                .last("limit 1"));
+    }
 }