yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加渗压，渗流设备管理方法

master
Coolkid 2024-01-26 16:22:02 +08:00
parent acb03e7b3a
commit 87351b688b
13 changed files with 546 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java
View File

@ -11,6 +11,8 @@ import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo;
import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo;
import com.gunshi.project.xyt.entity.basedata.StCameraSearch;
import com.gunshi.project.xyt.entity.basedata.StCameraVo;
import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo;
import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo;
import com.gunshi.project.xyt.entity.basedata.StStbprpVo;
import com.gunshi.project.xyt.entity.basedata.StcdSearch;
import com.gunshi.project.xyt.entity.basedata.SysDictVo;
@ -18,16 +20,19 @@ import com.gunshi.project.xyt.model.StAddvcdD;
import com.gunshi.project.xyt.model.StCameraAreaB;
import com.gunshi.project.xyt.model.StCameraB;
import com.gunshi.project.xyt.model.StMoncrB;
import com.gunshi.project.xyt.model.StSpgPztb;
import com.gunshi.project.xyt.model.StSpgSpprmp;
import com.gunshi.project.xyt.model.StStbprpB;
import com.gunshi.project.xyt.model.SysDictB;
import com.gunshi.project.xyt.service.StAdcdService;
import com.gunshi.project.xyt.service.StCameraAreaService;
import com.gunshi.project.xyt.service.StCameraService;
import com.gunshi.project.xyt.service.StMoncrService;
import com.gunshi.project.xyt.service.StSpgPztbService;
import com.gunshi.project.xyt.service.StSpgSpprmpService;
import com.gunshi.project.xyt.service.StStbprpService;
import com.gunshi.project.xyt.service.SysDictService;
import com.gunshi.project.xyt.validate.markers.Update;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -60,6 +65,10 @@ public class BasicDataController {
private final StCameraService stCameraService;
private final StStbprpService stStbprpService;
private final StMoncrService stMoncrService;
//渗压设备
private final StSpgPztbService stSpgPztbService;
//渗流设备
private final StSpgSpprmpService stSpgSpprmpService;
@Post(path = "/dict/search/query", summary = "查询字典接口")
@ -233,4 +242,59 @@ public class BasicDataController {
return R.ok(stMoncrService.queryBySearch(search));
}
//渗压设备
@Post(path = "/pztb/search/query", summary = "查询渗压设备列表接口")
public R<Page<StSpgPztbVo>> queryStSpgPztbList(@Validated @RequestBody GeneralSearch search) {
return R.ok(stSpgPztbService.queryBySearch(search));
}
@Post(path = "/pztb/search/check", summary = "检查渗压设备编码是否存在接口")
public R<String> checkStSpgPztbList(@Validated @RequestBody CheckStringSearch search) {
try {
stSpgPztbService.checkCode(search);
} catch (IllegalArgumentException e) {
return R.error(417, e.getMessage());
}
return R.ok();
}
@Post(path = "/pztb/manage/insert", summary = "新增渗压设备接口")
public R<Boolean> insertStSpgPztb(@Validated @RequestBody StSpgPztb obj) {
stSpgPztbService.insert(obj);
return R.ok(true);
}
@Post(path = "/pztb/manage/update", summary = "更新渗压设备接口")
public R<Boolean> updateStSpgPztb(@Validated(Update.class) @RequestBody StSpgPztb obj) {
stSpgPztbService.update(obj);
return R.ok(true);
}
//渗流
@Post(path = "/spprmp/search/query", summary = "查询渗流设备列表接口")
public R<Page<StSpgSpprmpVo>> queryStSpgSpprmpList(@Validated @RequestBody GeneralSearch search) {
return R.ok(stSpgSpprmpService.queryBySearch(search));
}
@Post(path = "/spprmp/search/check", summary = "检查渗流设备编码是否存在接口")
public R<String> checkStSpgSpprmp(@Validated @RequestBody CheckStringSearch search) {
try {
stSpgSpprmpService.checkCode(search);
} catch (IllegalArgumentException e) {
return R.error(417, e.getMessage());
}
return R.ok();
}
@Post(path = "/spprmp/manage/insert", summary = "新增渗流设备接口")
public R<Boolean> insertStSpgSpprmp(@Validated @RequestBody StSpgSpprmp obj) {
stSpgSpprmpService.insert(obj);
return R.ok(true);
}
@Post(path = "/spprmp/manage/update", summary = "更新渗流设备接口")
public R<Boolean> updateStSpgSpprmp(@Validated(Update.class) @RequestBody StSpgSpprmp obj) {
stSpgSpprmpService.update(obj);
return R.ok(true);
}
}

