THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fit:修复bug，触发构建

This commit is contained in:
gyb 2026-01-30 11:50:54 +08:00
parent 4901e52b85
commit aa24675bcc
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/ruoyi/device/controller/AirTypeGeneralEnumController.java → src/main/java/com/ruoyi/device/controller/DeviceAirTypeGeneralEnumController.java
View File

@ -5,24 +5,18 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.device.api.domain.AirTypeGeneralEnumVO; import com.ruoyi.device.api.domain.AirTypeGeneralEnumVO;
import com.ruoyi.device.api.domain.AirTypeVendorGroupVO; import com.ruoyi.device.api.domain.AirTypeVendorGroupVO;
import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.controller.convert.DeviceAirTypeGeneralEnumVOConvert;
import com.ruoyi.device.controller.convert.AirTypeGeneralEnumVOConvert;
import com.ruoyi.device.controller.convert.DockVOConvert;
import com.ruoyi.device.service.api.IAirTypeGeneralEnumService; import com.ruoyi.device.service.api.IAirTypeGeneralEnumService;
import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO; import com.ruoyi.device.service.dto.AirTypeGeneralEnumDTO;
import com.ruoyi.system.api.RemoteDictService; import com.ruoyi.system.api.RemoteDictService;
import com.ruoyi.system.api.domain.SysDictData; import com.ruoyi.system.api.domain.SysDictData;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 无人机类型通用枚举Controller * 无人机类型通用枚举Controller
@ -32,7 +26,7 @@ import java.util.Map;
*/ */
@RestController @RestController
@RequestMapping("/airType/generalEnum") @RequestMapping("/airType/generalEnum")
public class AirTypeGeneralEnumController extends BaseController public class DeviceAirTypeGeneralEnumController extends BaseController
{ {
@Autowired @Autowired
private IAirTypeGeneralEnumService airTypeGeneralEnumService; private IAirTypeGeneralEnumService airTypeGeneralEnumService;
@ -49,9 +43,9 @@ public class AirTypeGeneralEnumController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public R<List<AirTypeGeneralEnumVO>> selectAirTypeGeneralEnumList(AirTypeGeneralEnumVO vo) public R<List<AirTypeGeneralEnumVO>> selectAirTypeGeneralEnumList(AirTypeGeneralEnumVO vo)
{ {
AirTypeGeneralEnumDTO dto = AirTypeGeneralEnumVOConvert.to(vo); AirTypeGeneralEnumDTO dto = DeviceAirTypeGeneralEnumVOConvert.to(vo);
List<AirTypeGeneralEnumDTO> list = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(dto); List<AirTypeGeneralEnumDTO> list = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(dto);
List<AirTypeGeneralEnumVO> voList = AirTypeGeneralEnumVOConvert.fromList(list); List<AirTypeGeneralEnumVO> voList = DeviceAirTypeGeneralEnumVOConvert.fromList(list);
return R.ok(voList); return R.ok(voList);
} }
@ -71,7 +65,7 @@ public class AirTypeGeneralEnumController extends BaseController
{ {
// 获取所有无人机类型数据 // 获取所有无人机类型数据
List<AirTypeGeneralEnumDTO> allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new AirTypeGeneralEnumDTO()); List<AirTypeGeneralEnumDTO> allList = airTypeGeneralEnumService.selectAirTypeGeneralEnumList(new AirTypeGeneralEnumDTO());
List<AirTypeGeneralEnumVO> allVoList = AirTypeGeneralEnumVOConvert.fromList(allList); List<AirTypeGeneralEnumVO> allVoList = DeviceAirTypeGeneralEnumVOConvert.fromList(allList);
// 为每个字典项创建分组 // 为每个字典项创建分组
for (SysDictData dictData : dictResult.getData()) for (SysDictData dictData : dictResult.getData())

6
src/main/java/com/ruoyi/device/controller/convert/AirTypeGeneralEnumVOConvert.java → src/main/java/com/ruoyi/device/controller/convert/DeviceAirTypeGeneralEnumVOConvert.java
View File

@ -12,12 +12,12 @@ import java.util.List;
* @author 拓恒 * @author 拓恒
* @date 2026-01-20 * @date 2026-01-20
*/ */
public class AirTypeGeneralEnumVOConvert extends BaseConvert<AirTypeGeneralEnumDTO, AirTypeGeneralEnumVO> public class DeviceAirTypeGeneralEnumVOConvert extends BaseConvert<AirTypeGeneralEnumDTO, AirTypeGeneralEnumVO>
{ {
private static final AirTypeGeneralEnumVOConvert INSTANCE = new AirTypeGeneralEnumVOConvert(); private static final DeviceAirTypeGeneralEnumVOConvert INSTANCE = new DeviceAirTypeGeneralEnumVOConvert();
private AirTypeGeneralEnumVOConvert() { private DeviceAirTypeGeneralEnumVOConvert() {
super(AirTypeGeneralEnumDTO.class, AirTypeGeneralEnumVO.class); super(AirTypeGeneralEnumDTO.class, AirTypeGeneralEnumVO.class);
} }