sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

风俗功率曲线

Browse Source
This commit is contained in:
huguanghan 2024-11-08 16:27:02 +08:00
parent 6c0c2ff141
commit 838894d171
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java
View File

@ -123,8 +123,8 @@ public class TheoreticalPowerCurveController {
* @return 速度功率曲线
*/
@GetMapping("/queryItemByParent")
public R<List<CurveItemEntity>> queryAllCurve(String id) {
List<CurveItemEntity> curveItemEntityList = theoreticalPowerCurveService.queryCurveItemByParent(id);
public R<List<CurveItemEntity>> queryAllCurve(String madeinfactory,String model) {
List<CurveItemEntity> curveItemEntityList = theoreticalPowerCurveService.queryCurveItemByParent(madeinfactory,model);
return R.success(curveItemEntityList);
}
}

2
das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java
View File

@ -23,7 +23,7 @@ public interface TheoreticalPowerCurveService {
void exportTheoreticalPowerCurve(TheoreticalPowerCurveDto theoreticalPowerCurveDto, HttpServletRequest request, HttpServletResponse response);
List<CurveItemEntity> queryCurveItemByParent(String id);
List<CurveItemEntity> queryCurveItemByParent(String madeinfactory,String model);
}

13
das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
View File

@ -126,12 +126,15 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
}
@Override
public List<CurveItemEntity> queryCurveItemByParent(String id) {
QueryWrapper<CurveItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("PARENT",Long.valueOf(id));
public List<CurveItemEntity> queryCurveItemByParent(String madeinfactory,String model) {
QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("madeinfactory",madeinfactory);
queryWrapper.eq("MODEL",model);
TheoreticalPowerCurveEntity theoreticalPowerCurveEntity = theoreticalPowerCurveMapper.selectOne(queryWrapper);
QueryWrapper<CurveItemEntity> itemEntityQueryWrapper = new QueryWrapper<>();
queryWrapper.eq("PARENT",theoreticalPowerCurveEntity.getId());
queryWrapper.orderByAsc("SPEED");
List<CurveItemEntity> curveItemEntityList = curveItemMapper.selectList(queryWrapper);
return curveItemEntityList;
return curveItemMapper.selectList(itemEntityQueryWrapper);
}
public void batchProcessing(List<CurveItemEntity> curveItemList, Long parent){

2
das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
View File

@ -19,6 +19,8 @@ public class WindTurbinesPageVo {
private String model;
private String madeinfactory;
private String belongLine;
private Map<String,Object> attributeMap;

1
das/src/main/java/com/das/modules/page/service/impl/WindTurbinesPageServiceImpl.java
View File

@ -104,6 +104,7 @@ public class WindTurbinesPageServiceImpl implements WindTurbinesPageService {
windTurbinesPageVo.setIrn(item.getId());
windTurbinesPageVo.setName(item.getName());
windTurbinesPageVo.setModel(item.getModel());
windTurbinesPageVo.setMadeinfactory(item.getMadeinFactory());
windTurbinesPageVo.setModelId(item.getIotModelId());
windTurbinesPageVo.setBelongLine(item.getBelongLine());
windTurbinesPageVos.add(windTurbinesPageVo);