lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理bug

master
lisai 2022-07-22 17:04:43 +08:00
parent 291a17b898
commit 6a67849aaf
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/whdc/zhdbaqapi/model/dto/IntegerIdDto.java
View File

@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@ -16,7 +16,7 @@ public class IntegerIdDto implements Serializable {
private static final long serialVersionUID = 1L;
@ApiParam(value = "主键ID", example = "")
@ApiModelProperty(value = "主键ID", dataType = "java.lang.String")
@NotBlank(message = "主键ID")
@ApiModelProperty(value = "主键ID", dataType = "java.lang.Integer")
@NotNull(message = "主键ID")
private Integer id;
}

10
src/main/resources/mapper/DeviceInfoMapper.xml
View File

@ -22,7 +22,15 @@
</select>
<select id="page" resultType="com.whdc.zhdbaqapi.model.entity.DeviceInfo">
SELECT * FROM DEVICE_INFO
SELECT ID, PROJECT_NAME, CHANNEL_NUM, REMARK, SUPERVISOR, CREATION_TIME, MODIFICATION_TIME, DEL, CREATE_DATE,
BURIED_PERSONNEL, CHECK_PERSONNEL, TECHNICAL_DIRECTOR, TAILWATER_LEVEL, HEADWATER_LEVEL, WEATHER, AIR_PRESSURE,
AIR_TEMPERATURE, EMBEDDING_DATE, EMBEDDING_FINISH_READING, ZERO_PRESSURE_READINGS, END_READINGS, START_READINGS,
DRAFT, READINGS, DAM_WHEELBASE, COLUMN_NO, EMBEDDING_ELEVATION, CABLE_LENGTH_MARK, CABLE_LENGTH, RESISTANCE,
RANGE, SENSOR_COEFFICIENT, MANUFACTURER, MEASURING_PROBE_NO, STEADY_WATER_LEVEL, INITIAL_WATER_LEVEL,
DRILLING_SIZE, DRILLING_NO, TEMPERATURE_K, START_TEMPERATURE, PRESSURE, RECENT_DATA, CALIBRATION_COEFFICIENT,
INITIAL_READING, LATEST_REPORTING_TIME, CROSS_SECTION, DAM, MOUNTING_HEIGHT, INSTALLATION_POSITION_Z,
INSTALLATION_POSITION_Y, INSTALLATION_POSITION_X, STATION_CODE, DEVICE_ID
FROM DEVICE_INFO
WHERE DEL = 0
<if test="obj.deviceId != null and obj.deviceId != '' ">
AND DEVICE_ID LIKE CONCAT('%', #{obj.deviceId}, '%')