diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 546fe74..3567647 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ provided + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 546fe74..3567647 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ provided + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index f9e68ed..a18d759 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.neutron.controller; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.neutron.dto.HsRequest; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; @@ -11,17 +12,18 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; @Api(tags = "探测器管理(包括控制)") @Controller @RequestMapping("/Neutron") -public class NeutronController { +public class NeutronController extends ExportController { @Autowired private INeutronOptService neutronOptService; @@ -67,10 +69,9 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @PostMapping("/psdExport") + @GetMapping("/psdExport") @ResponseBody - public ResponseDataDTO> psdExport(Long taskId,Long psdX1,Long psdX2) { - - return ResponseDataDTO.success(iPsdService.psdExport(taskId,psdX1,psdX2)); + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 546fe74..3567647 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ provided + com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index f9e68ed..a18d759 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.neutron.controller; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.neutron.dto.HsRequest; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; @@ -11,17 +12,18 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; @Api(tags = "探测器管理(包括控制)") @Controller @RequestMapping("/Neutron") -public class NeutronController { +public class NeutronController extends ExportController { @Autowired private INeutronOptService neutronOptService; @@ -67,10 +69,9 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @PostMapping("/psdExport") + @GetMapping("/psdExport") @ResponseBody - public ResponseDataDTO> psdExport(Long taskId,Long psdX1,Long psdX2) { - - return ResponseDataDTO.success(iPsdService.psdExport(taskId,psdX1,psdX2)); + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java new file mode 100644 index 0000000..0a8461f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -0,0 +1,54 @@ +package com.casic.missiles.modular.neutron.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 监测点/设备信息 + *

+ * + * @author stylefeng123 + * @since 2023-04-18 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class PsdTxtExportDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ExcelProperty(value = "第一列0~4096值", order = 1) + private Integer x; + + @ExcelProperty(value = "第二列MCA值", order = 2) + private Integer mca; + + @ExcelProperty(value = "第三列PSD值", order = 3) + private Integer psd; + + @ExcelProperty(value = "第四列PSD映射至MCA值", order = 4) + private Integer psdMac; + + public PsdTxtExportDTO() { + } + + public PsdTxtExportDTO(Integer x, Integer mca, Integer psd, Integer psdMac) { + this.x = x; + this.mca = mca; + this.psd = psd; + this.psdMac = psdMac; + } +} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 546fe74..3567647 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ provided
+ com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index f9e68ed..a18d759 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.neutron.controller; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.neutron.dto.HsRequest; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; @@ -11,17 +12,18 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; @Api(tags = "探测器管理(包括控制)") @Controller @RequestMapping("/Neutron") -public class NeutronController { +public class NeutronController extends ExportController { @Autowired private INeutronOptService neutronOptService; @@ -67,10 +69,9 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @PostMapping("/psdExport") + @GetMapping("/psdExport") @ResponseBody - public ResponseDataDTO> psdExport(Long taskId,Long psdX1,Long psdX2) { - - return ResponseDataDTO.success(iPsdService.psdExport(taskId,psdX1,psdX2)); + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java new file mode 100644 index 0000000..0a8461f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -0,0 +1,54 @@ +package com.casic.missiles.modular.neutron.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 监测点/设备信息 + *

+ * + * @author stylefeng123 + * @since 2023-04-18 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class PsdTxtExportDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ExcelProperty(value = "第一列0~4096值", order = 1) + private Integer x; + + @ExcelProperty(value = "第二列MCA值", order = 2) + private Integer mca; + + @ExcelProperty(value = "第三列PSD值", order = 3) + private Integer psd; + + @ExcelProperty(value = "第四列PSD映射至MCA值", order = 4) + private Integer psdMac; + + public PsdTxtExportDTO() { + } + + public PsdTxtExportDTO(Integer x, Integer mca, Integer psd, Integer psdMac) { + this.x = x; + this.mca = mca; + this.psd = psd; + this.psdMac = psdMac; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index c2289a3..c886ce9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.neutron.model.Psd; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ List hsList(Long detectorId,String type); - Map psdExport(Long taskId,Long psdX1,Long psdX2); + void psdExport(Long taskId,Long psdX1,Long psdX2, HttpServletResponse response); void insertPsdAlarms(); diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 546fe74..3567647 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -35,6 +35,11 @@ provided
+ com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index f9e68ed..a18d759 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.neutron.controller; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.neutron.dto.HsRequest; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; @@ -11,17 +12,18 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; @Api(tags = "探测器管理(包括控制)") @Controller @RequestMapping("/Neutron") -public class NeutronController { +public class NeutronController extends ExportController { @Autowired private INeutronOptService neutronOptService; @@ -67,10 +69,9 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @PostMapping("/psdExport") + @GetMapping("/psdExport") @ResponseBody - public ResponseDataDTO> psdExport(Long taskId,Long psdX1,Long psdX2) { - - return ResponseDataDTO.success(iPsdService.psdExport(taskId,psdX1,psdX2)); + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java new file mode 100644 index 0000000..0a8461f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -0,0 +1,54 @@ +package com.casic.missiles.modular.neutron.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 监测点/设备信息 + *

+ * + * @author stylefeng123 + * @since 2023-04-18 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class PsdTxtExportDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ExcelProperty(value = "第一列0~4096值", order = 1) + private Integer x; + + @ExcelProperty(value = "第二列MCA值", order = 2) + private Integer mca; + + @ExcelProperty(value = "第三列PSD值", order = 3) + private Integer psd; + + @ExcelProperty(value = "第四列PSD映射至MCA值", order = 4) + private Integer psdMac; + + public PsdTxtExportDTO() { + } + + public PsdTxtExportDTO(Integer x, Integer mca, Integer psd, Integer psdMac) { + this.x = x; + this.mca = mca; + this.psd = psd; + this.psdMac = psdMac; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index c2289a3..c886ce9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.neutron.model.Psd; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ List hsList(Long detectorId,String type); - Map psdExport(Long taskId,Long psdX1,Long psdX2); + void psdExport(Long taskId,Long psdX1,Long psdX2, HttpServletResponse response); void insertPsdAlarms(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index c6a30c6..bdfc2d0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.cache.CacheUtil; import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.neutron.dao.PsdMapper; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.dto.PsdTxtDTO; +import com.casic.missiles.modular.neutron.dto.PsdTxtExportDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.robot.dto.PointNextDTO; @@ -28,6 +30,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.math.BigDecimal; import java.util.*; @@ -56,6 +60,10 @@ private IRobotCacheService iRobotCacheService; @Autowired private WebSocket webSocket; + @Autowired + private IBaseExportService iBaseExportService; + + //记录推送次数 private static volatile long times = 0; //记录报警是否推送 @@ -220,7 +228,7 @@ } @Override - public Map psdExport(Long taskId, Long psdX1, Long psdX2) { + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { Map resultMap = new HashMap<>(); //构造第一列数据 @@ -291,6 +299,17 @@ } } } - return resultMap; + + List list = new ArrayList<>(); + for(int j=0;jprovided
+ com.casic + casic-export-support + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java index f9e68ed..a18d759 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/controller/NeutronController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.neutron.controller; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.neutron.dto.HsRequest; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; @@ -11,17 +12,18 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Map; @Api(tags = "探测器管理(包括控制)") @Controller @RequestMapping("/Neutron") -public class NeutronController { +public class NeutronController extends ExportController { @Autowired private INeutronOptService neutronOptService; @@ -67,10 +69,9 @@ @ApiOperation("psd导出4列数据接口,需传taskId;psdX1,psdX2为框选psd横坐标的起止值") - @PostMapping("/psdExport") + @GetMapping("/psdExport") @ResponseBody - public ResponseDataDTO> psdExport(Long taskId,Long psdX1,Long psdX2) { - - return ResponseDataDTO.success(iPsdService.psdExport(taskId,psdX1,psdX2)); + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { + iPsdService.psdExport(taskId, psdX1, psdX2, response); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java new file mode 100644 index 0000000..0a8461f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/dto/PsdTxtExportDTO.java @@ -0,0 +1,54 @@ +package com.casic.missiles.modular.neutron.dto; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 监测点/设备信息 + *

+ * + * @author stylefeng123 + * @since 2023-04-18 + */ +@Data +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated +public class PsdTxtExportDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ExcelProperty(value = "第一列0~4096值", order = 1) + private Integer x; + + @ExcelProperty(value = "第二列MCA值", order = 2) + private Integer mca; + + @ExcelProperty(value = "第三列PSD值", order = 3) + private Integer psd; + + @ExcelProperty(value = "第四列PSD映射至MCA值", order = 4) + private Integer psdMac; + + public PsdTxtExportDTO() { + } + + public PsdTxtExportDTO(Integer x, Integer mca, Integer psd, Integer psdMac) { + this.x = x; + this.mca = mca; + this.psd = psd; + this.psdMac = psdMac; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java index c2289a3..c886ce9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/IPsdService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.neutron.model.Psd; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ List hsList(Long detectorId,String type); - Map psdExport(Long taskId,Long psdX1,Long psdX2); + void psdExport(Long taskId,Long psdX1,Long psdX2, HttpServletResponse response); void insertPsdAlarms(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java index c6a30c6..bdfc2d0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/neutron/service/impl/PsdServiceImpl.java @@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.common.WebSocket; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.core.cache.CacheUtil; import com.casic.missiles.modular.constants.RobotDictConstants; import com.casic.missiles.modular.neutron.dao.PsdMapper; import com.casic.missiles.modular.neutron.dto.PsdAlarmDTO; import com.casic.missiles.modular.neutron.dto.PsdDataDTO; import com.casic.missiles.modular.neutron.dto.PsdTxtDTO; +import com.casic.missiles.modular.neutron.dto.PsdTxtExportDTO; import com.casic.missiles.modular.neutron.model.Psd; import com.casic.missiles.modular.neutron.service.IPsdService; import com.casic.missiles.modular.robot.dto.PointNextDTO; @@ -28,6 +30,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.math.BigDecimal; import java.util.*; @@ -56,6 +60,10 @@ private IRobotCacheService iRobotCacheService; @Autowired private WebSocket webSocket; + @Autowired + private IBaseExportService iBaseExportService; + + //记录推送次数 private static volatile long times = 0; //记录报警是否推送 @@ -220,7 +228,7 @@ } @Override - public Map psdExport(Long taskId, Long psdX1, Long psdX2) { + public void psdExport(Long taskId, Long psdX1, Long psdX2, HttpServletResponse response) { Map resultMap = new HashMap<>(); //构造第一列数据 @@ -291,6 +299,17 @@ } } } - return resultMap; + + List list = new ArrayList<>(); + for(int j=0;j