From 87351b688bddc2cbc8b89a0a861a5bbfd73f092f Mon Sep 17 00:00:00 2001 From: Coolkid Date: Fri, 26 Jan 2024 16:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=97=E5=8E=8B=EF=BC=8C?= =?UTF-8?q?=E6=B8=97=E6=B5=81=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/BasicDataController.java | 66 +++- .../entity/basedata/CheckStringSearch.java | 1 - .../xyt/entity/basedata/StCameraSearch.java | 5 - .../xyt/entity/basedata/StSpgPztbVo.java | 25 ++ .../xyt/entity/basedata/StSpgSpprmpVo.java | 26 ++ .../project/xyt/mapper/StSpgPztbMapper.java | 13 + .../project/xyt/mapper/StSpgSpprmpMapper.java | 13 + .../gunshi/project/xyt/model/StSpgSpprmp.java | 2 +- .../project/xyt/service/StSpgPztbService.java | 73 ++++ .../xyt/service/StSpgSpprmpService.java | 74 ++++ src/main/resources/mapper/StSpgPztbMapper.xml | 33 ++ .../resources/mapper/StSpgSpprmpMapper.xml | 323 ++++++++++++------ .../xyt/service/StAdcdServiceTest.java | 2 - 13 files changed, 546 insertions(+), 110 deletions(-) create mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java create mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java diff --git a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java b/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java index 301b5ca..cef4327 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java @@ -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> queryStSpgPztbList(@Validated @RequestBody GeneralSearch search) { + return R.ok(stSpgPztbService.queryBySearch(search)); + } + + @Post(path = "/pztb/search/check", summary = "检查渗压设备编码是否存在接口") + public R 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 insertStSpgPztb(@Validated @RequestBody StSpgPztb obj) { + stSpgPztbService.insert(obj); + return R.ok(true); + } + + @Post(path = "/pztb/manage/update", summary = "更新渗压设备接口") + public R updateStSpgPztb(@Validated(Update.class) @RequestBody StSpgPztb obj) { + stSpgPztbService.update(obj); + return R.ok(true); + } + + //渗流 + @Post(path = "/spprmp/search/query", summary = "查询渗流设备列表接口") + public R> queryStSpgSpprmpList(@Validated @RequestBody GeneralSearch search) { + return R.ok(stSpgSpprmpService.queryBySearch(search)); + } + + @Post(path = "/spprmp/search/check", summary = "检查渗流设备编码是否存在接口") + public R 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 insertStSpgSpprmp(@Validated @RequestBody StSpgSpprmp obj) { + stSpgSpprmpService.insert(obj); + return R.ok(true); + } + + @Post(path = "/spprmp/manage/update", summary = "更新渗流设备接口") + public R updateStSpgSpprmp(@Validated(Update.class) @RequestBody StSpgSpprmp obj) { + stSpgSpprmpService.update(obj); + return R.ok(true); + } } diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java index 01c1d5f..7e5beaf 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java +++ b/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java @@ -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; /** diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java index 650de4f..c3b779b 100644 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java +++ b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java @@ -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 diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java new file mode 100644 index 0000000..b8dcc06 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java @@ -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; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java new file mode 100644 index 0000000..12be1fb --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java @@ -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; +} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java index 8fdc12f..c11b384 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java @@ -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 { int batchInsert(@Param("list") List list); + + /** + * 校验编码是否存在 + * @param obj 校验对象 + * @return 是否存在 + */ + boolean checkCode(@Param("obj") CheckStringSearch obj); + + Page queryBySearch(Page page, @Param("obj") GeneralSearch search); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java index 99844e2..73cfab9 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java @@ -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 { int batchInsert(@Param("list") List list); + + /** + * 校验编码是否存在 + * @param obj 校验对象 + * @return 是否存在 + */ + boolean checkCode(@Param("obj")CheckStringSearch obj); + + Page queryBySearch(Page page, @Param("obj") GeneralSearch search); } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java b/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java index 5d655dd..7956818 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java +++ b/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java @@ -270,7 +270,7 @@ public class StSpgSpprmp implements Serializable { @TableField(value = "FORMULA") @Schema(description="公式") @NotNull(message = "公式不能为空") - private String formula; + private Long formula; /** * 创建时间 diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java index 66da443..6346354 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java @@ -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 queryBySearch(GeneralSearch search) { + Page 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("编码已存在"); + } + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java index 18fd220..a1424a2 100644 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java +++ b/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java @@ -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 queryBySearch(GeneralSearch search) { + Page 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("编码已存在"); + } + } } diff --git a/src/main/resources/mapper/StSpgPztbMapper.xml b/src/main/resources/mapper/StSpgPztbMapper.xml index c6d9970..2e5df75 100644 --- a/src/main/resources/mapper/StSpgPztbMapper.xml +++ b/src/main/resources/mapper/StSpgPztbMapper.xml @@ -113,4 +113,37 @@ #{item.crId,jdbcType=BIGINT}) + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/StSpgSpprmpMapper.xml b/src/main/resources/mapper/StSpgSpprmpMapper.xml index 99a8895..bf7ddce 100644 --- a/src/main/resources/mapper/StSpgSpprmpMapper.xml +++ b/src/main/resources/mapper/StSpgSpprmpMapper.xml @@ -1,104 +1,227 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - insert into dbo.ST_SPG_SPPRMP - (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) - values - - (#{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.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.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.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.polynomialCoefficienta,jdbcType=DECIMAL}, #{item.polynomialCoefficientb,jdbcType=DECIMAL}, - #{item.polynomialCoefficientc,jdbcType=DECIMAL}, #{item.crId,jdbcType=BIGINT}) - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + insert into dbo.ST_SPG_SPPRMP + (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) + values + + (#{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.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.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.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.polynomialCoefficienta,jdbcType=DECIMAL}, #{item.polynomialCoefficientb,jdbcType=DECIMAL}, + #{item.polynomialCoefficientc,jdbcType=DECIMAL}, #{item.crId,jdbcType=BIGINT}) + + + + + + \ No newline at end of file diff --git a/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java b/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java index 3e681e2..2dc3a57 100644 --- a/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java +++ b/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java @@ -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