1
src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java
View File

@ -2,7 +2,6 @@ package com.gunshi.project.xyt.entity.basedata;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Builder;
import lombok.Data;
/**

5
src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java
View File

@ -2,16 +2,11 @@ package com.gunshi.project.xyt.entity.basedata;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.gunshi.db.dto.PageSo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.io.Serializable;
/**
* @author Sun Lejun
* @version 1.0

25
src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java Normal file
View File

@ -0,0 +1,25 @@
package com.gunshi.project.xyt.entity.basedata;
import com.gunshi.project.xyt.model.StSpgPztb;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
/**
* @author Sun Lejun
* @version 1.0
* @date 2024/1/26
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
@Schema(description="渗压设备信息表")
public class StSpgPztbVo extends StSpgPztb {
@Schema(description="所在断面名称")
private String crNm;
@Schema(description="所在断面编码")
private String crCd;
}

26
src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java Normal file
View File

@ -0,0 +1,26 @@
package com.gunshi.project.xyt.entity.basedata;
import com.gunshi.project.xyt.model.StSpgSpprmp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
/**
* @author Sun Lejun
* @version 1.0
* @date 2024/1/26
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
@Schema(description="渗流设备信息表")
public class StSpgSpprmpVo extends StSpgSpprmp {
@Schema(description="所在断面名称")
private String crNm;
@Schema(description="所在断面编码")
private String crCd;
@Schema(description="公式名称")
private String formulaName;
}

13
src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java
View File

@ -1,6 +1,10 @@
package com.gunshi.project.xyt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gunshi.project.xyt.entity.basedata.CheckStringSearch;
import com.gunshi.project.xyt.entity.basedata.GeneralSearch;
import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo;
import com.gunshi.project.xyt.model.StSpgPztb;
import java.util.List;
@ -11,4 +15,13 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface StSpgPztbMapper extends BaseMapper<StSpgPztb> {
int batchInsert(@Param("list") List<StSpgPztb> list);
/**
* 校验编码是否存在
* @param obj 校验对象
* @return 是否存在
*/
boolean checkCode(@Param("obj") CheckStringSearch obj);
Page<StSpgPztbVo> queryBySearch(Page<StSpgPztbVo> page, @Param("obj") GeneralSearch search);
}

13
src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java
View File

@ -1,6 +1,10 @@
package com.gunshi.project.xyt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gunshi.project.xyt.entity.basedata.CheckStringSearch;
import com.gunshi.project.xyt.entity.basedata.GeneralSearch;
import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo;
import com.gunshi.project.xyt.model.StSpgSpprmp;
import java.util.List;
@ -11,4 +15,13 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface StSpgSpprmpMapper extends BaseMapper<StSpgSpprmp> {
int batchInsert(@Param("list") List<StSpgSpprmp> list);
/**
* 校验编码是否存在
* @param obj 校验对象
* @return 是否存在
*/
boolean checkCode(@Param("obj")CheckStringSearch obj);
Page<StSpgSpprmpVo> queryBySearch(Page<StSpgSpprmpVo> page, @Param("obj") GeneralSearch search);
}

2
src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java
View File

