From d03730cf7a9e2757e93bfdc34e5be7133ebc006c Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Thu, 8 Jun 2023 20:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E6=94=B9=20=20=E4=BC=98=E5=8C=96=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20=20=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=BB=E5=8A=A8=E6=8B=8D=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TermSetController.java | 1 - .../controller/TerminalAlarmController.java | 26 +-- .../controller/TerminalPhotoController.java | 20 +- .../shxy/xymanager_admin/test/Testbatch.java | 55 ++++++ .../main/resources/META-INF/spring.factories | 2 +- .../src/main/resources/application-test.yml | 2 +- .../vo/TermIdAndChannelIdVo.java | 26 +++ .../vo/TerminalAlarmSelectVo.java | 6 +- .../xymanager_common/vo/TerminalPhotoVo.java | 10 +- .../vo/UpdateTerminalAlarmParamsVo.java | 31 +++ .../dao/TerminalImgAlarmParamsDao.java | 5 + .../dao/TerminalImgAlarmsDao.java | 4 +- .../xymanager_dao/dao/TerminalPhotoDao.java | 3 +- .../mappers/TerminalImgAlarmParamsDao.xml | 183 +++++++++--------- .../mappers/TerminalImgAlarmsDao.xml | 17 +- .../resources/mappers/TerminalPhotoDao.xml | 8 + xymanager_framework/pom.xml | 8 +- .../shxy/xymanager_service/cache/XyCache.java | 1 + .../impl/TerminalAlarmServiceImpl.java | 82 ++++---- .../impl/TerminalPhotoServiceImpl.java | 85 +++++++- .../service/TerminalAlarmService.java | 9 +- .../service/TerminalPhotoService.java | 8 +- 22 files changed, 424 insertions(+), 168 deletions(-) create mode 100644 xymanager_admin/src/main/java/com/shxy/xymanager_admin/test/Testbatch.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermIdAndChannelIdVo.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalAlarmParamsVo.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java index cd09d7e..1f34ca7 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java @@ -8,7 +8,6 @@ import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.model.*; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_service.service.TermSetService; -import com.shxy.xymanager_service.service.TerminalChannelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java index 65c268f..1fe10f7 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java @@ -33,7 +33,7 @@ public class TerminalAlarmController extends BaseController { @RequestMapping("/getTerminalAlarmList") @Log(title = "获取告警列表", type = "查询") public ResponseReult getTerminalAlarmList(@RequestBody @Validated TerminalAlarmSelectVo vo) { - ServiceBody serviceBody = terminalAlarmService.getAlarmList(vo); + ServiceBody serviceBody = terminalAlarmService.getTerminalAlarmList(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -69,17 +69,17 @@ public class TerminalAlarmController extends BaseController { } -// @ApiOperation(value = "修改告警分类列表", notes = "修改告警分类列表", httpMethod = "POST") -// @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) -// @RequestMapping("/getAlarmTypeList") -// @Log(title = "修改告警分类列表", type = "修改") -// public ResponseReult updateAlarmTypeList() { -// ServiceBody serviceBody = terminalAlarmService.getAlarmTypeList(); -// 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("/updateAlarmTypeList") + @Log(title = "修改告警分类列表", type = "修改") + public ResponseReult updateAlarmTypeList(@RequestBody @Validated UpdateTerminalAlarmParamsVo vo) { + ServiceBody serviceBody = terminalAlarmService.updateAlarmTypeList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } } 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 0d3f3d4..10bf4c1 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 @@ -43,13 +43,12 @@ public class TerminalPhotoController extends BaseController { } } - @ApiOperation(value = "获取最新图片", notes = "获取最新图片接口", httpMethod = "POST") + @ApiOperation(value = "主动拍照", notes = "主动拍照接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLatestPhoto") - @Log(title = "获取最新图片", type = "查询") + @Log(title = "主动拍照", type = "查询") public ResponseReult getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) { - ServiceBody latestPhoto = terminalPhotoService.getLatestPhoto(vo); - ServiceBody serviceBody = latestPhoto; + ServiceBody serviceBody = terminalPhotoService.getLatestPhoto(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { @@ -176,4 +175,17 @@ public class TerminalPhotoController extends BaseController { } + @ApiOperation(value = "历史图片", notes = "历史图片接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getHistoryList") + @Log(title = "历史图片", type = "查询") + public ResponseReult getHistoryList(@RequestBody @Validated TermIdAndChannelIdVo vo) { + ServiceBody serviceBody = terminalPhotoService.getHistoryList(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/test/Testbatch.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/test/Testbatch.java new file mode 100644 index 0000000..17202d2 --- /dev/null +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/test/Testbatch.java @@ -0,0 +1,55 @@ +package com.shxy.xymanager_admin.test; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.mysql.cj.xdevapi.JsonArray; + +import java.sql.*; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + +public class Testbatch { + + private static Connection con; + + public static void main(String[] args) throws Exception { + String driver = "com.mysql.jdbc.Driver"; + //这里我的数据库是cgjr + String url = "jdbc:mysql://47.96.238.157:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + String user = "xymp"; + String password = "Xymp@2023"; + try { + Class.forName(driver); + con = DriverManager.getConnection(url, user, password); + if (!con.isClosed()) { + System.out.println("数据库连接成功"); + } + String sql = "insert into terminal_img_alarms (term_id,channel_id,preset_id,photo_org_id,alarm_time,alarm_info,create_time) values(?,?,?,?,?,?,?)"; + + PreparedStatement preparedStatement = con.prepareStatement(sql); + Date date = new Date(1686118807); + for (int i = 0; i < 10; i++) { + preparedStatement.setInt(1, 10002); + preparedStatement.setInt(2, 1); + preparedStatement.setInt(3, 255); + preparedStatement.setLong(4, 1962967140); + preparedStatement.setLong(5, 1686118807); + preparedStatement.setString(6, "{info}"); + preparedStatement.setDate(7, date); + preparedStatement.addBatch(); + } + preparedStatement.executeBatch(); + con.commit(); + } catch (ClassNotFoundException e) { + System.out.println("数据库驱动没有安装"); + } catch (SQLException e) { + System.out.println("数据库连接失败"); + } catch (Exception e) { + e.printStackTrace(); + } finally { + con.close(); + } + } +} diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 5e2059b..8e7c358 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index e5c5202..fe4cd08 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/xymanager_admin/src/main/resources/application-test.yml @@ -2,7 +2,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/xymp?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 type: com.alibaba.druid.pool.DruidDataSource diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermIdAndChannelIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermIdAndChannelIdVo.java new file mode 100644 index 0000000..2de79c3 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TermIdAndChannelIdVo.java @@ -0,0 +1,26 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; + +@Data +@ApiModel(value = "装置编号和通道编号对象", description = "装置编号和通道编号对象") +public class TermIdAndChannelIdVo { + + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer termId; + + @ApiModelProperty(value = "通道编号", example = "123455") + private Integer channelId; + + @Min(value = 1, message = "分页位置最小从1开始") + @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1") + private int pageindex; + + @Min(value = 1, message = "分页大小最小为1") + @ApiModelProperty(value = "分页大小", required = true, example = "1") + private int pagesize; +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java index 2b8891e..7855dea 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAlarmSelectVo.java @@ -15,13 +15,13 @@ import java.util.Date; public class TerminalAlarmSelectVo { @ApiModelProperty(value = "电压编号", example = "123455") - private Integer dyid; + private Integer dyId; @ApiModelProperty(value = "装置编号", example = "123455") - private Integer lineid; + private Integer lineId; @ApiModelProperty(value = "杆塔编号", example = "123455") - private Integer towerid; + private Integer towerId; @ApiModelProperty(value = "告警类型", example = "123455") private Integer label; 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 bb715e1..dd3261d 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 @@ -5,15 +5,17 @@ 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 String cmdid; + @NotNull(message = "装置编号") + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer termId; @NotNull(message = "通道号") @ApiModelProperty(value = "通道号", example = "123455") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalAlarmParamsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalAlarmParamsVo.java new file mode 100644 index 0000000..e094df3 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalAlarmParamsVo.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 java.io.Serializable; +import java.util.List; + +@Data +@ApiModel(value = "修改告警类型", description = "修改告警类型信息") +public class UpdateTerminalAlarmParamsVo implements Serializable { + + @ApiModelProperty(value = "修改告警类型列表", example = "[]") + private List list; + + @Data + public static class AlarmParamBean { + @ApiModelProperty(value = "编号", example = "123456") + private Integer id; + @ApiModelProperty(value = "告警编号", example = "123456") + private Integer label; + @ApiModelProperty(value = "告警名称", example = "123456") + private String name; + @ApiModelProperty(value = "可信度", example = "123456") + private Float prob; + } + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java index feba265..3c8ad6e 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmParamsDao.java @@ -1,10 +1,13 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.TerminalImgAlarmParams; +import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; public interface TerminalImgAlarmParamsDao { + int deleteByPrimaryKey(Integer id); int insert(TerminalImgAlarmParams record); @@ -17,5 +20,7 @@ public interface TerminalImgAlarmParamsDao { int updateByPrimaryKeySelective(TerminalImgAlarmParams record); + int updateList(@Param("list") List record, @Param("updateTime") Date updateTime); + int updateByPrimaryKey(TerminalImgAlarmParams record); } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java index 6716edf..7bd8612 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalImgAlarmsDao.java @@ -1,11 +1,11 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.TerminalImgAlarmsDto; +import com.shxy.xymanager_common.entity.TerminalImgAlarmParams; import com.shxy.xymanager_common.entity.TerminalImgAlarms; import org.apache.ibatis.annotations.Param; import java.math.BigInteger; -import java.util.Date; import java.util.List; public interface TerminalImgAlarmsDao { @@ -17,7 +17,7 @@ public interface TerminalImgAlarmsDao { TerminalImgAlarms selectByPrimaryKey(Long id); - List selectAlarmsDetails(@Param("terminalidlist") List termidlist, @Param("label") Integer label,@Param("prob") Float prob, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); + List selectAlarmsDetails(@Param("terminalidlist") List termidlist, @Param("labellist") List labellist, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); int updateByPrimaryKeySelective(TerminalImgAlarms record); 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 17245ad..53f2514 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 @@ -33,13 +33,14 @@ public interface TerminalPhotoDao { TerminalPhoto getLatestPhoto(@Param("termId") Integer termId); + List getLatestPhotoByTermidAndChannelid(@Param("termId") Integer termId,@Param("channelId") Integer channelId); + List selectPhotos(); List selectTermAndChannelLatestPhotoList(@Param("list") List list); List selectPhotoListForOpen(@Param("termId") Integer terminalid,@Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); - List selectPhotoSchedule(TerminalPhotoTimeVo vo); PhotoParamsDto selectPhotoParams(ReturnedPhotoParamsVo vo); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml index bbc5b03..6a3bdbf 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmParamsDao.xml @@ -1,33 +1,33 @@ - - - - - - - - - + + + + + + + + + id, label, name, prob, create_time, update_time - - - + + + delete from terminal_img_alarm_params where id = #{id,jdbcType=INTEGER} - + insert into terminal_img_alarm_params (id, label, name, prob, create_time, update_time ) @@ -35,71 +35,71 @@ #{prob,jdbcType=REAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} ) - - insert into terminal_img_alarm_params - - - id, - - - label, - - - name, - - - prob, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{label,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{prob,jdbcType=REAL}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update terminal_img_alarm_params - - - label = #{label,jdbcType=INTEGER}, - - - name = #{name,jdbcType=VARCHAR}, - - - prob = #{prob,jdbcType=REAL}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - + + insert into terminal_img_alarm_params + + + id, + + + label, + + + name, + + + prob, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{label,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{prob,jdbcType=REAL}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + update terminal_img_alarm_params + + + label = #{label,jdbcType=INTEGER}, + + + name = #{name,jdbcType=VARCHAR}, + + + prob = #{prob,jdbcType=REAL}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + update terminal_img_alarm_params set label = #{label,jdbcType=INTEGER}, name = #{name,jdbcType=VARCHAR}, @@ -108,4 +108,13 @@ update_time = #{updateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER} + + + + update terminal_img_alarm_params + set + prob = #{item.prob} + where id = #{item.id} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml index 57e26c5..ab7c8d5 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalImgAlarmsDao.xml @@ -67,11 +67,18 @@ #{item} - - and label = #{label} - - - and prob >= #{prob} + + and + + ( + + label = #{item.label} + + + and prob >= #{item.prob} + + ) + order by a.alarm_time desc diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 9a2e0fb..fdc30e5 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -204,6 +204,14 @@ order by recv_time desc limit 1 + +