From 1c9847ceb0c886453864daacb1762ac48f3ed85f Mon Sep 17 00:00:00 2001 From: xjm Date: Thu, 15 Aug 2024 17:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=9D=9D=E6=96=B0=E5=A2=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BD,=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E8=AF=A2,=E6=BA=A2=E6=B4=AA=E9=81=93?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=94=AE,?= =?UTF-8?q?=E5=BA=93=E5=AE=B9=E6=9B=B2=E7=BA=BF=E6=B0=B4=E4=BD=8D=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E5=85=B3=E7=B3=BB=E6=9B=B2=E7=BA=BF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=BB=E9=94=AE,=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4,?= =?UTF-8?q?=E6=B8=97=E5=8E=8B,=E6=B8=97=E6=B5=81,=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E6=96=AD=E9=9D=A2,=E9=97=B8=E9=98=80,=E9=87=8F=E6=B0=B4?= =?UTF-8?q?=E5=A0=B0=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xyt/controller/AttCctvBaseController.java | 6 ++- .../xyt/controller/AttDamBaseController.java | 38 +++++++++++++++++-- .../controller/AttDamProfileController.java | 6 ++- .../controller/AttGateValveController.java | 6 ++- .../xyt/controller/AttMeaWeirController.java | 6 ++- .../xyt/controller/AttResBaseController.java | 2 +- .../controller/AttSpillwayBaseController.java | 8 +++- .../OsmoticFlowDeviceController.java | 5 ++- .../OsmoticPressDeviceController.java | 6 ++- .../xyt/controller/StZqrlBController.java | 24 ++++++------ .../xyt/controller/StZvarlBController.java | 19 ++++------ .../gunshi/project/xyt/model/AttDamBase.java | 8 +++- .../project/xyt/model/AttSpillwayBase.java | 4 +- .../project/xyt/model/FileAssociations.java | 5 ++- .../com/gunshi/project/xyt/model/StZqrlB.java | 11 +++++- .../gunshi/project/xyt/model/StZvarlB.java | 13 ++++++- .../xyt/service/FileAssociationsService.java | 38 +++++++------------ .../xyt/service/OsmoticWarnRService.java | 2 +- 18 files changed, 132 insertions(+), 75 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttCctvBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttCctvBaseController.java index 2db5697..31b26c4 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttCctvBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttCctvBaseController.java @@ -1,8 +1,9 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.ObjectMapper; import com.gunshi.core.result.R; @@ -81,7 +82,8 @@ public class AttCctvBaseController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated AttCctvBasePage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getCode())) { query.like(AttCctvBase::getIndexCode, page.getCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java index 3406a41..6a09ad1 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttDamBaseController.java @@ -1,13 +1,16 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.GeneralDataPage; import com.gunshi.project.xyt.model.AttDamBase; import com.gunshi.project.xyt.service.AttDamBaseService; import com.gunshi.project.xyt.service.AttResBaseService; +import com.gunshi.project.xyt.service.FileAssociationsService; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.Operation; @@ -31,11 +34,13 @@ import java.util.Objects; @Tag(name = "大坝表") @RestController @RequestMapping(value="/attDamBase") -public class AttDamBaseController { +public class AttDamBaseController extends AbstractCommonFileController{ @Autowired private AttDamBaseService service; + @Autowired + private FileAssociationsService fileService; @Autowired private AttResBaseService resService; @@ -46,8 +51,12 @@ public class AttDamBaseController { if (StringUtils.isNotBlank(dto.getResCode()) && Objects.isNull(resService.getById(dto.getResCode()))){ throw new RuntimeException("当前水库不存在"); } + dto.setDamCode(IdWorker.get32UUID()); dto.setCreateTime(new Date()); boolean result = service.save(dto); + if (result){ + fileService.saveFile(dto.getFiles(), getGroupId(), dto.getResCode()); + } return R.ok(result ? dto : null); } @@ -61,6 +70,9 @@ public class AttDamBaseController { throw new IllegalArgumentException("当前数据不存在"); } boolean result = service.updateById(dto); + if (result){ + fileService.saveFile(dto.getFiles(), getGroupId(), dto.getResCode()); + } return R.ok(result ? dto : null); } @@ -70,7 +82,11 @@ public class AttDamBaseController { if (Objects.isNull(service.getById(id))) { throw new IllegalArgumentException("当前数据不存在"); } - return R.ok(service.removeById(id)); + boolean data = service.removeById(id); + if (data){ + fileService.deleteFile(getGroupId(),id.toString()); + } + return R.ok(data); } @Operation(summary = "列表") @@ -82,7 +98,8 @@ public class AttDamBaseController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated GeneralDataPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getCode())){ query.like(AttDamBase::getDamCode, page.getCode()); } @@ -91,5 +108,18 @@ public class AttDamBaseController { } return R.ok(service.page(page.getPageSo().toPage(),query)); } + @Operation(summary = "查看详情") + @GetMapping("/get/{id}") + public R page(@PathVariable("id") Serializable id) { + AttDamBase data = service.getById(id); + if (Objects.nonNull(data)){ + data.setFiles(fileService.getFiles(getGroupId(),data.getDamCode())); + } + return R.ok(data); + } + @Override + public String getGroupId() { + return "attDamBase"; + } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java b/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java index cc75cf6..b445d1c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttDamProfileController.java @@ -1,7 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.GeneralDataPage; @@ -103,7 +104,8 @@ public class AttDamProfileController extends AbstractCommonFileController{ @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated GeneralDataPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getName())) { query.like(AttDamProfile::getProfileName, page.getName()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java b/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java index 6e99a95..9600b23 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttGateValveController.java @@ -1,7 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.GeneralDataPage; @@ -72,7 +73,8 @@ public class AttGateValveController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated GeneralDataPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getCode())){ query.like(AttGateValve::getValveCode, page.getCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java b/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java index cd92646..62709ae 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttMeaWeirController.java @@ -1,7 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.GeneralDataPage; @@ -84,7 +85,8 @@ public class AttMeaWeirController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated GeneralDataPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getCode())) { query.like(AttMeaWeir::getWeirCode, page.getCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java index 02b2b87..bb1ebf0 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java @@ -107,7 +107,7 @@ public class AttResBaseController extends AbstractCommonFileController { throw new IllegalArgumentException("当前数据不存在"); } List files = dto.getFiles(); - fileService.saveFile(files, getGroupId(), dto.getResCode(),"1"); + fileService.saveFileNotDel(files, getGroupId(), dto.getResCode(),"1"); return R.ok(dto); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttSpillwayBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttSpillwayBaseController.java index 75b21bd..2a1d016 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/AttSpillwayBaseController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/AttSpillwayBaseController.java @@ -1,7 +1,9 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.GeneralDataPage; @@ -37,6 +39,8 @@ public class AttSpillwayBaseController { @Operation(summary = "新增") @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody AttSpillwayBase dto) { + dto.setCode(String.valueOf(IdWorker.getId())); + boolean result = service.save(dto); return R.ok(result ? dto : null); } @@ -69,7 +73,7 @@ public class AttSpillwayBaseController { @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated GeneralDataPage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (ObjectUtils.isNotNull(page.getCode())){ query.like(AttSpillwayBase::getCode, page.getCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java index cfbd82d..97e3df3 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java @@ -1,7 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.OsmoticDevicePage; @@ -86,7 +87,7 @@ public class OsmoticFlowDeviceController extends AbstractCommonFileController{ @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated OsmoticDevicePage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); if (ObjectUtils.isNotNull(page.getStationCode())) { query.like(OsmoticFlowDevice::getStationCode, page.getStationCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java index 46e9dd3..cf2273c 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java @@ -1,7 +1,8 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.OsmoticDevicePage; @@ -83,7 +84,8 @@ public class OsmoticPressDeviceController extends AbstractCommonFileController{ @Operation(summary = "分页") @PostMapping("/page") public R> page(@RequestBody @Validated OsmoticDevicePage page) { - LambdaQueryChainWrapper query = service.lambdaQuery(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtils.isNotNull(page.getStationCode())) { query.like(OsmoticPressDevice::getStationCode, page.getStationCode()); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java b/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java index 19ed88f..25eeede 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StZqrlBController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.gunshi.core.result.R; import com.gunshi.project.xyt.model.AttResBase; @@ -65,6 +66,7 @@ public class StZqrlBController { .count() > 0) { throw new IllegalArgumentException("当前数据已存在"); } + dto.setId(IdWorker.getId()); dto.setModitime(new Date()); boolean result = service.save(dto); return R.ok(result ? dto : null); @@ -81,14 +83,18 @@ public class StZqrlBController { .eq(StZqrlB::getStcd, dto.getStcd()) .eq(StZqrlB::getZ, dto.getZ()) .eq(StZqrlB::getQ, dto.getQ()) - .ne(StZqrlB::getModitime, dto.getModitime()) + .ne(StZqrlB::getId,dto.getId()) .count() > 0) { throw new IllegalArgumentException("当前数据已存在"); } - dto.setModitime(null); - boolean result = service.updateById(dto); + + boolean result = service.lambdaUpdate() + .set(StZqrlB::getZ, dto.getZ()) + .set(StZqrlB::getQ, dto.getQ()) + .eq(StZqrlB::getId, dto.getId()) + .update(); return R.ok(result ? dto : null); } @@ -99,18 +105,12 @@ public class StZqrlBController { throw new IllegalArgumentException("测站编码不存在"); } if (service.lambdaQuery() - .eq(StZqrlB::getStcd, dto.getStcd()) - .eq(StZqrlB::getZ, dto.getZ()) - .eq(StZqrlB::getQ, dto.getQ()) - .eq(StZqrlB::getModitime, dto.getModitime()) - .count() != 1) { + .eq(StZqrlB::getId, dto.getId()) + .count() == 0) { throw new IllegalArgumentException("当前数据不存在"); } return R.ok(service.lambdaUpdate() - .eq(StZqrlB::getStcd, dto.getStcd()) - .eq(StZqrlB::getZ, dto.getZ()) - .eq(StZqrlB::getQ, dto.getQ()) - .eq(StZqrlB::getModitime, dto.getModitime()) + .eq(StZqrlB::getId, dto.getId()) .remove() ); } diff --git a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java b/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java index 525909f..6372460 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.gunshi.core.result.R; @@ -65,6 +66,7 @@ public class StZvarlBController { .count() > 0) { throw new IllegalArgumentException("当前数据已存在"); } + dto.setId(IdWorker.getId()); dto.setModitime(new Date()); boolean result = service.save(dto); return R.ok(result ? dto : null); @@ -82,7 +84,7 @@ public class StZvarlBController { .eq(StZvarlB::getStcd, dto.getStcd()) .eq(StZvarlB::getRz, dto.getRz()) .eq(StZvarlB::getW, dto.getW()) - .ne(StZvarlB::getModitime, dto.getModitime()) + .ne(StZvarlB::getId, dto.getId()) .count() > 0) { throw new IllegalArgumentException("当前数据已存在"); } @@ -92,8 +94,7 @@ public class StZvarlBController { .set(StZvarlB::getRz, dto.getRz()) .set(StZvarlB::getW, dto.getW()) .set(StZvarlB::getWsfa, dto.getWsfa()) - .eq(StZvarlB::getStcd, dto.getStcd()) - .eq(StZvarlB::getModitime, dto.getModitime()) + .eq(StZvarlB::getId, dto.getId()) .update(); return R.ok(result ? dto : null); } @@ -102,18 +103,12 @@ public class StZvarlBController { @PostMapping("/del") public R del(@Validated(Delete.class) @RequestBody StZvarlB dto) { if (service.lambdaQuery() - .eq(StZvarlB::getRz, dto.getRz()) - .eq(StZvarlB::getW, dto.getW()) - .eq(StZvarlB::getStcd, dto.getStcd()) - .eq(StZvarlB::getModitime, dto.getModitime()) - .count() != 1) { + .eq(StZvarlB::getId, dto.getId()) + .count() == 0) { throw new IllegalArgumentException("当前数据不存在"); } return R.ok(service.lambdaUpdate() - .eq(StZvarlB::getRz, dto.getRz()) - .eq(StZvarlB::getW, dto.getW()) - .eq(StZvarlB::getStcd, dto.getStcd()) - .eq(StZvarlB::getModitime, dto.getModitime()) + .eq(StZvarlB::getId, dto.getId()) .remove() ); } diff --git a/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java b/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java index f58eac4..1929f53 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttDamBase.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Delete; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -16,6 +16,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 描述: 大坝表 @@ -36,7 +37,7 @@ public class AttDamBase implements Serializable { @TableId(value="dam_code", type= IdType.AUTO) @Schema(description="主键") @Size(max = 32,message = "主键最大长度要小于 32") - @NotBlank(message = "主键不能为空",groups = {Insert.class, Update.class}) + @NotBlank(message = "主键不能为空",groups = { Update.class, Delete.class}) private String damCode; /** @@ -148,4 +149,7 @@ public class AttDamBase implements Serializable { @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date createTime; + @TableField(exist = false) + @Schema(description = "文件集合") + private List files; } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java b/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java index c0387c5..700d546 100644 --- a/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java +++ b/src/main/java/com/gunshi/project/xyt/model/AttSpillwayBase.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Delete; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; @@ -36,7 +36,7 @@ public class AttSpillwayBase implements Serializable { @TableId(value="code", type= IdType.AUTO) @Schema(description="溢洪道代码") @Size(max = 32,message = "溢洪道代码最大长度要小于 32") - @NotBlank(message = "溢洪道代码不能为空",groups = {Insert.class, Update.class}) + @NotBlank(message = "溢洪道代码不能为空",groups = { Update.class, Delete.class}) private String code; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java index a76cbac..05e4334 100644 --- a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java +++ b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java @@ -92,7 +92,10 @@ public class FileAssociations implements Serializable { @TableField(value = "type") - @Schema(description = "业务文件类型 0:水库基本信息-工程基础信息-工程特性表,1:水库基本信息-设计图纸和资料") + @Schema(description = "业务文件类型 " + + "0:水库基本信息-工程基础信息-工程特性表," + + "1:水库基本信息-设计图纸和资料" + + "大坝 图片文件type:3 , 视频文件type:4") private String type; diff --git a/src/main/java/com/gunshi/project/xyt/model/StZqrlB.java b/src/main/java/com/gunshi/project/xyt/model/StZqrlB.java index 4c3262d..016b846 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StZqrlB.java +++ b/src/main/java/com/gunshi/project/xyt/model/StZqrlB.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.xyt.validate.markers.Delete; import com.gunshi.project.xyt.validate.markers.Insert; @@ -33,10 +35,17 @@ public class StZqrlB implements Serializable { private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value="id", type= IdType.AUTO) + @Schema(description="主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; /** * 测站编码 */ - @TableId(value="stcd", type= IdType.AUTO) + @TableField(value="stcd") @Schema(description="测站编码") @Size(max = 20,message = "测站编码最大长度要小于 8") @NotBlank(message = "测站编码不能为空") diff --git a/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java b/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java index d21c65e..b017941 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java +++ b/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java @@ -1,10 +1,13 @@ package com.gunshi.project.xyt.model; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import com.gunshi.project.xyt.validate.markers.Delete; import com.gunshi.project.xyt.validate.markers.Insert; @@ -31,10 +34,18 @@ public class StZvarlB implements Serializable { private static final long serialVersionUID = 1L; + /** + * 主键 + */ + @TableId(value="id", type= IdType.AUTO) + @Schema(description="主键") + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** * 测站编码 */ - @TableId(value="stcd") + @TableField(value="stcd") @Schema(description="测站编码") @Size(max = 20,message = "测站编码最大长度要小于 8") private String stcd; diff --git a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java index 955ff5a..d32cf1d 100644 --- a/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java +++ b/src/main/java/com/gunshi/project/xyt/service/FileAssociationsService.java @@ -84,10 +84,7 @@ public class FileAssociationsService extends ServiceImpl files, String tableName, String businessId, String type) { - if (CollectionUtils.isEmpty(files)) { - log.info("fileIds is null!"); - } + public void saveFileNotDel(List files, String tableName, String businessId, String type) { // 查询是否添加 List dbList = this.lambdaQuery() @@ -97,28 +94,21 @@ public class FileAssociationsService extends ServiceImpl fileIds = dbList.stream().map(FileAssociations::getFileId) .collect(Collectors.toSet()); - // 删除已添加数据, 删除重复数据 删除不成功即新数据 - files = files.stream() - .filter(fileAssociations -> !fileIds.remove(fileAssociations.getFileId())) - .collect(Collectors.toList()); - -// if (CollectionUtils.isNotEmpty(files)) { - - // 删除 - if (this.lambdaUpdate() - .set(FileAssociations::getDel, DEL) - .eq(FileAssociations::getTableName, tableName) - .eq(FileAssociations::getBusinessId, businessId) - .eq(FileAssociations::getType, type) - .in(FileAssociations::getFileId, fileIds) - .update()) { - log.info("delete file {} success!", fileIds); - } - -// } + // 删除 + if (this.lambdaUpdate() + .set(FileAssociations::getDel, DEL) + .eq(FileAssociations::getTableName, tableName) + .eq(FileAssociations::getBusinessId, businessId) + .eq(FileAssociations::getType, type) + .in(FileAssociations::getFileId, fileIds) + .update()) { + log.info("delete file {} success!", fileIds); + return; + } } diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRService.java index d5f08b2..4951f2a 100644 --- a/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRService.java +++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticWarnRService.java @@ -85,7 +85,7 @@ public class OsmoticWarnRService extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); queryWrapper.eq(OsmoticWarnRule::getStationCode,stationCode) .eq(OsmoticWarnRule::getStatus,1); if(StringUtils.isNotEmpty(direction)){