@ -270,7 +270,7 @@ public class StSpgSpprmp implements Serializable {
@TableField(value = "FORMULA")
@Schema(description="公式")
@NotNull(message = "公式不能为空")
private String formula;
private Long formula;
/**
* 创建时间

75
src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java
View File

@ -1,11 +1,21 @@
package com.gunshi.project.xyt.service;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gunshi.project.xyt.entity.basedata.CheckStringSearch;
import com.gunshi.project.xyt.entity.basedata.GeneralSearch;
import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo;
import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo;
import com.gunshi.project.xyt.mapper.StSpgPztbMapper;
import com.gunshi.project.xyt.model.StSpgPztb;
import com.gunshi.project.xyt.model.StSpgSpprmp;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
/**
* 渗压设备Service
* @author Sun Lejun
@ -20,5 +30,68 @@ import org.springframework.transaction.annotation.Transactional;
public class StSpgPztbService {
private final StSpgPztbMapper stSpgPztbMapper;
/**
* 按查询条件查询渗压设备信息表
* @param search 查询条件
* @return 渗压设备信息表列表
*/
public Page<StSpgPztbVo> queryBySearch(GeneralSearch search) {
Page<StSpgPztbVo> page = search.getPageSo().toPage();
return stSpgPztbMapper.queryBySearch(page, search);
}
/**
* 新增渗压设备信息
* @param stSpgPztb 渗压设备信息
*/
public void insert(StSpgPztb stSpgPztb) {
// 校验编码是否存在
String deviceId = stSpgPztb.getDeviceId();
CheckStringSearch checkStringSearch = new CheckStringSearch();
checkStringSearch.setKeyword(deviceId);
checkCode(checkStringSearch);
String stationCode = stSpgPztb.getStationCode();
checkStringSearch.setKeyword(stationCode);
checkCode(checkStringSearch);
// 保存
stSpgPztb.setId(IdWorker.getId());
stSpgPztb.setModificationTime(new Date());
stSpgPztb.setCreationTime(new Date());
stSpgPztbMapper.insert(stSpgPztb);
}
/**
* 修改渗压设备信息
* @param stSpgPztb 渗压设备信息
*/
public void update(StSpgPztb stSpgPztb) {
// 校验编码是否存在
Long id = stSpgPztb.getId();
String deviceId = stSpgPztb.getDeviceId();
CheckStringSearch checkStringSearch = new CheckStringSearch();
checkStringSearch.setKeyword(deviceId);
checkStringSearch.setId(id);
checkCode(checkStringSearch);
String stationCode = stSpgPztb.getStationCode();
checkStringSearch.setKeyword(stationCode);
checkCode(checkStringSearch);
// 更新
stSpgPztb.setModificationTime(new Date());
stSpgPztbMapper.updateById(stSpgPztb);
}
/**
* 检查编码是否存在
* @param checkStringSearch 检查对象
*/
public void checkCode(CheckStringSearch checkStringSearch) {
boolean b = stSpgPztbMapper.checkCode(checkStringSearch);
if (b) {
throw new IllegalArgumentException("编码已存在");
}
}
}

74
src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java
View File

@ -1,11 +1,20 @@
package com.gunshi.project.xyt.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gunshi.project.xyt.entity.basedata.CheckStringSearch;
import com.gunshi.project.xyt.entity.basedata.GeneralSearch;
import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo;
import com.gunshi.project.xyt.mapper.StSpgSpprmpMapper;
import com.gunshi.project.xyt.model.StSpgSpprmp;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
/**
* 渗流设备
* @author Sun Lejun
@ -19,4 +28,69 @@ import org.springframework.transaction.annotation.Transactional;
@Data
public class StSpgSpprmpService {
private final StSpgSpprmpMapper stSpgSpprmpMapper;
/**
* 按查询条件查询渗流设备信息表
* @param search 查询条件
* @return 渗流设备信息表列表
*/
public Page<StSpgSpprmpVo> queryBySearch(GeneralSearch search) {
Page<StSpgSpprmpVo> page = search.getPageSo().toPage();
return stSpgSpprmpMapper.queryBySearch(page, search);
}
/**
* 新增渗流设备信息
* @param stSpgSpprmp 渗流设备信息
*/
public void insert(StSpgSpprmp stSpgSpprmp) {
// 校验编码是否存在
String deviceId = stSpgSpprmp.getDeviceId();
CheckStringSearch checkStringSearch = new CheckStringSearch();
checkStringSearch.setKeyword(deviceId);
checkCode(checkStringSearch);
String stationCode = stSpgSpprmp.getStationCode();
checkStringSearch.setKeyword(stationCode);
checkCode(checkStringSearch);
// 保存
stSpgSpprmp.setId(IdWorker.getId());
stSpgSpprmp.setModificationTime(new Date());
stSpgSpprmp.setCreateTime(new Date());
stSpgSpprmpMapper.insert(stSpgSpprmp);
}
/**
* 修改渗流设备信息
* @param stSpgSpprmp 渗流设备信息
*/
public void update(StSpgSpprmp stSpgSpprmp) {
// 校验编码是否存在
Long id = stSpgSpprmp.getId();
String deviceId = stSpgSpprmp.getDeviceId();
CheckStringSearch checkStringSearch = new CheckStringSearch();
checkStringSearch.setKeyword(deviceId);
checkStringSearch.setId(id);
checkCode(checkStringSearch);
String stationCode = stSpgSpprmp.getStationCode();
checkStringSearch.setKeyword(stationCode);
checkCode(checkStringSearch);
// 更新
stSpgSpprmp.setModificationTime(new Date());
stSpgSpprmpMapper.updateById(stSpgSpprmp);
}
/**
* 检查编码是否存在
* @param checkStringSearch 检查对象
*/
public void checkCode(CheckStringSearch checkStringSearch) {
boolean b = stSpgSpprmpMapper.checkCode(checkStringSearch);
if (b) {
throw new IllegalArgumentException("编码已存在");
}
}
}

