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 2b8de91..4ff7aa5 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 @@ -9,10 +9,7 @@ import com.shxy.xymanager_common.entity.TerminalPhoto; import com.shxy.xymanager_common.model.TerminalPhotoListForOpenModel; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.model.TerminalPhotosModel; -import com.shxy.xymanager_common.vo.PageVo; -import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo; -import com.shxy.xymanager_common.vo.TerminalAndTimeForOpenVo; -import com.shxy.xymanager_common.vo.TerminalPhotoVo; +import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_service.service.TerminalPhotoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,6 +60,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("/getPhotoTime") + @Log(title = "拍照时间表", type = "查询") + public ResponseReult getPhotoTime(@RequestBody @Validated TerminalPhotoTimeVo vo) { + ServiceBody serviceBody = terminalPhotoService.getPhotoTime(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_common/src/main/java/com/shxy/xymanager_common/dto/TerminalPhotoScheduleDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalPhotoScheduleDto.java new file mode 100644 index 0000000..690c11b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalPhotoScheduleDto.java @@ -0,0 +1,22 @@ +package com.shxy.xymanager_common.dto; + +import cn.hutool.core.date.DateTime; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class TerminalPhotoScheduleDto implements Serializable { + private String cmid; + + private Short span; + + private Date startTime; + + private Date endTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java index 5acbf75..f1062ec 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java @@ -128,6 +128,16 @@ public class MyDateUtils extends DateUtil { return format(str, "MM/dd"); } + /** + * 日期型转化为"HH/MM" 格式 + */ + public static String parseHourAndMinute(Date str) { + if (str == null) { + return null; + } + return format(str, "HH/mm"); + } + /** * 获取服务器启动时间 */ diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeVo.java new file mode 100644 index 0000000..ec1b389 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeVo.java @@ -0,0 +1,22 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(value = "拍照时间表请求参数", description = "拍照时间表请求参数") +public class TerminalPhotoTimeVo { + + @NotNull(message = "通道号") + @ApiModelProperty(value = "通道号", example = "123455") + private Short channel; + + @NotNull(message = "装置ID不能缺少") + @ApiModelProperty(value = "装置ID", example = "123455") + private Short termId; + + +} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index 98375d1..ce5f1d4 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -1,6 +1,8 @@ package com.shxy.xymanager_dao.dao; +import com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto; import com.shxy.xymanager_common.entity.TerminalPhoto; +import com.shxy.xymanager_common.vo.TerminalPhotoTimeVo; import org.apache.ibatis.annotations.Param; import javax.xml.crypto.Data; @@ -29,4 +31,8 @@ public interface TerminalPhotoDao { List selectPhotos(); List selectPhotoListForOpen(@Param("termId") Integer terminalid,@Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); + + + List selectPhotoSchedule(TerminalPhotoTimeVo vo); + } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 5b05fcf..1ea4870 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -55,6 +55,18 @@ order by photo_time desc + + +