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:36:59 +08:00
parent 838894d171
commit 262a25011e
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
das/src/main/java/com/das/common/interceptor/FilterConfig.java
View File

@ -22,7 +22,8 @@ public class FilterConfig {
FilterRegistrationBean registrationBean = new FilterRegistrationBean(); FilterRegistrationBean registrationBean = new FilterRegistrationBean();
//注册过滤器 //注册过滤器
registrationBean.setFilter(new DecryptingOncePerRequestFilter(aesProperties.getKey())); registrationBean.setFilter(new DecryptingOncePerRequestFilter(aesProperties.getKey()));
registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式 // registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式
registrationBean.addUrlPatterns("/a/*"); // 设置过滤器应用的URL模式
registrationBean.setOrder(2); // 设置过滤器的顺序 registrationBean.setOrder(2); // 设置过滤器的顺序
return registrationBean; return registrationBean;
} }

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

@ -36,9 +36,16 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
@Override @Override
public PageDataInfo<TheoreticalPowerCurveEntity> getAllCurves(PageQuery pageQuery) { public PageDataInfo<TheoreticalPowerCurveEntity> getAllCurves(PageQuery pageQuery) {
QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>(); if (pageQuery.getPageNum() == null || pageQuery.getPageSize() == null){
Page<TheoreticalPowerCurveEntity> pageList = theoreticalPowerCurveMapper.selectPage(pageQuery.build(), queryWrapper); QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
return PageDataInfo.build(pageList.getRecords(), pageList.getTotal()); List<TheoreticalPowerCurveEntity> powerCurveEntityList = theoreticalPowerCurveMapper.selectList(queryWrapper);
return PageDataInfo.build(powerCurveEntityList, powerCurveEntityList.size());
}
else {
QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
Page<TheoreticalPowerCurveEntity> pageList = theoreticalPowerCurveMapper.selectPage(pageQuery.build(), queryWrapper);
return PageDataInfo.build(pageList.getRecords(), pageList.getTotal());
}
} }
/** /**
@ -61,6 +68,9 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
theoreticalPowerCurveEntity.setCreatedBy(sysUserVo.getAccount()); theoreticalPowerCurveEntity.setCreatedBy(sysUserVo.getAccount());
theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount()); theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount());
theoreticalPowerCurveEntity.setRevision(1); theoreticalPowerCurveEntity.setRevision(1);
//校验制造商规格型号
checkFactoryModelExsit(theoreticalPowerCurveEntity);
theoreticalPowerCurveMapper.insert(theoreticalPowerCurveEntity); theoreticalPowerCurveMapper.insert(theoreticalPowerCurveEntity);
return theoreticalPowerCurveEntity; return theoreticalPowerCurveEntity;
} }
@ -82,6 +92,9 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
theoreticalPowerCurveEntity.setUpdatedTime(new Date()); theoreticalPowerCurveEntity.setUpdatedTime(new Date());
theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount()); theoreticalPowerCurveEntity.setUpdatedBy(sysUserVo.getAccount());
theoreticalPowerCurveEntity.setRevision(1); theoreticalPowerCurveEntity.setRevision(1);
//校验制造商规格型号
checkFactoryModelExsit(theoreticalPowerCurveEntity);
theoreticalPowerCurveMapper.updateById(theoreticalPowerCurveEntity); theoreticalPowerCurveMapper.updateById(theoreticalPowerCurveEntity);
return theoreticalPowerCurveEntity; return theoreticalPowerCurveEntity;
} }
@ -137,6 +150,16 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
return curveItemMapper.selectList(itemEntityQueryWrapper); return curveItemMapper.selectList(itemEntityQueryWrapper);
} }
private void checkFactoryModelExsit(TheoreticalPowerCurveEntity theoreticalPowerCurveEntity){
QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("madeinfactory",theoreticalPowerCurveEntity.getMadeinfactory());
queryWrapper.eq("model",theoreticalPowerCurveEntity.getModel());
TheoreticalPowerCurveEntity sameInfo = theoreticalPowerCurveMapper.selectOne(queryWrapper);
if (sameInfo != null){
throw new ServiceException("制造商规格型号已存在，请检查修改");
}
}
public void batchProcessing(List<CurveItemEntity> curveItemList, Long parent){ public void batchProcessing(List<CurveItemEntity> curveItemList, Long parent){
//先删除制造商数据 //先删除制造商数据
QueryWrapper<CurveItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<CurveItemEntity> queryWrapper = new QueryWrapper<>();