diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java index f60a7d7a8..3611baf97 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeCurrentDataController.java @@ -138,7 +138,7 @@ public class HighSlopeCurrentDataController { } - @ApiOperation(value = "通过分页信息查询所有相关数据(项目监测详情-数据列表、基坑配置-实时数据)", notes = "通过分页信息查询所有相关数据(项目监测详情-数据列表、基坑配置-实时数据)") + @ApiOperation(value = "通过分页信息查询所有相关数据(项目监测详情-数据列表、高边坡配置-实时数据)", notes = "通过分页信息查询所有相关数据(项目监测详情-数据列表、高边坡配置-实时数据)") @PostMapping(value = "/selectHighSlopeCurrentDataList") public Result selectHighSlopeCurrentDataList(@RequestBody CurrentDataListQO currentDataListQO) { CurrentDataListVO currentDataListVO = new CurrentDataListVO(); diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMeasurePointController.java b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMeasurePointController.java index c6f610186..fceeeb183 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMeasurePointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMeasurePointController.java @@ -38,9 +38,9 @@ public class HighSlopeMeasurePointController { private IHighSlopeMeasurePointService highSlopeMeasurePointService; /** - * 基坑配置-测点管理列表 + * 高边坡配置-测点管理列表 */ - @ApiOperation(value = "基坑配置-测点管理列表", notes = "基坑配置-测点管理列表", httpMethod = "POST") + @ApiOperation(value = "高边坡配置-测点管理列表", notes = "高边坡配置-测点管理列表", httpMethod = "POST") @PostMapping(value = "/selectMeasurePointList") public Result> selectListByPageInfo(@RequestBody SelectMeasurePointListQO selectMeasurePointListQO) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery().eq(HighSlopeMeasurePoint::getRelaId, selectMeasurePointListQO.getRelaId()); @@ -54,7 +54,7 @@ public class HighSlopeMeasurePointController { } - @ApiOperation(value = "基坑配置-根据测点编号查询详情", notes = "基坑配置-根据测点编号查询详情") + @ApiOperation(value = "高边坡配置-根据测点编号查询详情", notes = "高边坡配置-根据测点编号查询详情") @ApiImplicitParams({ @ApiImplicitParam(name = "measurePointNumber", value = "测点编号", paramType = "query", required = true, dataType = "String") }) diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeCurrentData.java index 14e6fda6e..0d95234a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeCurrentData.java @@ -23,7 +23,7 @@ import java.io.Serializable; * @version: V1.0 */ @Data -@TableName("deep_excavation_current_data") +@TableName("high_slope_current_data") @ApiModel(value = "HighSlopeCurrentData实体类", description = "HighSlopeCurrentData") @Accessors(chain = true) @NoArgsConstructor @@ -99,10 +99,10 @@ public class HighSlopeCurrentData implements Serializable { private String unit; /** - * 基坑名称 + * 高边坡名称 */ - @Excel(name = "基坑名称", width = 15) - @ApiModelProperty(value = "基坑名称") + @Excel(name = "高边坡名称", width = 15) + @ApiModelProperty(value = "高边坡名称") @TableField(exist = false) private String engineeringName; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeEngineering.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeEngineering.java index d5dfc1b6d..5b6b54564 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeEngineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeEngineering.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; * @version: V1.0 */ @Data -@TableName("deep_excavation_engineering") +@TableName("high_slope_engineering") @ApiModel(value = "HighSlopeEngineering实体类", description = "HighSlopeEngineering") public class HighSlopeEngineering implements Serializable { private static final long serialVersionUID = 1L; @@ -80,16 +80,16 @@ public class HighSlopeEngineering implements Serializable { @ApiModelProperty(value = "安全等级") private String safetyLevel; /** - * 基坑深度 + * 高边坡深度 */ - @Excel(name = "基坑深度", width = 15) - @ApiModelProperty(value = "基坑深度") + @Excel(name = "高边坡深度", width = 15) + @ApiModelProperty(value = "高边坡深度") private String foundationDitchDepth; /** - * 基坑周长 + * 高边坡周长 */ - @Excel(name = "基坑周长", width = 15) - @ApiModelProperty(value = "基坑周长") + @Excel(name = "高边坡周长", width = 15) + @ApiModelProperty(value = "高边坡周长") private String foundationDitchGirth; /** * 支护形式 diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMeasurePoint.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMeasurePoint.java index 167a197aa..8d88f738a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMeasurePoint.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMeasurePoint.java @@ -22,7 +22,7 @@ import java.util.List; * @version: V1.0 */ @Data -@TableName("deep_excavation_measure_point") +@TableName("high_slope_measure_point") @ApiModel(value = "HighSlopeMeasurePoint实体类", description = "HighSlopeMeasurePoint") public class HighSlopeMeasurePoint implements Serializable { private static final long serialVersionUID = 1L; @@ -41,10 +41,10 @@ public class HighSlopeMeasurePoint implements Serializable { private Long highSlopeId; /** - * 基坑与监测内容关系ID + * 高边坡与监测内容关系ID */ - @Excel(name = "基坑与监测内容关系ID", width = 15) - @ApiModelProperty(value = "基坑与监测内容关系ID") + @Excel(name = "高边坡与监测内容关系ID", width = 15) + @ApiModelProperty(value = "高边坡与监测内容关系ID") private Long relaId; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorType.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorType.java index 3bb4d5b60..3b7db9147 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorType.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorType.java @@ -22,7 +22,7 @@ import lombok.experimental.Accessors; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "deep_excavation_monitor_type") +@TableName(value = "high_slope_monitor_type") @Accessors(chain = true) public class HighSlopeMonitorType { @TableId(value = "id", type = IdType.AUTO) diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorTypeRela.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorTypeRela.java index 327670cae..00c9b433c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorTypeRela.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeMonitorTypeRela.java @@ -18,12 +18,12 @@ import java.io.Serializable; */ /** - * 高边坡-基坑监测内容关联表 + * 高边坡-高边坡监测内容关联表 */ @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "deep_excavation_monitor_type_rela") +@TableName(value = "high_slope_monitor_type_rela") public class HighSlopeMonitorTypeRela implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -47,9 +47,9 @@ public class HighSlopeMonitorTypeRela implements Serializable { private Long monitorTypeId; /** - * 基坑id + * 高边坡id */ - @TableField(value = "deep_excavation_id") + @TableField(value = "high_slope_id") private Long highSlopeId; private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigure.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigure.java index 27d74665b..ecb8c8237 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigure.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigure.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; * @version: V1.0 */ @Data -@TableName("deep_excavation_plane_figure") +@TableName("high_slope_plane_figure") @ApiModel(value = "HighSlopePlaneFigure实体类", description = "HighSlopePlaneFigure") public class HighSlopePlaneFigure implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigureCoordinate.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigureCoordinate.java index f089c3c58..7902bab12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigureCoordinate.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopePlaneFigureCoordinate.java @@ -20,7 +20,7 @@ import io.swagger.annotations.ApiModelProperty; * @version: V1.0 */ @Data -@TableName("deep_excavation_plane_figure_coordinate") +@TableName("high_slope_plane_figure_coordinate") @ApiModel(value = "HighSlopePlaneFigureCoordinate实体类", description = "HighSlopePlaneFigureCoordinate") public class HighSlopePlaneFigureCoordinate implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensor.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensor.java index 9f66ebff5..8d4d445a0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensor.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensor.java @@ -25,7 +25,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -@TableName(value = "deep_excavation_sensor") +@TableName(value = "high_slope_sensor") @Accessors(chain = true) @ApiModel(value = "HighSlopeSensor实体类", description = "HighSlopeSensor") public class HighSlopeSensor implements Serializable { @@ -143,9 +143,9 @@ public class HighSlopeSensor implements Serializable { private Date createDate; /** - * 基坑名称 + * 高边坡名称 */ - @ApiModelProperty(value = "基坑名称") + @ApiModelProperty(value = "高边坡名称") @TableField(exist = false) private String engineeringName; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensorType.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensorType.java index c1c701829..b9ffa431b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensorType.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/HighSlopeSensorType.java @@ -19,7 +19,7 @@ import java.io.Serializable; * @version: V1.0 */ @Data -@TableName("deep_excavation_sensor_type") +@TableName("high_slope_sensor_type") @ApiModel(value = "HighSlopeSensorType实体类", description = "HighSlopeSensorType") public class HighSlopeSensorType implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/CurrentDataListQO.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/CurrentDataListQO.java index 1d8ba9916..d4f4ef986 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/CurrentDataListQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/CurrentDataListQO.java @@ -21,7 +21,7 @@ public class CurrentDataListQO extends PageQO { @ApiModelProperty(value = "传感器sn", required = false) private String sensorSn; - @ApiModelProperty(value = "基坑与监测关联id", required = true) + @ApiModelProperty(value = "高边坡与监测关联id", required = true) private Long relaId; @ApiModelProperty(value = "开始时间 2022-08-19 14:42:17格式", required = false) diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/SelectMeasurePointListQO.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/SelectMeasurePointListQO.java index 53bfa96ae..976dbe64c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/SelectMeasurePointListQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/qo/SelectMeasurePointListQO.java @@ -14,7 +14,7 @@ import lombok.Data; @Data @ApiModel(value = "查询测点列表请求对象", description = "查询测点列表请求对象") public class SelectMeasurePointListQO extends PageQO { - @ApiModelProperty(value = "基坑与监测内容关系ID", required = true) + @ApiModelProperty(value = "高边坡与监测内容关系ID", required = true) private Long relaId; @ApiModelProperty(value = "测点编号") private String measurePointNumber; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/CurrentDataListVO.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/CurrentDataListVO.java index 8084a5328..21ba61784 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/CurrentDataListVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/CurrentDataListVO.java @@ -13,7 +13,7 @@ import lombok.Data; * @Version 1.0 */ @Data -@ApiModel("基坑历史数据对象") +@ApiModel("高边坡历史数据对象") public class CurrentDataListVO { @ApiModelProperty("单位") private String unit; diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/DataAlarmVO.java b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/DataAlarmVO.java index 92b9e5e7a..c0dd1baac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/DataAlarmVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/entity/vo/DataAlarmVO.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; * @Version 1.0 */ @Data -@ApiModel("基坑报警数量对象") +@ApiModel("高边坡报警数量对象") @NoArgsConstructor @AllArgsConstructor public class DataAlarmVO { diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml index 57b41a403..c9eb78b85 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeCurrentDataMapper.xml @@ -19,12 +19,12 @@ des.alarm_value, des.fiducial_value, des.rate_alarm_value - FROM deep_excavation_current_data decd - inner join deep_excavation_sensor des on decd.sensor_sn = des.sensor_sn - inner join deep_excavation_measure_point demp + FROM high_slope_current_data decd + inner join high_slope_sensor des on decd.sensor_sn = des.sensor_sn + inner join high_slope_measure_point demp on des.measure_point_number = demp.measure_point_number - inner join deep_excavation_engineering dee on demp.deep_excavation_id = dee.id - inner join deep_excavation_sensor_type dest on dest.id = des.sensor_type_id + inner join high_slope_engineering dee on demp.high_slope_id = dee.id + inner join high_slope_sensor_type dest on dest.id = des.sensor_type_id where dee.project_sn = #{projectSn} and dest.id = #{sensorTypeId} @@ -54,11 +54,11 @@ - - + + - - + + @@ -67,8 +67,8 @@ SELECT decd.* - from deep_excavation_current_data decd - inner join deep_excavation_sensor des on des.sensor_sn = decd.sensor_sn - inner join deep_excavation_measure_point demp + from high_slope_current_data decd + inner join high_slope_sensor des on des.sensor_sn = decd.sensor_sn + inner join high_slope_measure_point demp on des.measure_point_number = demp.measure_point_number where demp.measure_point_number = #{measurePointNumber} order by decd.receive_time @@ -120,12 +120,12 @@ des.alarm_value, des.fiducial_value, des.rate_alarm_value - from deep_excavation_current_data decd - left join deep_excavation_sensor des on decd.sensor_sn = des.sensor_sn - left join deep_excavation_measure_point demp + from high_slope_current_data decd + left join high_slope_sensor des on decd.sensor_sn = des.sensor_sn + left join high_slope_measure_point demp on des.measure_point_number = demp.measure_point_number - inner join deep_excavation_engineering dee on demp.deep_excavation_id = dee.id - left join deep_excavation_sensor_type dest on dest.id = des.sensor_type_id + inner join high_slope_engineering dee on demp.high_slope_id = dee.id + left join high_slope_sensor_type dest on dest.id = des.sensor_type_id and dee.project_sn = #{projectSn} @@ -154,10 +154,10 @@ - update deep_excavation_current_data + update high_slope_current_data set data = data_total + ${fiducialValue}, alarm_state = IF( data_rate > ${rateAlarmValue}, 4, if(data_total > ${alarmValue}, 2, 1)) @@ -183,10 +183,10 @@ count(*) num, DATE_FORMAT(decd.receive_time, '%Y-%m-%d') time FROM - deep_excavation_plane_figure_coordinate a - INNER JOIN deep_excavation_measure_point b ON a.point_id = b.id - INNER JOIN deep_excavation_sensor des ON b.measure_point_number = des.measure_point_number - INNER JOIN deep_excavation_current_data decd ON decd.sensor_sn = des.sensor_sn + high_slope_plane_figure_coordinate a + INNER JOIN high_slope_measure_point b ON a.point_id = b.id + INNER JOIN high_slope_sensor des ON b.measure_point_number = des.measure_point_number + INNER JOIN high_slope_current_data decd ON decd.sensor_sn = des.sensor_sn WHERE a.plane_figure_id = #{planeFigureId} and decd.project_sn = #{projectSn} and decd.receive_time >= DATE_SUB(NOW(),INTERVAL 30 day) @@ -199,13 +199,13 @@ SELECT demt.monitor_type_name as name,count(*) num FROM - deep_excavation_plane_figure_coordinate a - INNER JOIN deep_excavation_measure_point b ON a.point_id = b.id - INNER JOIN deep_excavation_sensor des ON b.measure_point_number = des.measure_point_number - INNER JOIN deep_excavation_current_data decd ON decd.sensor_sn = des.sensor_sn - INNER JOIN deep_excavation_monitor_type_rela demtr ON demtr.deep_excavation_id = b.deep_excavation_id AND + high_slope_plane_figure_coordinate a + INNER JOIN high_slope_measure_point b ON a.point_id = b.id + INNER JOIN high_slope_sensor des ON b.measure_point_number = des.measure_point_number + INNER JOIN high_slope_current_data decd ON decd.sensor_sn = des.sensor_sn + INNER JOIN high_slope_monitor_type_rela demtr ON demtr.high_slope_id = b.high_slope_id AND demtr.id=b.rela_id - INNER JOIN deep_excavation_monitor_type demt ON demt.id = demtr.monitor_type_id + INNER JOIN high_slope_monitor_type demt ON demt.id = demtr.monitor_type_id WHERE a.plane_figure_id = #{planeFigureId} and decd.project_sn = #{projectSn} and decd.receive_time >= DATE_SUB(NOW(),INTERVAL 30 day) @@ -216,7 +216,7 @@ - + - + - + @@ -116,18 +116,18 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml index 01752dfb0..92966e26e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeRelaMapper.xml @@ -3,15 +3,15 @@ - + - + - id, update_date, create_date, monitor_type_id, deep_excavation_id + id, update_date, create_date, monitor_type_id, high_slope_id diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml index c6fc74858..9b8a3a903 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopePlaneFigureCoordinateMapper.xml @@ -8,10 +8,10 @@ b.measure_point_number, b.alarm_state, demt.monitor_type_name - from deep_excavation_plane_figure_coordinate a - INNER JOIN deep_excavation_measure_point b ON a.point_id = b.id - inner join deep_excavation_monitor_type_rela demtr on demtr.id = b.rela_id - inner join deep_excavation_monitor_type demt on demtr.monitor_type_id = demt.id + from high_slope_plane_figure_coordinate a + INNER JOIN high_slope_measure_point b ON a.point_id = b.id + inner join high_slope_monitor_type_rela demtr on demtr.id = b.rela_id + inner join high_slope_monitor_type demt on demtr.monitor_type_id = demt.id WHERE a.plane_figure_id = #{planeFigureId} diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml index 308b4b1e6..243dba372 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeSensorMapper.xml @@ -3,10 +3,10 @@ select des.*, dee.project_sn - from deep_excavation_sensor des - left join deep_excavation_measure_point demp + from high_slope_sensor des + left join high_slope_measure_point demp on des.measure_point_number = demp.measure_point_number - left join deep_excavation_engineering dee on demp.deep_excavation_id = dee.id + left join high_slope_engineering dee on demp.high_slope_id = dee.id where 1 = 1 and des.sensor_sn in @@ -58,8 +58,8 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/service/HighSlopeMonitorTypeRelaService.java b/src/main/java/com/zhgd/xmgl/modules/highslope/service/HighSlopeMonitorTypeRelaService.java index 5ac58f976..09fecf8c6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/service/HighSlopeMonitorTypeRelaService.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/service/HighSlopeMonitorTypeRelaService.java @@ -11,7 +11,7 @@ import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorTypeRela; */ public interface HighSlopeMonitorTypeRelaService extends IService { /** - * 根据基坑id删除监测内容 + * 根据高边坡id删除监测内容 * * @param id */ diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java index faa8b3d74..862fc3270 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeCurrentDataServiceImpl.java @@ -124,7 +124,7 @@ public class HighSlopeCurrentDataServiceImpl extends ServiceImpl