diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java index 21e896d..3a1f780 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java @@ -15,7 +15,7 @@ /** * 设备类型常量 */ - public static final String PIPELINE_TYPE = "pipelineType"; + public static final String PIPELINE_TYPE = "lineType"; /** * 布防状态 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java index 21e896d..3a1f780 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/constant/BusWellConst.java @@ -15,7 +15,7 @@ /** * 设备类型常量 */ - public static final String PIPELINE_TYPE = "pipelineType"; + public static final String PIPELINE_TYPE = "lineType"; /** * 布防状态 diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index 793734c..7ab981e 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -55,7 +55,7 @@ } @RequestMapping("/add") - public Object add(@RequestBody BusPipeline busPipeline) { + public Object add(BusPipeline busPipeline) { try { busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -94,7 +94,7 @@ } @RequestMapping("/update") - public Object update(@RequestBody BusPipeline busPipeline) { + public Object update(BusPipeline busPipeline) { try { busPipelineService.updateById(busPipeline); } catch (RuntimeException rex) { @@ -146,6 +146,7 @@ * * @return */ + @CrossOrigin @RequestMapping(value = "/batchExport", method = RequestMethod.GET) public void batchExport(HttpServletResponse response, String keywords, String wellType, String deptid) throws IOException { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();