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 e2248eb..d2f09ed 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 @@ -17,12 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Date; +import org.springframework.web.bind.annotation.*; @Api(value = "图片接口", tags = "图片接口相关") @@ -33,6 +28,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") @@ -49,10 +45,36 @@ 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") + @RequestMapping("/takePic") @Log(title = "主动拍照", type = "查询") - public ResponseReult getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) { - ServiceBody serviceBody = terminalPhotoService.getLatestPhoto(vo); + public ResponseReult takePic(@Validated TerminalPhotoVo vo) { + ServiceBody serviceBody = terminalPhotoService.takePic(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 = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTakePicStatus") + @Log(title = "最新图片查询", type = "查询") + public ResponseReult getTakePicStatus(@Validated RequestIdVo vo) { + ServiceBody serviceBody = terminalPhotoService.getTakePicStatus(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 = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getTakePicPhotoStatus") + @Log(title = "主动拍照下照片状态查询", type = "查询") + public ResponseReult getTakePicPhotoStatus( @Validated ReturnedPhotoVo vo) { + ServiceBody serviceBody = terminalPhotoService.getTakePicPhotoStatus(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -100,18 +122,6 @@ public class TerminalPhotoController extends BaseController { } } - @ApiOperation(value = "最新图片查询", notes = "图片查询接口", httpMethod = "POST") - @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) - @RequestMapping("/getReturnedPhoto") - @Log(title = "最新图片查询", type = "查询") - public ResponseReult getReturnedPhoto(@RequestBody @Validated ReturnedPhotoVo vo) { - ServiceBody serviceBody = terminalPhotoService.getReturnedPhoto(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/entity/RequestResults.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/RequestResults.java index 6382a6e..caabcc1 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/RequestResults.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/RequestResults.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity; import lombok.Data; import java.io.Serializable; +import java.math.BigInteger; @Data public class RequestResults implements Serializable { @@ -22,9 +23,9 @@ public class RequestResults implements Serializable { private Integer scheduleStatus; - private Long requestTime; + private BigInteger requestTime; - private Long createTime; + private BigInteger createTime; private String data; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/TakePicStatus.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/TakePicStatus.java new file mode 100644 index 0000000..1688ef7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/TakePicStatus.java @@ -0,0 +1,29 @@ +package com.shxy.xymanager_common.enums; + + +/** + * 下发状态 + * "0---未知 1---成功 2---失败" + * + * @author 晶晶 + */ +public enum TakePicStatus { + UNKONW("UNKONW", 0), SUCCESS("SUCCESS", 1), FAIL("FAIL", 2); + + private String name; + private Integer value; + + TakePicStatus(String name, Integer value) { + this.name = name; + this.value = value; + } + + @Override + public String toString() { + return this.value + "_" + this.name; + } + + public Integer value() { + return this.value; + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TakePIcModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TakePIcModel.java new file mode 100644 index 0000000..8cf71f4 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TakePIcModel.java @@ -0,0 +1,24 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 主动拍照的返回对象 + */ +@Data +@ApiModel(value = "主动拍照的返回对象", description = "主动拍照的返回对象") +public class TakePIcModel implements Serializable { + + @ApiModelProperty(value = "请求编号", example = "123456") + private Integer requestId; + + @ApiModelProperty(value = "拍照时间", example = "AAAA") + private Date taketime; + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/CmaUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/CmaUtil.java index e7ef59c..904bc35 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/CmaUtil.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/CmaUtil.java @@ -1,6 +1,9 @@ package com.shxy.xymanager_common.util; import com.shxy.xymanager_common.constant.Constants; +import com.shxy.xymanager_common.dto.ScheduleDetailsDto; + +import java.util.List; /** * 跟Cma通信的工具类 @@ -9,14 +12,205 @@ public class CmaUtil { /** * 手动拍照 + * * @param cmdid * @param channel * @param type * @return */ - public static String takePic(String cmdid, Integer channel, Integer type) { - String cmd = Constants.CMD + "capture --cmdid=" + cmdid + " --channel=" + channel + " --preset=255 --type=" + type; + public static String takePic(String cmdid, Integer channel, Integer preset, Integer type, Integer requestId) { + String cmd = Constants.CMD + "capture --cmdid=" + cmdid + " --channel=" + channel + " --preset=" + preset + " --type=" + type + " --clientid=10" + " --reqid=" + requestId; + return cmd; + } + + /** + * 声光报警 + * + * @param cmdid + * @param ctrl + * @return + */ + public static String alarmMark(String cmdid, Integer ctrl) { + String cmd = Constants.CMD + "voice --cmdid=" + cmdid + " --ctrl=" + ctrl; + return cmd; + } + + /** + * 开启关闭GPS + * + * @param cmdid + * @param status + * @return + */ + public static String setTermGPS(String cmdid, Integer status) { + String cmd = Constants.CMD + "gpsctrl --flag=1 --cmdid=" + cmdid + " --ctrl=" + status; + return cmd; + } + + /** + * 获取GPS位置 + * + * @param cmdid + * @return + */ + public static String getReturnedGPS(String cmdid) { + String cmd = Constants.CMD + "gpsinfo --flag=0 --cmdid=" + cmdid + " --clientid=10"; + return cmd; + } + + /** + * 最新图片采集参数触发 + * + * @param cmdid + * @return + */ + public static String getPhotoQueryParam(String cmdid, Integer requestId, Integer channelid) { + String cmd = Constants.CMD + "imgparams --cmdid=" + cmdid + " --clientid=10 --reqid=" + requestId + " --flag=0 --rf=7 --channel=" + channelid; + return cmd; + } + + /** + * 图像采集参数设置 + * + * @param cmdid + * @return + */ + public static String addOrUpdatePhotoParams(String cmdid, Integer color, Integer resolution, Integer luminance, Integer contrast, Integer saturation, Integer channel) { + String cmd = Constants.CMD + "imgparams --flag=1 --cmdid=" + cmdid + " --rf=7 --color=" + color + " --resolution=" + resolution + + " --luminance=" + luminance + " -contrast=" + contrast + " --saturation=" + saturation + " --channel=" + channel; + return cmd; + } + + /** + * 拍照时间表查询触发 + * + * @param cmdid + * @return + */ + public static String selectPhotoTimeGet(String cmdid, Integer requestId, Integer channel) { + String cmd = Constants.CMD + "schedule --cmdid=" + cmdid + " --reqid=" + requestId + " --clientid=10 --flag=0 --rf=7 --channel=" + channel; + return cmd; + } + + /** + * 关联拍照时间表 + * + * @return + */ + public static String relateSchelduleRule(List dtoList, String cmdid, Integer requestId, Integer channel, String timestr) { + String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --clientid=10 --cmdid=" + + cmdid + " --reqid=" + requestId + " --channel=" + channel + " " + + timestr; + return cmd; + } + + /** + * 调用CMA获取装置的拍照时间表详情 + * + * @return + */ + public static String cmaSchelduleDetials(String cmdid, Integer requestId, Integer channel) { + String cmd = Constants.CMD + "schedule --cmdid=" + cmdid + " --reqid=" + requestId + " --clientid=10 --flag=0 --channel=" + channel; + + return cmd; + } + + /** + * 调用CMA获取装置的拍照时间表详情 + * + * @return + */ + public static String resetTerminal(String cmdid) { + String cmd = Constants.CMD + "reset --cmdid=" + cmdid + " --mode=0"; + return cmd; + } + /** + * 获取装置状态 + * + * @return + */ + public static String getTerminalStatus(String cmdid) { + String cmd = Constants.CMD + "runningstatus --flag=0 --cmdid=" + cmdid; return cmd; } + + /** + * 修改装置编号 + * + * @return + */ + public static String updateTerminalId(String cmdid, String newcmdid) { + String cmd = Constants.CMD + "termid --flag=1 --cmdid=" + cmdid + " --newcmdid=" + newcmdid; + return cmd; + } + + /** + * 查询装置编号 + * + * @return + */ + public static String terminalIdGet(String cmdid, Integer requestId) { + String cmd = Constants.CMD + "termid --clientid=10 --flag=0 --cmdid=" + cmdid + " --reqid=" + requestId; + return cmd; + } + + /** + * 视频参数设置 + * + * @return + */ + public static String updateVideoParam(String cmdid, Integer channel, Integer videoformat, Integer videotime, Integer preset) { + String cmd = Constants.CMD + "videoparams --flag=1 --cmdid=" + cmdid + " --channel=" + channel + " --format=" + + videoformat + " --time=" + videotime + " --preset=" + preset; + return cmd; + } + + /** + * 视频参数查询 + * + * @return + */ + public static String videoParamGet(String cmdid, Integer requestId, Integer channel) { + String cmd = Constants.CMD + "videoparams --clientid=10 --flag=0 --cmdid=" + cmdid + " --reqid=" + requestId + " --channel=" + channel; + return cmd; + } + + /** + * 获取全局参数配置 + * + * @param cmdid + * @param requestId + * @return + */ + public static String getSystemConfig(String cmdid, Integer requestId) { + String cmd = Constants.CMD + "sampling --clientid=10 --flag=0 --cmdid=" + cmdid + " --reqid=" + requestId; + return cmd; + } + + /** + * 更新全局参数配置 + * + * @param cmdid + * @param heartbeat + * @return + */ + public static String updateSystemConfig(String cmdid, Integer heartbeat) { + String cmd = Constants.CMD + "sampling --flag =1 --cmdid=" + cmdid + " --heartbeat=" + heartbeat; + return cmd; + } + + /** + * 获取上位机信息触发 + * + * @param cmdid + * @param requestId + * @return + */ + public static String upperComputerGet(String cmdid, Integer requestId) { + String cmd = Constants.CMD + "cma --clientid=10 --flag=0 --cmdid=" + cmdid + " --reqid=" + requestId; + return cmd; + } + + } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java index 4c0f90b..a264c0c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java @@ -25,7 +25,7 @@ import java.util.Map; /** * 执行指令 * - * @author cy + * @author jingjing */ @Slf4j @Component @@ -94,7 +94,7 @@ public class TerminalUtils { * 返回图片视频缩略地址 */ public static String getThumbPhotoPath(Integer mediaType, String requestIp, String path) { - if (mediaType.intValue() == 0) { + if (mediaType.intValue() == 1) { if (StringUtils.isNotBlank(path)) { return requestIp + videoaddress + path; } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RequestIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RequestIdVo.java index 4461a0d..e1b2632 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RequestIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RequestIdVo.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; @Data @ApiModel(value = "查询Cma结果requestid的Vo", description = "查询Cma结果requestid的Vo") -public class RequestIdVo { +public class RequestIdVo { @NotNull(message = "查询编号不能缺少") @ApiModelProperty(value = "查询编号", example = "123455") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java index e7a36c5..ac1e563 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java @@ -15,5 +15,5 @@ public class ReturnedPhotoParamsGetVo { @ApiModelProperty(value = "通道ID", required = true, example = "A0001") - private Short channelId; + private Integer channelId; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoVo.java index f6d8071..b17cadf 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoVo.java @@ -1,12 +1,16 @@ package com.shxy.xymanager_common.vo; import cn.hutool.core.date.DateTime; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import java.math.BigInteger; +import java.time.LocalDateTime; @Data @ApiModel(value = "返回图片查询", description = "返回图片查询") @@ -15,7 +19,6 @@ public class ReturnedPhotoVo { @ApiModelProperty(value = "装置id", required = true, example = "A0001") private Integer termId; - @ApiModelProperty(value = "手动拍照时间", required = true, example = "A0001") - private DateTime photoTime; + private BigInteger photoTime; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SystemConfigVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SystemConfigVo.java index fbe2927..a9c4bfa 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SystemConfigVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SystemConfigVo.java @@ -17,7 +17,7 @@ public class SystemConfigVo { @NotNull(message = "装置ID") @ApiModelProperty(value = "装置ID", example = "123455") - private Integer cmdId; + private String cmdId; @NotNull(message = "参数值") @ApiModelProperty(value = "参数值", example = "123455") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java index 906e517..0ffb535 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java @@ -12,7 +12,7 @@ public class TerminalPhotoTimeGetVo { @NotNull(message = "通道号") @ApiModelProperty(value = "通道号", example = "123455") - private Short channel; + private Integer channel; @NotNull(message = "检测装置ID不能缺少") @ApiModelProperty(value = "检测装置ID", example = "123455") 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 index dd3261d..96acd6f 100644 --- 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 @@ -9,9 +9,6 @@ import javax.validation.constraints.NotNull; @Data @ApiModel(value = "最近图片请求参数", description = "最近图片请求参数") public class TerminalPhotoVo { -// @NotNull(message = "装置列表不能缺少") -// @ApiModelProperty(value = "装置通道编号列表", example = "123455") -// private String cmdid; @NotNull(message = "装置编号") @ApiModelProperty(value = "装置编号", example = "123455") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTowerVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTowerVo.java index 853fc09..4c6501f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTowerVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTowerVo.java @@ -28,7 +28,6 @@ public class UpdateTowerVo { private Integer order; @ApiModelProperty(value = "地址", example = "地址地址") - @NotBlank(message = "地址地址") private String address; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java index 640e0df..6d237ce 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java @@ -17,7 +17,7 @@ public class VideoGetVo { @NotNull(message = "通道编号") @ApiModelProperty(value = "通道编号", example = "01") - private short channelId; + private Integer channelId; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java index 1a492d6..8744f09 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VoiceCtrlVo.java @@ -20,7 +20,7 @@ public class VoiceCtrlVo { @NotNull(message = "声光报警开关 0:关闭 1:开启") @ApiModelProperty(value = "声光报警开关", example = "0:关闭 1:开启") - private short ctrl; + private Integer ctrl; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index 93112dc..b62bd49 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -13,7 +13,7 @@ public interface DyLevelDao { List selectDyAndLineAndTowerAnTermList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("termid") Integer termid, @Param("search") String search, @Param("status") Integer status); - List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid); + List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid,@Param("status") Integer status); int deleteByPrimaryKey(Integer id); 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 081a778..a3403a4 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 @@ -13,6 +13,7 @@ import java.util.List; public interface TerminalPhotoDao { + List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); List selectPhotoListByOrginIdAndTermList(@Param("list") List list); diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 71ded5d..69ab071 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -158,7 +158,7 @@ from ((dy_level a left join `lines` b on a.id = b.dy_level_id ) left join towers c on c.line_id = b.id ) - true + a.status = #{status} and b.status = #{status} and c.status = #{status} and a.id = #{dyid} diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 0b8f4f4..49f4fe8 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -108,6 +108,7 @@ order by photo_time desc +