Browse Source

架次参数

wanggaokun 1 year ago
parent
commit
d0f5fb2bcc

+ 1 - 1
PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/OrderConfigController.java

@@ -141,7 +141,7 @@ public class OrderConfigController extends BaseController {
             orderXmlVO = (OrderXmlVO)jaxbUnmarshaller.unmarshal(file.getInputStream());
         } catch (JAXBException | IOException exception) {
             logger.error("XML解析错误,信息:{}", exception.getMessage());
-            throw new GlobalException("XML解析错误,请查XMl格式");
+            throw new GlobalException("XML解析错误,请查XMl格式");
         }
         BeanUtils.copyBeanProp(orderConfig, orderXmlVO);
         OrderConfig order = orderConfigService.selectOrderConfigByCode(orderConfig.getOrderCode());

+ 6 - 1
PHM-admin/phm-manage/src/main/java/com/phm/manage/controller/SortieParameterController.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
 
-import com.phm.manage.domain.dto.DataParameterRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -24,6 +23,7 @@ import com.phm.common.enums.BusinessType;
 import com.phm.common.utils.poi.ExcelUtil;
 import com.phm.manage.domain.SortieParameter;
 import com.phm.manage.domain.common.CommonResult;
+import com.phm.manage.domain.dto.DataParameterRequest;
 import com.phm.manage.service.ISortieParameterService;
 
 /**
@@ -43,6 +43,11 @@ public class SortieParameterController extends BaseController {
         return CommonResult.success(sortieParameterService.getSortieData(id));
     }
 
+    @GetMapping(value = "dataParams/{id}")
+    public CommonResult<List<String>> getSortieDataParams(@PathVariable("id") Long id) {
+        return CommonResult.success(sortieParameterService.getSortieDataParams(id));
+    }
+
     /**
      * 查询模型参数信息列表
      */

+ 1 - 0
PHM-admin/phm-manage/src/main/java/com/phm/manage/service/ISortieParameterService.java

@@ -60,6 +60,7 @@ public interface ISortieParameterService {
     public int deleteSortieParameterById(Long id);
 
     String getSortieData(Long id);
+    List<String> getSortieDataParams(Long id);
 
     String getSortieDataByName(DataParameterRequest parameterRequest);
 

+ 9 - 0
PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SortieParameterService.java

@@ -105,6 +105,15 @@ public class SortieParameterService implements ISortieParameterService {
         return CsvUtils.fileCsvToJson(sortieParameter.getDataPath()).toString();
     }
 
+    @Override
+    public List<String> getSortieDataParams(Long id) {
+        SortieParameter sortieParameter = sortieParameterMapper.selectSortieParameterById(id);
+        if (ObjectUtil.isEmpty(sortieParameter)) {
+            throw new GlobalException("数据为空,请核对选择的架次数据。");
+        }
+        return CsvUtils.getCsvHeaders(sortieParameter.getDataPath());
+    }
+
     @Override
     public String getSortieDataByName(DataParameterRequest request) {
         SortieParameter parameter = new SortieParameter();