Browse Source

设备相关

李进 2 years ago
parent
commit
142c6e92af

+ 8 - 2
device-api-service/src/main/java/com/xy/service/impl/DeviceSysinfoServiceImpl.java

@@ -6,12 +6,15 @@ import com.xy.dto.DeviceSysinfoDto;
 import com.xy.entity.DeviceSysinfo;
 import com.xy.mapper.DeviceSysinfoMapper;
 import com.xy.service.DeviceSysinfoService;
+import com.xy.utils.Emptys;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 import static com.xy.utils.Beans.copy;
 
 /**
@@ -33,8 +36,11 @@ public class DeviceSysinfoServiceImpl extends ServiceImpl<DeviceSysinfoMapper, D
                 .ge(DeviceSysinfo::getCreateTime, select.getBeginCreateTime())
                 .le(DeviceSysinfo::getCreateTime, select.getEndCreateTime())
                 .build();
-        DeviceSysinfo deviceSysinfo = getOne(lambdaQueryWrapper);
-        return R.ok(copy(DeviceSysinfoDto.Vo.class, deviceSysinfo));
+        List<DeviceSysinfo> list = list(lambdaQueryWrapper);
+        if (!Emptys.check(list)) {
+            return R.ok(new DeviceSysinfoDto.Vo());
+        }
+        return R.ok(copy(DeviceSysinfoDto.Vo.class, list.get(0)));
     }
 
     @Override