33
src/main/resources/mapper/StSpgPztbMapper.xml
View File

@ -113,4 +113,37 @@
#{item.crId,jdbcType=BIGINT})
</foreach>
</insert>
<select id="checkCode" resultType="boolean">
select case when
exists(select 1
from dbo.ST_SPG_PZTB where (DEVICE_ID = #{obj.keyword} or STATION_CODE = #{obj.keyword})
and STATUS = 1
<if test='obj.id != null'>
and ID != #{obj.id}
</if>
) then 1
else 0 end
</select>
<select id="queryBySearch" resultType="com.gunshi.project.xyt.entity.basedata.StSpgPztbVo">
select
ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, INSTALLATION_POSITION_X, INSTALLATION_POSITION_Y,
INSTALLATION_POSITION_Z, DAM, CROSS_SECTION, LATEST_REPORTING_TIME, INITIAL_READING,
CALIBRATION_COEFFICIENT, START_TEMPERATURE, TEMPERATURE_K, DAM_HEIGHT, DIST_FROM_OSMOSIS_METER_TO_BOTTOM,
DRILLING_NO, DRILLING_SIZE, INITIAL_WATER_LEVEL, STEADY_WATER_LEVEL, MEASURING_PROBE_NO,
MANUFACTURER, SENSOR_COEFFICIENT, [RANGE], RESISTANCE, CABLE_LENGTH, CABLE_LENGTH_MARK,
EMBEDDING_ELEVATION, COLUMN_NO, DAM_WHEELBASE, READINGS, DRAFT, START_READINGS, END_READINGS,
ZERO_PRESSURE_READINGS, EMBEDDING_FINISH_READING, EMBEDDING_DATE, AIR_TEMPERATURE,
AIR_PRESSURE, WEATHER, HEADWATER_LEVEL, TAILWATER_LEVEL, TECHNICAL_DIRECTOR, CHECK_PERSONNEL,
BURIED_PERSONNEL, SKETCH_MAP, t1.STATUS, MODIFICATION_TIME, CREATION_TIME, SUPERVISOR,
REMARK, PROJECT_NAME, PIPE_TOP_HEIGHT, PIPE_BOTTOM_HEIGHT, t1.CR_ID, CR_NM, CR_CD
from dbo.ST_SPG_PZTB t1 left join dbo.ST_MONCR_B t2 on t1.CR_ID = t2.CR_ID
<where>
<if test="obj.keyword != null and obj.keyword != ''">
and (DEVICE_ID like concat('%', #{obj.keyword}, '%') or STATION_CODE like concat('%', #{obj.keyword}, '%'))
</if>
and t1.STATUS = 1
</where>
</select>
</mapper>

155
src/main/resources/mapper/StSpgSpprmpMapper.xml
View File

@ -56,15 +56,55 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, PROBE_SERIAL, READING0, TEMPERATURE0, TEMPERATURE1,
DEVICE_MEASURE, DEVICE_MEASURE_AFTER, PROJECT_LOCATION, PROJECT_NAME, MANUFACTURER,
STATION_TYPE, STANK_TYPE, STANK_MATERIAL, STANK_TOP_TO_BOTTOM_DISTANCE, STANK_SIZE,
RULER_TYPE, RULER_POSITION, ZERO_POINT_HEIGHT, TEMPERATURE_MOD, MEASURE, SKETCH_MAP,
DIRECTOR, VERIFIER, [OPERATOR], SUPERVISOR, INSTALL_DATE, REMARK, MODIFICATION_TIME,
LATEST_REPORTING_TIME, FORMULA, CREATE_TIME, [STATUS], MAX_H, INSTALLATION_POSITION_X,
INSTALLATION_POSITION_Y, INSTALLATION_POSITION_Z, HEADWATER_LEVEL, TAILWATER_LEVEL,
AIR_TEMPERATURE, AIR_PRESSURE, WEATHER, LINEAR_COEFFICIENTG, POLYNOMIAL_COEFFICIENTA,
POLYNOMIAL_COEFFICIENTB, POLYNOMIAL_COEFFICIENTC, CR_ID
ID,
DEVICE_ID,
STATION_CODE,
CHANNEL_NUM,
PROBE_SERIAL,
READING0,
TEMPERATURE0,
TEMPERATURE1,
DEVICE_MEASURE,
DEVICE_MEASURE_AFTER,
PROJECT_LOCATION,
PROJECT_NAME,
MANUFACTURER,
STATION_TYPE,
STANK_TYPE,
STANK_MATERIAL,
STANK_TOP_TO_BOTTOM_DISTANCE,
STANK_SIZE,
RULER_TYPE,
RULER_POSITION,
ZERO_POINT_HEIGHT,
TEMPERATURE_MOD,
MEASURE,
SKETCH_MAP,
DIRECTOR,
VERIFIER,
[OPERATOR],
SUPERVISOR,
INSTALL_DATE,
REMARK,
MODIFICATION_TIME,
LATEST_REPORTING_TIME,
FORMULA,
CREATE_TIME,
[STATUS],
MAX_H,
INSTALLATION_POSITION_X,
INSTALLATION_POSITION_Y,
INSTALLATION_POSITION_Z,
HEADWATER_LEVEL,
TAILWATER_LEVEL,
AIR_TEMPERATURE,
AIR_PRESSURE,
WEATHER,
LINEAR_COEFFICIENTG,
POLYNOMIAL_COEFFICIENTA,
POLYNOMIAL_COEFFICIENTB,
POLYNOMIAL_COEFFICIENTC,
CR_ID
</sql>
<insert id="batchInsert" parameterType="map">
<!--@mbg.generated-->
@ -81,24 +121,107 @@
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=BIGINT}, #{item.deviceId,jdbcType=VARCHAR}, #{item.stationCode,jdbcType=VARCHAR},
#{item.channelNum,jdbcType=INTEGER}, #{item.probeSerial,jdbcType=VARCHAR}, #{item.reading0,jdbcType=DECIMAL},
#{item.temperature0,jdbcType=DECIMAL}, #{item.temperature1,jdbcType=DECIMAL}, #{item.deviceMeasure,jdbcType=DECIMAL},
#{item.channelNum,jdbcType=INTEGER}, #{item.probeSerial,jdbcType=VARCHAR},
#{item.reading0,jdbcType=DECIMAL},
#{item.temperature0,jdbcType=DECIMAL}, #{item.temperature1,jdbcType=DECIMAL},
#{item.deviceMeasure,jdbcType=DECIMAL},
#{item.deviceMeasureAfter,jdbcType=DECIMAL}, #{item.projectLocation,jdbcType=VARCHAR},
#{item.projectName,jdbcType=VARCHAR}, #{item.manufacturer,jdbcType=VARCHAR}, #{item.stationType,jdbcType=VARCHAR},
#{item.stankType,jdbcType=VARCHAR}, #{item.stankMaterial,jdbcType=VARCHAR}, #{item.stankTopToBottomDistance,jdbcType=DECIMAL},
#{item.stankSize,jdbcType=VARCHAR}, #{item.rulerType,jdbcType=VARCHAR}, #{item.rulerPosition,jdbcType=VARCHAR},
#{item.projectName,jdbcType=VARCHAR}, #{item.manufacturer,jdbcType=VARCHAR},
#{item.stationType,jdbcType=VARCHAR},
#{item.stankType,jdbcType=VARCHAR}, #{item.stankMaterial,jdbcType=VARCHAR},
#{item.stankTopToBottomDistance,jdbcType=DECIMAL},
#{item.stankSize,jdbcType=VARCHAR}, #{item.rulerType,jdbcType=VARCHAR},
#{item.rulerPosition,jdbcType=VARCHAR},
#{item.zeroPointHeight,jdbcType=DECIMAL}, #{item.temperatureMod,jdbcType=DECIMAL},
#{item.measure,jdbcType=DECIMAL}, #{item.sketchMap,jdbcType=BIGINT}, #{item.director,jdbcType=VARCHAR},
#{item.verifier,jdbcType=VARCHAR}, #{item.operator,jdbcType=VARCHAR}, #{item.supervisor,jdbcType=VARCHAR},
#{item.installDate,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, #{item.modificationTime,jdbcType=TIMESTAMP},
#{item.installDate,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR},
#{item.modificationTime,jdbcType=TIMESTAMP},
#{item.latestReportingTime,jdbcType=TIMESTAMP}, #{item.formula,jdbcType=VARCHAR},
#{item.createTime,jdbcType=TIMESTAMP}, #{item.status,jdbcType=INTEGER}, #{item.maxH,jdbcType=DECIMAL},
#{item.installationPositionX,jdbcType=DECIMAL}, #{item.installationPositionY,jdbcType=DECIMAL},
#{item.installationPositionZ,jdbcType=DECIMAL}, #{item.headwaterLevel,jdbcType=DECIMAL},
#{item.tailwaterLevel,jdbcType=DECIMAL}, #{item.airTemperature,jdbcType=DECIMAL},
#{item.airPressure,jdbcType=DECIMAL}, #{item.weather,jdbcType=VARCHAR}, #{item.linearCoefficientg,jdbcType=DECIMAL},
#{item.airPressure,jdbcType=DECIMAL}, #{item.weather,jdbcType=VARCHAR},
#{item.linearCoefficientg,jdbcType=DECIMAL},
#{item.polynomialCoefficienta,jdbcType=DECIMAL}, #{item.polynomialCoefficientb,jdbcType=DECIMAL},
#{item.polynomialCoefficientc,jdbcType=DECIMAL}, #{item.crId,jdbcType=BIGINT})
</foreach>
</insert>
<select id="checkCode" resultType="boolean">
select case when
exists(select 1
from dbo.ST_SPG_SPPRMP where (DEVICE_ID = #{obj.keyword} or STATION_CODE = #{obj.keyword})
and STATUS = 1
<if test='obj.id != null'>
and ID != #{obj.id}
</if>
) then 1
else 0 end
</select>
<select id="queryBySearch" resultType="com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo">
select
ID,
DEVICE_ID,
STATION_CODE,
CHANNEL_NUM,
PROBE_SERIAL,
READING0,
TEMPERATURE0,
TEMPERATURE1,
DEVICE_MEASURE,
DEVICE_MEASURE_AFTER,
PROJECT_LOCATION,
PROJECT_NAME,
MANUFACTURER,
STATION_TYPE,
STANK_TYPE,
STANK_MATERIAL,
STANK_TOP_TO_BOTTOM_DISTANCE,
STANK_SIZE,
RULER_TYPE,
RULER_POSITION,
ZERO_POINT_HEIGHT,
TEMPERATURE_MOD,
MEASURE,
SKETCH_MAP,
DIRECTOR,
VERIFIER,
[OPERATOR],
SUPERVISOR,
INSTALL_DATE,
REMARK,
MODIFICATION_TIME,
LATEST_REPORTING_TIME,
FORMULA,
CREATE_TIME,
t1.STATUS,
MAX_H,
INSTALLATION_POSITION_X,
INSTALLATION_POSITION_Y,
INSTALLATION_POSITION_Z,
HEADWATER_LEVEL,
TAILWATER_LEVEL,
AIR_TEMPERATURE,
AIR_PRESSURE,
WEATHER,
LINEAR_COEFFICIENTG,
POLYNOMIAL_COEFFICIENTA,
POLYNOMIAL_COEFFICIENTB,
POLYNOMIAL_COEFFICIENTC,
t1.CR_ID,
CR_NM,
CR_CD,
t3.DICT_NM FORMULA_NAME
from dbo.ST_SPG_SPPRMP t1 left join ST_MONCR_B t2 on t1.CR_ID = t2.CR_ID
left join dbo.SYS_DICT_B t3 on t1.FORMULA = t3.ID
<where>
<if test="obj.keyword != null and obj.keyword != ''">
and (DEVICE_ID like concat('%', #{obj.keyword}, '%') or STATION_CODE like concat('%', #{obj.keyword}, '%'))
</if>
and t1.STATUS = 1
</where>
</select>
</mapper>

2
src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java
View File

@ -9,8 +9,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ContextConfiguration;
import ru.olegcherednik.jackson_utils.JacksonUtils;
import static org.junit.jupiter.api.Assertions.*;
@SpringBootTest
@ContextConfiguration(classes = Main.class)
@Slf4j