@@ -49,7 +49,6 @@ public class AirConfigurationController extends BaseController {
return CommonResult.success(list);
}
- @SaCheckPermission("als:airConfiguration:import")
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil.exportExcel(new ArrayList<>(), "飞机构型", AirConfigurationImportVo.class, response);
@@ -59,7 +59,6 @@ public class AlgorithmController {
* @param algorithmBo 入参
* @return org.eco.common.core.core.domain.CommonResult<java.lang.String> 结果
**/
- @SaCheckPermission("als:algorithm:execute")
@PostMapping("/execute/fault")
public CommonResult<String> executeFault(@Validated @RequestBody AlgorithmBo algorithmBo) {
String result = algorithmService.executeFault(algorithmBo);
@@ -51,6 +51,11 @@ public class AlgorithmBo extends BaseEntity {
*/
private String param;
+ /**
+ * 部件Id
+ */
+ private String partId;
+
/**
* 数据列
@@ -46,7 +46,7 @@ public class ModelBo extends BaseEntity {
- * 参数
private String partId;
@@ -25,6 +25,13 @@ public interface IModelService extends IBaseService<Model> {
* @return 模型信息
ModelVo selectById(Long id);
+ * 查询模型信息
+ *
+ * @param partId 部件
+ * @return 模型信息
+ ModelVo selectByPartId(String partId);
* 查询模型信息列表
@@ -202,10 +202,11 @@ public class AlgorithmService implements IAlgorithmService {
@Transactional
public String executeFault(AlgorithmBo algorithmBo) {
// 模型相关信息
- ModelVo modelVo = modelService.selectById(algorithmBo.getModelId());
+ ModelVo modelVo = modelService.selectByPartId(algorithmBo.getPartId());
if (ObjectUtil.isNull(modelVo)) {
throw new BusinessException("模型信息为空,请检查!");
+ algorithmBo.setColumnData(modelVo.getColumnData().split(","));
SysOssVo sysOssVo = getSysOssVo(algorithmBo);
if (sysOssVo == null) {
return null;
@@ -76,6 +76,11 @@ public class ModelServiceImpl extends BaseServiceImpl<ModelMapper, Model> implem
+ @Override
+ public ModelVo selectByPartId(String partId) {
+ return this.getOneAs(query().where(MODEL.PART_ID.eq(partId)), ModelVo.class);
+ }