diff --git a/libs/xympj.so b/libs/xympj.so index 54ffcdc..d60e3d8 100644 Binary files a/libs/xympj.so and b/libs/xympj.so differ diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java index 6f4bc2a..0e8181f 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java @@ -7,6 +7,8 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo; +import com.shxy.xymanager_common.vo.TerminalPhotoVo; +import com.shxy.xymanager_service.interaction.Cma; import com.shxy.xymanager_service.service.TerminalPhotoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -28,6 +30,7 @@ public class TerminalPhotoController extends BaseController { @Autowired TerminalPhotoService terminalPhotoService; + @ApiOperation(value = "获取图片列表", notes = "获取图片列表接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getTerminalPhotoList") @@ -41,6 +44,19 @@ public class TerminalPhotoController extends BaseController { } } + @ApiOperation(value = "获取最新图片", notes = "获取最新图片接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getLatestPhoto") + @Log(title = "获取最新图片", type = "查询") + public ResponseReult getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) { + ServiceBody serviceBody = terminalPhotoService.getLatestPhoto(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + @ApiOperation(value = "图片查询", notes = "图片查询接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index 123236a..eb5d6c6 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/xymanager_admin/src/main/resources/application-test.yml @@ -165,3 +165,10 @@ swagger2: # # 匹配链接 # urlPatterns: /system/*,/monitor/*,/tool/* +cma: + server: 47.96.238.157 + port: 6891 +upload: + # path: file:/usr/local/home/manager/download/ + path: C:\software\upload\ + diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java new file mode 100644 index 0000000..e970a59 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoVo.java @@ -0,0 +1,31 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +@ApiModel(value = "最近图片请求参数", description = "最近图片请求参数") +public class TerminalPhotoVo { + + @NotNull(message = "装置列表不能缺少") + @ApiModelProperty(value = "装置通道编号列表", example = "123455") + private String cmdid; + + @NotNull(message = "通道号") + @ApiModelProperty(value = "通道号", example = "123455") + private Short channel; + + @NotNull(message = "装置列表不能缺少") + @ApiModelProperty(value = "装置通道编号列表", example = "123455") + private Short preset; + + @NotNull(message = "图片类型") + @ApiModelProperty(value = "图片类型", example = "123455") + private Short captureType; + + +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index dea93c0..4611288 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -8,10 +8,13 @@ import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.util.MyDateUtils; import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo; +import com.shxy.xymanager_common.vo.TerminalPhotoVo; import com.shxy.xymanager_dao.dao.TerminalPhotoDao; +import com.shxy.xymanager_service.interaction.Cma; import com.shxy.xymanager_service.service.TerminalPhotoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.math.BigInteger; @@ -29,6 +32,13 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Autowired TerminalPhotoDao terminalPhotoDao; + @Value("${cma.server}") + private String server; + + @Value("${cma.port}") + private int port; + + /** * 根据装置id和通道id获取图片 * @@ -72,4 +82,11 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { return Asserts.success(model); } + @Override + public ServiceBody getLatestPhoto(TerminalPhotoVo vo) { + Cma cma = new Cma(server,port); + Boolean hasNew = cma.requestCapture(vo.getCmdid(),vo.getChannel(),vo.getPreset(),vo.getCaptureType()); + return Asserts.success(hasNew); + } + } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java index 08f83ce..c47ada9 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo; +import com.shxy.xymanager_common.vo.TerminalPhotoVo; /** * 装置图片接口 @@ -17,4 +18,11 @@ public interface TerminalPhotoService { */ ServiceBody getTerminalPhotoList(TerminalAndChannelIdAndTimeVo vo); + /** + * 根据通道和装置id获取最新图片 + * + * @return + */ + ServiceBody getLatestPhoto(TerminalPhotoVo vo); + }