From e5645c64668ddf56c6d8791bd92ca64cd19db1ba Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 11:00:49 +0800 Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/system/controller/SmsVerifyCodeController.java | 1 + .../com/yfd/platform/system/service/impl/UserServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java index 8854e2fb..5bf84847 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java @@ -220,6 +220,7 @@ public class SmsVerifyCodeController { user.setStatus(0); user.setOrgid("e90063ced25e3d469860e88d920c082f"); user.setUsertype(1); + user.setTenantId(tenantId); user.setUsername(smsVerifyCodeRequest.getUsername()); user.setGroupCode(smsVerifyCodeRequest.getGroupCode()); user.setCompanyCode(smsVerifyCodeRequest.getCompanyCode()); diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java index cc11fb14..a50a6d83 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/UserServiceImpl.java @@ -135,6 +135,9 @@ public class UserServiceImpl extends ServiceImpl impleme List roles = sysRoleMapper.getRoleByUserId(user.getId()); List collect = roles.stream().map(SysRole::getRolename).collect(Collectors.toList()); + if(user.getUsertype()==0){ + collect.add("超级管理员"); + } ResponseResult responseResult = new ResponseResult(); responseResult.put("userInfo", userInfo); responseResult.put("roles", collect); From 9481dc1c3b1baf1847e1e894f85afa4c05d29c49 Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 13:45:27 +0800 Subject: [PATCH 02/20] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SdAiboxBHController.java | 55 +++ .../controller/SdArtsgBHController.java | 55 +++ .../qgc_base/controller/SdDwBHController.java | 55 +++ .../qgc_base/controller/SdEqBHController.java | 55 +++ .../controller/SdFbrdBHController.java | 55 +++ .../controller/SdFhbtBHController.java | 55 +++ .../controller/SdOpinfoBHController.java | 55 +++ .../controller/SdOtteBHController.java | 55 +++ .../controller/SdOtweBHController.java | 55 +++ .../controller/SdSonarBHController.java | 55 +++ .../qgc_base/controller/SdTeBHController.java | 55 +++ .../qgc_base/controller/SdVaBHController.java | 55 +++ .../controller/SdVdinfoBController.java | 55 +++ .../qgc_base/controller/SdVpBHController.java | 55 +++ .../qgc_base/controller/SdWeBHController.java | 55 +++ .../qgc_base/controller/SdWqBHController.java | 55 +++ .../qgc_base/controller/SdWtBHController.java | 55 +++ .../platform/qgc_base/domain/SdAiboxBH.java | 247 +++++++++++++ .../platform/qgc_base/domain/SdArtsgBH.java | 223 +++++++++++ .../yfd/platform/qgc_base/domain/SdDwBH.java | 346 ++++++++++++++++++ .../yfd/platform/qgc_base/domain/SdEqBH.java | 301 +++++++++++++++ .../platform/qgc_base/domain/SdFbrdBH.java | 254 +++++++++++++ .../platform/qgc_base/domain/SdFhbtBH.java | 260 +++++++++++++ .../platform/qgc_base/domain/SdOpinfoBH.java | 203 ++++++++++ .../platform/qgc_base/domain/SdOtteBH.java | 104 ++++++ .../platform/qgc_base/domain/SdOtweBH.java | 106 ++++++ .../platform/qgc_base/domain/SdSonarBH.java | 119 ++++++ .../yfd/platform/qgc_base/domain/SdTeBH.java | 102 ++++++ .../yfd/platform/qgc_base/domain/SdVaBH.java | 136 +++++++ .../platform/qgc_base/domain/SdVdinfoB.java | 179 +++++++++ .../yfd/platform/qgc_base/domain/SdVpBH.java | 135 +++++++ .../yfd/platform/qgc_base/domain/SdWeBH.java | 99 +++++ .../yfd/platform/qgc_base/domain/SdWqBH.java | 124 +++++++ .../yfd/platform/qgc_base/domain/SdWtBH.java | 150 ++++++++ .../qgc_base/mapper/SdAiboxBHMapper.java | 13 + .../qgc_base/mapper/SdArtsgBHMapper.java | 13 + .../qgc_base/mapper/SdDwBHMapper.java | 13 + .../qgc_base/mapper/SdEqBHMapper.java | 13 + .../qgc_base/mapper/SdFbrdBHMapper.java | 13 + .../qgc_base/mapper/SdFhbtBHMapper.java | 13 + .../qgc_base/mapper/SdOpinfoBHMapper.java | 7 + .../qgc_base/mapper/SdOtteBHMapper.java | 7 + .../qgc_base/mapper/SdOtweBHMapper.java | 7 + .../qgc_base/mapper/SdSonarBHMapper.java | 7 + .../qgc_base/mapper/SdTeBHMapper.java | 7 + .../qgc_base/mapper/SdVaBHMapper.java | 7 + .../qgc_base/mapper/SdVdinfoBMapper.java | 9 + .../qgc_base/mapper/SdVpBHMapper.java | 9 + .../qgc_base/mapper/SdWeBHMapper.java | 9 + .../qgc_base/mapper/SdWqBHMapper.java | 9 + .../qgc_base/mapper/SdWtBHMapper.java | 9 + .../service/IMsOperationLogService.java | 9 + .../qgc_base/service/ISdAiboxBHService.java | 36 ++ .../qgc_base/service/ISdArtsgBHService.java | 36 ++ .../qgc_base/service/ISdDwBHService.java | 36 ++ .../qgc_base/service/ISdEqBHService.java | 36 ++ .../qgc_base/service/ISdFbrdBHService.java | 36 ++ .../qgc_base/service/ISdFhbtBHService.java | 36 ++ .../qgc_base/service/ISdOpinfoBHService.java | 15 + .../qgc_base/service/ISdOtteBHService.java | 15 + .../qgc_base/service/ISdOtweBHService.java | 15 + .../qgc_base/service/ISdSonarBHService.java | 15 + .../qgc_base/service/ISdTeBHService.java | 15 + .../qgc_base/service/ISdVaBHService.java | 15 + .../qgc_base/service/ISdVdinfoBService.java | 15 + .../qgc_base/service/ISdVpBHService.java | 15 + .../qgc_base/service/ISdWeBHService.java | 15 + .../qgc_base/service/ISdWqBHService.java | 15 + .../qgc_base/service/ISdWtBHService.java | 15 + .../impl/MsOperationLogServiceImpl.java | 12 +- .../service/impl/SdAiboxBHServiceImpl.java | 72 ++++ .../service/impl/SdArtsgBHServiceImpl.java | 64 ++++ .../service/impl/SdDwBHServiceImpl.java | 72 ++++ .../service/impl/SdEqBHServiceImpl.java | 72 ++++ .../service/impl/SdFbrdBHServiceImpl.java | 64 ++++ .../service/impl/SdFhbtBHServiceImpl.java | 72 ++++ .../service/impl/SdOpinfoBHServiceImpl.java | 72 ++++ .../service/impl/SdOtteBHServiceImpl.java | 64 ++++ .../service/impl/SdOtweBHServiceImpl.java | 64 ++++ .../service/impl/SdSonarBHServiceImpl.java | 72 ++++ .../service/impl/SdTeBHServiceImpl.java | 64 ++++ .../service/impl/SdVaBHServiceImpl.java | 72 ++++ .../service/impl/SdVdinfoBServiceImpl.java | 64 ++++ .../service/impl/SdVpBHServiceImpl.java | 72 ++++ .../service/impl/SdWeBHServiceImpl.java | 64 ++++ .../service/impl/SdWqBHServiceImpl.java | 72 ++++ .../service/impl/SdWtBHServiceImpl.java | 72 ++++ 87 files changed, 5757 insertions(+), 1 deletion(-) create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdArtsgBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdDwBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEqBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFbrdBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFhbtBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOpinfoBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtteBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtweBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdSonarBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdTeBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVaBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVdinfoBController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVpBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWeBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWqBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWtBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAiboxBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdArtsgBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdDwBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEqBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFbrdBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFhbtBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOpinfoBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtteBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtweBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdSonarBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdTeBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVaBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVdinfoBMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVpBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWeBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWqBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWtBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAiboxBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdArtsgBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdDwBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEqBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFbrdBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFhbtBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOpinfoBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtteBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtweBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdSonarBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdTeBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVaBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVdinfoBService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVpBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWeBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWqBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWtBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java new file mode 100644 index 00000000..8718a421 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdAiboxBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdAiboxBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/aibox") +@Tag(name = "AI智能监测装置管理") +public class SdAiboxBHController { + + @Resource + private ISdAiboxBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdAiboxBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdAiboxBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdAiboxBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdAiboxBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdArtsgBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdArtsgBHController.java new file mode 100644 index 00000000..a467ed80 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdArtsgBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdArtsgBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdArtsgBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/artsg") +@Tag(name = "人工产卵场管理") +public class SdArtsgBHController { + + @Resource + private ISdArtsgBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdArtsgBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdArtsgBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdArtsgBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdArtsgBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdDwBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdDwBHController.java new file mode 100644 index 00000000..ab2f4f9e --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdDwBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdDwBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdDwBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/dw") +@Tag(name = "低温水设施管理") +public class SdDwBHController { + + @Resource + private ISdDwBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdDwBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdDwBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdDwBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdDwBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEqBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEqBHController.java new file mode 100644 index 00000000..c303cab1 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEqBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdEqBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdEqBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/eq") +@Tag(name = "生态流量设施管理") +public class SdEqBHController { + + @Resource + private ISdEqBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdEqBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdEqBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdEqBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdEqBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFbrdBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFbrdBHController.java new file mode 100644 index 00000000..6bd460f5 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFbrdBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdFbrdBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdFbrdBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/fbrd") +@Tag(name = "鱼类增殖站管理") +public class SdFbrdBHController { + + @Resource + private ISdFbrdBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdFbrdBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFbrdBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdFbrdBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFbrdBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFhbtBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFhbtBHController.java new file mode 100644 index 00000000..b5b12836 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFhbtBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdFhbtBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdFhbtBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/fhbt") +@Tag(name = "栖息地保护工程管理") +public class SdFhbtBHController { + + @Resource + private ISdFhbtBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdFhbtBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFhbtBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdFhbtBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFhbtBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOpinfoBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOpinfoBHController.java new file mode 100644 index 00000000..4a0f2cd1 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOpinfoBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdOpinfoBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/opinfo") +@Tag(name = "倾斜摄影管理") +public class SdOpinfoBHController { + + @Resource + private ISdOpinfoBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdOpinfoBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOpinfoBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdOpinfoBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOpinfoBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtteBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtteBHController.java new file mode 100644 index 00000000..c425bca7 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtteBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdOtteBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdOtteBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/otte") +@Tag(name = "陆生生态保护工程管理") +public class SdOtteBHController { + + @Resource + private ISdOtteBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdOtteBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOtteBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdOtteBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOtteBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtweBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtweBHController.java new file mode 100644 index 00000000..5311661f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdOtweBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdOtweBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdOtweBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/otwe") +@Tag(name = "水生生态保护工程管理") +public class SdOtweBHController { + + @Resource + private ISdOtweBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdOtweBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOtweBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdOtweBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdOtweBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdSonarBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdSonarBHController.java new file mode 100644 index 00000000..4c325387 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdSonarBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdSonarBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdSonarBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/sonar") +@Tag(name = "声呐及水下摄像管理") +public class SdSonarBHController { + + @Resource + private ISdSonarBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdSonarBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdSonarBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdSonarBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdSonarBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdTeBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdTeBHController.java new file mode 100644 index 00000000..ac1c4f52 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdTeBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdTeBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdTeBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/te") +@Tag(name = "陆生生态调查断面管理") +public class SdTeBHController { + + @Resource + private ISdTeBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdTeBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdTeBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdTeBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdTeBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVaBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVaBHController.java new file mode 100644 index 00000000..d9b79767 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVaBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdVaBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdVaBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/va") +@Tag(name = "动物救助站管理") +public class SdVaBHController { + + @Resource + private ISdVaBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdVaBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVaBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdVaBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVaBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVdinfoBController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVdinfoBController.java new file mode 100644 index 00000000..c6063d42 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVdinfoBController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdVdinfoB; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdVdinfoBService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/vdinfo") +@Tag(name = "视频站管理") +public class SdVdinfoBController { + + @Resource + private ISdVdinfoBService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdVdinfoB entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVdinfoB.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdVdinfoB entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVdinfoB.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVpBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVpBHController.java new file mode 100644 index 00000000..879820a8 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdVpBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdVpBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdVpBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/vp") +@Tag(name = "珍稀植物保护工程管理") +public class SdVpBHController { + + @Resource + private ISdVpBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdVpBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVpBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdVpBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdVpBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWeBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWeBHController.java new file mode 100644 index 00000000..84d45831 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWeBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdWeBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdWeBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/we") +@Tag(name = "水生生态调查断面管理") +public class SdWeBHController { + + @Resource + private ISdWeBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdWeBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWeBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdWeBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWeBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWqBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWqBHController.java new file mode 100644 index 00000000..c185b9ef --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWqBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdWqBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdWqBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/wq") +@Tag(name = "水质站管理") +public class SdWqBHController { + + @Resource + private ISdWqBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdWqBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWqBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdWqBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWqBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWtBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWtBHController.java new file mode 100644 index 00000000..996cab76 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdWtBHController.java @@ -0,0 +1,55 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdWtBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdWtBHService; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/base/wt") +@Tag(name = "水温站管理") +public class SdWtBHController { + + @Resource + private ISdWtBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdWtBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWtBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdWtBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdWtBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java new file mode 100644 index 00000000..919760a2 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -0,0 +1,247 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * AI边缘计算盒子基本属性表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_AIBOX_B_H") +public class SdAiboxBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 测站类型 + */ + private String sttp; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 建成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + /** + * 退役/拆除日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + /** + * 建设状态代码 + */ + private Integer bldsttCode; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 监测方式 + */ + private Integer mway; + + /** + * 站索引 + */ + private String stindx; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 所属流域代码 + */ + private String rvcd; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 服务对象 + */ + private String fwdx; + + /** + * 供电方式 + */ + private String gdfs; + + /** + * AI配置 + */ + private String aipz; + + /** + * 模型版本 + */ + private String mxbb; + + /** + * IP地址 + */ + private String ipaddr; + + /** + * SIM卡信息 + */ + private String siminfo; + + /** + * 联系人 + */ + private String lxr; + + /** + * 用途 + */ + private String purpose; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + /** + * 是否已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java new file mode 100644 index 00000000..0fdc10a6 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -0,0 +1,223 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 人工产卵场工程信息表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_ARTSG_B_H") +public class SdArtsgBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 测站类型 + */ + private String sttp; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 所属流域代码 + */ + private String rvcd; + + /** + * 所属行政区编码 + */ + private String addvcd; + + /** + * 规划设计日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + /** + * 计划开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + /** + * 计划完工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + /** + * 开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + /** + * 建成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + /** + * 退役/拆除日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + /** + * 建设状态代码 + */ + private Integer bldsttCode; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 投资 + */ + private BigDecimal inv; + + /** + * 投资金额 + */ + private Integer invinmn; + + /** + * 保护措施 + */ + private String prtcts; + + /** + * 数量 + */ + private Integer cnt; + + /** + * 面积 + */ + private BigDecimal ar; + + /** + * 类型 + */ + private String tp; + + /** + * 附件 + */ + private String attm; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java new file mode 100644 index 00000000..a371b55a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java @@ -0,0 +1,346 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 低温水减缓设施信息表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_DW_B_H") +public class SdDwBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 测站类型 + */ + private String sttp; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 规划设计日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + /** + * 计划开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + /** + * 计划完工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + /** + * 开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + /** + * 建成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + /** + * 退役/拆除日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + /** + * 建设状态代码 + */ + private Integer bldsttCode; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 投资 + */ + private BigDecimal inv; + + /** + * 投资金额 + */ + private Integer invinmn; + + /** + * 调度方式 + */ + private Integer dispatch; + + /** + * 调度描述 + */ + private String dispatchDes; + + /** + * 调度文件 + */ + private String dispatchFile; + + /** + * 叠梁门层数高度 + */ + private BigDecimal dcshg; + + /** + * 叠梁门单层取水口个数 + */ + private BigDecimal dcsqskgs; + + /** + * 叠梁门层数 + */ + private Integer dlmcnt; + + /** + * 叠梁门高度 + */ + private BigDecimal dlmhg; + + /** + * 叠梁门底部高程 + */ + private BigDecimal dlmdbgc; + + /** + * 叠梁门最大温度梯度 + */ + private BigDecimal dlmmxwdp; + + /** + * 梯级电站台数 + */ + private Integer ttscnt; + + /** + * 梯级电站高度 + */ + private BigDecimal ttshg; + + /** + * 梯级电站最低死水位 + */ + private BigDecimal ttszdss; + + /** + * 取水口段结构 + */ + private String qzdqjg; + + /** + * 取水口段高度 + */ + private BigDecimal qzdqhg; + + /** + * 隔水幕墙长度 + */ + private BigDecimal gsmqcd; + + /** + * 隔水幕墙宽度 + */ + private BigDecimal gsmqkd; + + /** + * 隔水幕墙材料 + */ + private BigDecimal gsmqcl; + + /** + * 其他设施具体型式 + */ + private String qtssjbtx; + + /** + * 天然河流平均水温 + */ + private BigDecimal nravwt; + + /** + * 天然河流最高温月份多年平均水温 + */ + private BigDecimal nrmxavwt; + + /** + * 天然河流最低温月份多年平均水温 + */ + private BigDecimal nrmnavwt; + + /** + * 建成后坝下平均水温 + */ + private BigDecimal dnavwt; + + /** + * 建成后坝下最高温月份多年平均水温 + */ + private BigDecimal dnmxavwt; + + /** + * 建成后坝下最低温月份多年平均水温 + */ + private BigDecimal dnmnavwt; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + /** + * 是否已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java new file mode 100644 index 00000000..615d595a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java @@ -0,0 +1,301 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 生态流量泄放设施信息表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_EQ_B_H") +public class SdEqBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 测站类型 + */ + private String sttp; + + /** + * 所属建设阶段 + */ + private Integer blprd; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 规划设计日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + /** + * 计划开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + /** + * 计划完工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + /** + * 开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + /** + * 建成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + /** + * 退役/拆除日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + /** + * 建设状态代码 + */ + private Integer bldsttCode; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 投资 + */ + private BigDecimal inv; + + /** + * 投资金额 + */ + private Integer invinmn; + + /** + * 泄放孔结构 + */ + private String flkjg; + + /** + * 泄放孔尺寸 + */ + private String flksz; + + /** + * 单独泄放管渠 + */ + private String ddzgq; + + /** + * 泄放孔口 + */ + private String flkq; + + /** + * 进水口底板高程 + */ + private BigDecimal jskdbgc; + + /** + * 出水口底板高程 + */ + private BigDecimal cskdbgc; + + /** + * 检修放空管道 + */ + private String jhfdgk; + + /** + * 泄放流量 + */ + private BigDecimal fdll; + + /** + * 生态机组装机容量 + */ + private BigDecimal stjzzjrl; + + /** + * 生态机组引水渠道 + */ + private BigDecimal stjzysq; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 评估方法 + */ + private String assessMethod; + + /** + * 是否计算器 + */ + private Integer isJsq; + + /** + * 是否流量 + */ + private String isFlow; + + /** + * 最小流量 + */ + private BigDecimal minFlow; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + /** + * 是否已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java new file mode 100644 index 00000000..5eb9dcc5 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java @@ -0,0 +1,254 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 鱼类增殖设施保护工程信息表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_FBRD_B_H") +public class SdFbrdBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 测站类型 + */ + private String sttp; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 所属建设阶段 + */ + private Integer blprd; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 环评单位 + */ + private String rengcd; + + /** + * 规划设计日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + /** + * 计划开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + /** + * 计划完工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + /** + * 开工日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + /** + * 建成日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + /** + * 退役/拆除日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + /** + * 建设状态代码 + */ + private Integer bldsttCode; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 投资 + */ + private BigDecimal inv; + + /** + * 投资金额 + */ + private Integer invinmn; + + /** + * 增殖放流面积 + */ + private BigDecimal zzflar; + + /** + * 增殖放流工艺 + */ + private BigDecimal zzflgy; + + /** + * 增殖放流鱼种描述 + */ + private String zzflyzms; + + /** + * 增殖放流标记方式 + */ + private String zzflbjfs; + + /** + * 增殖放流对象 + */ + private String zzfldx; + + /** + * 增殖放流数量 + */ + private Integer zzflcnt; + + /** + * 增殖放流放流流程 + */ + private String zzflfllc; + + /** + * 增殖放流时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date zzfltm; + + /** + * 增殖放流任务 + */ + private String zzflrw; + + /** + * 设计单位 + */ + private String dsun; + + /** + * 基本特性参数 + */ + private String jbtxcs; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java new file mode 100644 index 00000000..01caef6a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -0,0 +1,260 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + *

+ * 栖息地保护工程信息表 + *

+ */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("SD_FHBT_B_H") +public class SdFhbtBH implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @TableId(type = IdType.INPUT) + private String stcd; + + /** + * 测站名称 + */ + private String stnm; + + /** + * 数据时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + /** + * 所属建设阶段 + */ + private Integer blprd; + + /** + * 位置经度 + */ + private BigDecimal lgtd; + + /** + * 位置纬度 + */ + private BigDecimal lttd; + + /** + * 高程 + */ + private BigDecimal elev; + + /** + * 站址 + */ + private String stlc; + + /** + * 是否启用 + */ + private Integer usfl; + + /** + * 数据是否接入 + */ + private Integer dtin; + + /** + * 数据接入时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + /** + * 排序 + */ + private Integer orderIndex; + + /** + * 关联测站编码 + */ + private String rstcd; + + /** + * 所属基地编码 + */ + private String baseId; + + /** + * 所属基地流域编码 + */ + private String hbrvcd; + + /** + * 所属流域代码 + */ + private String rvcd; + + /** + * 所属行政区编码 + */ + private String addvcd; + + /** + * 河段描述 + */ + private String reachdes; + + /** + * 经度纬度列表 + */ + private String lglttd; + + /** + * 简介 + */ + private String introduce; + + /** + * LOGO + */ + private String logo; + + /** + * 介绍文件 + */ + private String inffile; + + /** + * 投资 + */ + private BigDecimal inv; + + /** + * 投资金额 + */ + private Integer invinmn; + + /** + * 保护对象 + */ + private String bhdx; + + /** + * 保护范围 + */ + private String bhfw; + + /** + * 保护措施 + */ + private String bhcd; + + /** + * 保护面积 + */ + private BigDecimal bhmj; + + /** + * 保护河流 + */ + private Integer bhhl; + + /** + * 保护河道 + */ + private Integer bhhd; + + /** + * 保护措施 + */ + private String bhcs; + + /** + * 保护方式 + */ + private String bhfs; + + /** + * 附件 + */ + private String attm; + + /** + * 保护水文参数 + */ + private String bhwwcd; + + /** + * 保护河相关系 + */ + private String bhhxcd; + + /** + * 数据频率 + */ + private String dtfrqcy; + + /** + * 备注 + */ + private String remark; + + /** + * 植被覆盖类型 + */ + private BigDecimal vlsr; + + /** + * 植被覆盖调查时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + /** + * 是否已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java new file mode 100644 index 00000000..f4c7f644 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -0,0 +1,203 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_OPINFO_B_H") +public class SdOpinfoBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private Integer blprd; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + @TableField("STDSDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @TableField("PSTSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @TableField("PESSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @TableField("SWDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private String url; + + private BigDecimal height; + + private String boundary; + + @TableField("CENTER_LGTD") + private BigDecimal centerLgtd; + + @TableField("CENTER_LTTD") + private BigDecimal centerLttd; + + @TableField("CENTER_ELEV") + private BigDecimal centerElev; + + private String description; + + @TableField("CENTER1_LGTD") + private BigDecimal center1Lgtd; + + @TableField("CENTER1_LTTD") + private BigDecimal center1Lttd; + + @TableField("CENTER1_ELEV") + private BigDecimal center1Elev; + + @TableField("CLIPPING_PLANES") + private String clippingPlanes; + + @TableField("DESTINATION_TYPE") + private String destinationType; + + @TableField("DESTINATION_LGTD") + private BigDecimal destinationLgtd; + + @TableField("DESTINATION_LTTD") + private BigDecimal destinationLttd; + + @TableField("DESTINATION_ELEV") + private BigDecimal destinationElev; + + @TableField("ORIENTATION_ROLL") + private BigDecimal orientationRoll; + + @TableField("ORIENTATION_HEADING") + private BigDecimal orientationHeading; + + @TableField("ORIENTATION_PITCH") + private BigDecimal orientationPitch; + + @TableField("REVISE_SITE_ELEV") + private BigDecimal reviseSiteElev; + + @TableField("REVISE_SITE_ELEV_FACTOR") + private BigDecimal reviseSiteElevFactor; + + @TableField("DESTINATION_LGTD_WCS") + private BigDecimal destinationLgtdWcs; + + @TableField("DESTINATION_LTTD_WCS") + private BigDecimal destinationLttdWcs; + + @TableField("DESTINATION_ELEV_WCS") + private BigDecimal destinationElevWcs; + + @TableField("DESTINATION_LGTD_WGS84") + private BigDecimal destinationLgtdWgs84; + + @TableField("DESTINATION_LTTD_WGS84") + private BigDecimal destinationLttdWgs84; + + @TableField("DESTINATION_ELEV_WGS84") + private BigDecimal destinationElevWgs84; + + private String location; + + private String accuracy; + + @TableField("STNM_ALIAS") + private String stnmAlias; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java new file mode 100644 index 00000000..72cdd511 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -0,0 +1,104 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_OTTE_B_H") +public class SdOtteBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private Integer blprd; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + @TableField("STDSDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @TableField("PSTSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @TableField("PESSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @TableField("SWDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private String jbtxcs; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java new file mode 100644 index 00000000..c5aa7e0a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -0,0 +1,106 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_OTWE_B_H") +public class SdOtweBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private Integer blprd; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + @TableField("STDSDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @TableField("PSTSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @TableField("PESSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @TableField("SWDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private Integer invinmn; + + private String jbtxcs; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java new file mode 100644 index 00000000..51724149 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -0,0 +1,119 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_SONAR_B_H") +public class SdSonarBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String mntp; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + private Integer mway; + + private String stindx; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + private String introduce; + + private String logo; + + private String inffile; + + private String fwdx; + + private String gcfs; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; + + @TableField("WARN_STATE") + private String warnState; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java new file mode 100644 index 00000000..3aafa40d --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -0,0 +1,102 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_TE_B_H") +public class SdTeBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + @TableField("STDSDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @TableField("PSTSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @TableField("PESSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @TableField("SWDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private Integer invinmn; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java new file mode 100644 index 00000000..2a22b642 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java @@ -0,0 +1,136 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_VA_B_H") +public class SdVaBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private Integer blprd; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rstcdmap; + + @TableField("STDSDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @TableField("PSTSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @TableField("PESSTDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @TableField("SWDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @TableField("JCDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @TableField("WDDT") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private BigDecimal area; + + private String place; + + private String bhfs; + + private String bhyy; + + private String bhdx; + + private String bhdxlb; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java new file mode 100644 index 00000000..201f6a8e --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -0,0 +1,179 @@ +package com.yfd.platform.qgc_base.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_VDINFO_B") +public class SdVdinfoB implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private String mntp; + + private String sttp; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private String stindx; + + private String description; + + private String rstcd; + + private String cstcd; + + private String rvcd; + + private String addvcd; + + private String hycd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String fhstcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private Integer usfl; + + private Integer dtin; + + @TableField("DTIN_SRC") + private String dtinSrc; + + @TableField("DTIN_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + @TableField("DEVICE_INFO") + private String deviceInfo; + + @TableField("ACCESS_WAY") + private String accessWay; + + @TableField("DEVICE_SERIAL") + private String deviceSerial; + + @TableField("CHANNEL_NO") + private String channelNo; + + @TableField("CHANNEL_NAME") + private String channelName; + + private String gbchannel; + + private String protocol; + + private String quality; + + private String transmode; + + @TableField("IS_VD_CONTROL") + private Integer isVdControl; + + @TableField("CONTROL_MODE") + private String controlMode; + + private String url; + + @TableField("INTRANET_URL") + private String intranetUrl; + + private String vduser; + + private String vdpwd; + + @TableField("STORAGE_WAY") + private String storageWay; + + private String frequency; + + @TableField("CUT_TIME") + private String cutTime; + + @TableField("FRAME_RATE") + private String frameRate; + + @TableField("TS_DURATION") + private String tsDuration; + + @TableField("OCR_WAY") + private String ocrWay; + + private String eqreviewm; + + private Integer jwupdate; + + @TableField("AI_ENABLED") + private Integer aiEnabled; + + @TableField("AI_FREQUENCY") + private String aiFrequency; + + @TableField("AI_EXT_CODE") + private String aiExtCode; + + @TableField("AI_EXT_NAME") + private String aiExtName; + + @TableField("LIVE_ADDRESS") + private String liveAddress; + + private Integer vdhisday; + + @TableField("DELAY_TIME") + private String delayTime; + + @TableField("DELAY_NUM") + private Integer delayNum; + + private String project; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("WARN_STATE") + private String warnState; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java new file mode 100644 index 00000000..97913f9b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java @@ -0,0 +1,135 @@ +package com.yfd.platform.qgc_base.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_VP_B_H") +public class SdVpBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private Integer blprd; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @TableField("DTIN_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private Integer aptl; + + private BigDecimal area; + + private String place; + + private String bhdx; + + private String bhdxlb; + + private String bhfs; + + private String bhyy; + + private Integer iscaec; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java new file mode 100644 index 00000000..01e0795f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -0,0 +1,99 @@ +package com.yfd.platform.qgc_base.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_WE_B_H") +public class SdWeBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private Integer usfl; + + private Integer dtin; + + @TableField("DTIN_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String rvcd; + + private String addvcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stdsdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pststdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date pesstdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date swdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private BigDecimal inv; + + private Integer invinmn; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java new file mode 100644 index 00000000..43acd821 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -0,0 +1,124 @@ +package com.yfd.platform.qgc_base.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_WQ_B_H") +public class SdWqBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private String sttp; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private String wwqtg; + + private String wqtype; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private String introduce; + + private String logo; + + private String inffile; + + private Integer usfl; + + private Integer dtin; + + @TableField("DTIN_SRC") + private String dtinSrc; + + @TableField("DTIN_TYPE") + private Integer dtinType; + + @TableField("DTIN_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + private Integer mway; + + private String stindx; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + private String fhstcd; + + private Integer ispro; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; + + @TableField("WARN_STATE") + private String warnState; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java new file mode 100644 index 00000000..4dcad49f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java @@ -0,0 +1,150 @@ +package com.yfd.platform.qgc_base.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("SD_WT_B_H") +public class SdWtBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private String stnm; + + private String sttp; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + private String stsr; + + @TableField("WT_DEVICE_TYPE") + private Integer wtDeviceType; + + @TableField("WT_TYPE") + private String wtType; + + private String wts; + + @TableField("WT_HGT_TYPE") + private Integer wtHgtType; + + @TableField("WT_FIRST_HGT") + private BigDecimal wtFirstHgt; + + @TableField("WT_DIST") + private String wtDist; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + private BigDecimal inv; + + private Integer invinmn; + + private String introduce; + + private String logo; + + private String inffile; + + private Integer usfl; + + private Integer dtin; + + @TableField("DTIN_SRC") + private String dtinSrc; + + @TableField("DTIN_TYPE") + private Integer dtinType; + + @TableField("DTIN_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date dtinTm; + + private Integer mway; + + private String stindx; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String dmstcd; + + private String rstcd; + + private String fhstcd; + + private Integer ispro; + + private String project; + + private String dtfrqcy; + + private String remark; + + private BigDecimal vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; + + @TableField("BASE_ID") + private String baseId; + + private String hbrvcd; + + @TableField("WARN_STATE") + private String warnState; + + @TableField("IS_PUSH") + private Integer isPush; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAiboxBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAiboxBHMapper.java new file mode 100644 index 00000000..c3906e84 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAiboxBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdAiboxBH; + +/** + *

+ * AI边缘计算盒子基本属性表 Mapper 接口 + *

+ */ +public interface SdAiboxBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdArtsgBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdArtsgBHMapper.java new file mode 100644 index 00000000..d095091d --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdArtsgBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdArtsgBH; + +/** + *

+ * 人工产卵场工程信息表 Mapper 接口 + *

+ */ +public interface SdArtsgBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdDwBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdDwBHMapper.java new file mode 100644 index 00000000..534c5dd5 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdDwBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdDwBH; + +/** + *

+ * 低温水减缓设施信息表 Mapper 接口 + *

+ */ +public interface SdDwBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEqBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEqBHMapper.java new file mode 100644 index 00000000..c019ae00 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEqBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdEqBH; + +/** + *

+ * 生态流量泄放设施信息表 Mapper 接口 + *

+ */ +public interface SdEqBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFbrdBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFbrdBHMapper.java new file mode 100644 index 00000000..841098dc --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFbrdBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdFbrdBH; + +/** + *

+ * 鱼类增殖设施保护工程信息表 Mapper 接口 + *

+ */ +public interface SdFbrdBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFhbtBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFhbtBHMapper.java new file mode 100644 index 00000000..8122b2f1 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdFhbtBHMapper.java @@ -0,0 +1,13 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdFhbtBH; + +/** + *

+ * 栖息地保护工程信息表 Mapper 接口 + *

+ */ +public interface SdFhbtBHMapper extends BaseMapper { + +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOpinfoBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOpinfoBHMapper.java new file mode 100644 index 00000000..19611176 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOpinfoBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; + +public interface SdOpinfoBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtteBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtteBHMapper.java new file mode 100644 index 00000000..80904d11 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtteBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdOtteBH; + +public interface SdOtteBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtweBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtweBHMapper.java new file mode 100644 index 00000000..a6248676 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdOtweBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdOtweBH; + +public interface SdOtweBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdSonarBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdSonarBHMapper.java new file mode 100644 index 00000000..197bf37f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdSonarBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdSonarBH; + +public interface SdSonarBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdTeBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdTeBHMapper.java new file mode 100644 index 00000000..e04fa61a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdTeBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdTeBH; + +public interface SdTeBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVaBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVaBHMapper.java new file mode 100644 index 00000000..29a32bbd --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVaBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdVaBH; + +public interface SdVaBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVdinfoBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVdinfoBMapper.java new file mode 100644 index 00000000..9c9c2a41 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVdinfoBMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdVdinfoB; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SdVdinfoBMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVpBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVpBHMapper.java new file mode 100644 index 00000000..22f8b59f --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdVpBHMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdVpBH; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SdVpBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWeBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWeBHMapper.java new file mode 100644 index 00000000..2228a21a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWeBHMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdWeBH; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SdWeBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWqBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWqBHMapper.java new file mode 100644 index 00000000..eea9eb26 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWqBHMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdWqBH; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SdWqBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWtBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWtBHMapper.java new file mode 100644 index 00000000..659c3679 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdWtBHMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdWtBH; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SdWtBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java index f9edde52..62dd1b07 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java @@ -9,4 +9,13 @@ public interface IMsOperationLogService { void recordEngUpdateLog(SdEngInfoBH before, SdEngInfoBH changeSet, String source); void recordEngDeleteLog(SdEngInfoBH engInfo, String source); + + /** + * 通用操作日志记录 + * @param tableName 表名 + * @param recordId 记录ID（stcd） + * @param operation 操作类型（新增/修改/删除） + * @param source 操作来源 + */ + void recordOperationLog(String tableName, String recordId, String operation, String source); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAiboxBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAiboxBHService.java new file mode 100644 index 00000000..0999c581 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAiboxBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdAiboxBH; + +import java.util.List; + +/** + *

+ * AI边缘计算盒子基本属性表 服务类 + *

+ */ +public interface ISdAiboxBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdAiboxBH entity, String source); + + /** + * 修改 + */ + boolean update(SdAiboxBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdArtsgBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdArtsgBHService.java new file mode 100644 index 00000000..11a57f77 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdArtsgBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdArtsgBH; + +import java.util.List; + +/** + *

+ * 人工产卵场工程信息表 服务类 + *

+ */ +public interface ISdArtsgBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdArtsgBH entity, String source); + + /** + * 修改 + */ + boolean update(SdArtsgBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdDwBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdDwBHService.java new file mode 100644 index 00000000..9a793cc2 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdDwBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdDwBH; + +import java.util.List; + +/** + *

+ * 低温水减缓设施信息表 服务类 + *

+ */ +public interface ISdDwBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdDwBH entity, String source); + + /** + * 修改 + */ + boolean update(SdDwBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEqBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEqBHService.java new file mode 100644 index 00000000..8d7f5cc5 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEqBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdEqBH; + +import java.util.List; + +/** + *

+ * 生态流量泄放设施信息表 服务类 + *

+ */ +public interface ISdEqBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdEqBH entity, String source); + + /** + * 修改 + */ + boolean update(SdEqBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFbrdBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFbrdBHService.java new file mode 100644 index 00000000..70b074f4 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFbrdBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdFbrdBH; + +import java.util.List; + +/** + *

+ * 鱼类增殖设施保护工程信息表 服务类 + *

+ */ +public interface ISdFbrdBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdFbrdBH entity, String source); + + /** + * 修改 + */ + boolean update(SdFbrdBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFhbtBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFhbtBHService.java new file mode 100644 index 00000000..118de1c9 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFhbtBHService.java @@ -0,0 +1,36 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdFhbtBH; + +import java.util.List; + +/** + *

+ * 栖息地保护工程信息表 服务类 + *

+ */ +public interface ISdFhbtBHService extends IService { + + /** + * 分页查询 + */ + Page queryPageList(DataSourceRequest request); + + /** + * 新增 + */ + boolean add(SdFhbtBH entity, String source); + + /** + * 修改 + */ + boolean update(SdFhbtBH entity, String source); + + /** + * 删除 + */ + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOpinfoBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOpinfoBHService.java new file mode 100644 index 00000000..cbd0ead2 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOpinfoBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; + +import java.util.List; + +public interface ISdOpinfoBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdOpinfoBH entity, String source); + boolean update(SdOpinfoBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtteBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtteBHService.java new file mode 100644 index 00000000..09e162aa --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtteBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOtteBH; + +import java.util.List; + +public interface ISdOtteBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdOtteBH entity, String source); + boolean update(SdOtteBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtweBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtweBHService.java new file mode 100644 index 00000000..6009911c --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdOtweBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOtweBH; + +import java.util.List; + +public interface ISdOtweBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdOtweBH entity, String source); + boolean update(SdOtweBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdSonarBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdSonarBHService.java new file mode 100644 index 00000000..4ebbe192 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdSonarBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdSonarBH; + +import java.util.List; + +public interface ISdSonarBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdSonarBH entity, String source); + boolean update(SdSonarBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdTeBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdTeBHService.java new file mode 100644 index 00000000..32beac3c --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdTeBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdTeBH; + +import java.util.List; + +public interface ISdTeBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdTeBH entity, String source); + boolean update(SdTeBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVaBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVaBHService.java new file mode 100644 index 00000000..334768f5 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVaBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVaBH; + +import java.util.List; + +public interface ISdVaBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdVaBH entity, String source); + boolean update(SdVaBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVdinfoBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVdinfoBService.java new file mode 100644 index 00000000..10513b62 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVdinfoBService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVdinfoB; + +import java.util.List; + +public interface ISdVdinfoBService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdVdinfoB entity, String source); + boolean update(SdVdinfoB entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVpBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVpBHService.java new file mode 100644 index 00000000..b0f81587 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdVpBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVpBH; + +import java.util.List; + +public interface ISdVpBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdVpBH entity, String source); + boolean update(SdVpBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWeBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWeBHService.java new file mode 100644 index 00000000..252776cd --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWeBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWeBH; + +import java.util.List; + +public interface ISdWeBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdWeBH entity, String source); + boolean update(SdWeBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWqBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWqBHService.java new file mode 100644 index 00000000..4576c188 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWqBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWqBH; + +import java.util.List; + +public interface ISdWqBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdWqBH entity, String source); + boolean update(SdWqBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWtBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWtBHService.java new file mode 100644 index 00000000..6d4fe773 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdWtBHService.java @@ -0,0 +1,15 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWtBH; + +import java.util.List; + +public interface ISdWtBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdWtBH entity, String source); + boolean update(SdWtBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index a915ff1d..b10e282b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -379,16 +379,26 @@ public class MsOperationLogServiceImpl implements IMsOperationLogService { } private MsOperationLog buildMainLog(String recordId,String remark, String source) { + return buildMainLog(ENG_TABLE_NAME, recordId, remark, source); + } + + private MsOperationLog buildMainLog(String tableName, String recordId, String remark, String source) { MsOperationLog log = new MsOperationLog(); log.setOperator(resolveOperator()); log.setOperateTime(new Date()); - log.setTableName(ENG_TABLE_NAME); + log.setTableName(tableName); log.setRecordId(recordId); log.setSource(StrUtil.trimToNull(source)); log.setRemark(remark); return log; } + @Override + public void recordOperationLog(String tableName, String recordId, String operation, String source) { + MsOperationLog log = buildMainLog(tableName, recordId, operation, source); + msOperationLogMapper.insert(log); + } + private MsOperationLogDetail buildDetail(String mainId, String stationCode, String fieldCode, diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java new file mode 100644 index 00000000..fd43b02a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdAiboxBH; +import com.yfd.platform.qgc_base.mapper.SdAiboxBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdAiboxBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdAiboxBHServiceImpl extends ServiceImpl implements ISdAiboxBHService { + + private static final String TABLE_NAME = "SD_AIBOX_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdAiboxBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdAiboxBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdAiboxBH entity, String source) { + SdAiboxBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdAiboxBH::getStcd, stcd); + wrapper.set(SdAiboxBH::getIsDeleted, 1); + wrapper.set(SdAiboxBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdAiboxBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java new file mode 100644 index 00000000..5c73425b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdArtsgBH; +import com.yfd.platform.qgc_base.mapper.SdArtsgBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdArtsgBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdArtsgBHServiceImpl extends ServiceImpl implements ISdArtsgBHService { + + private static final String TABLE_NAME = "SD_ARTSG_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdArtsgBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdArtsgBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdArtsgBH entity, String source) { + SdArtsgBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java new file mode 100644 index 00000000..5c7e8799 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdDwBH; +import com.yfd.platform.qgc_base.mapper.SdDwBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdDwBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdDwBHServiceImpl extends ServiceImpl implements ISdDwBHService { + + private static final String TABLE_NAME = "SD_DW_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdDwBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdDwBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdDwBH entity, String source) { + SdDwBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdDwBH::getStcd, stcd); + wrapper.set(SdDwBH::getIsDeleted, 1); + wrapper.set(SdDwBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdDwBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java new file mode 100644 index 00000000..5b1ec0b4 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdEqBH; +import com.yfd.platform.qgc_base.mapper.SdEqBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdEqBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdEqBHServiceImpl extends ServiceImpl implements ISdEqBHService { + + private static final String TABLE_NAME = "SD_EQ_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdEqBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdEqBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdEqBH entity, String source) { + SdEqBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdEqBH::getStcd, stcd); + wrapper.set(SdEqBH::getIsDeleted, 1); + wrapper.set(SdEqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdEqBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java new file mode 100644 index 00000000..e6027445 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdFbrdBH; +import com.yfd.platform.qgc_base.mapper.SdFbrdBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdFbrdBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdFbrdBHServiceImpl extends ServiceImpl implements ISdFbrdBHService { + + private static final String TABLE_NAME = "SD_FBRD_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdFbrdBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdFbrdBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdFbrdBH entity, String source) { + SdFbrdBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java new file mode 100644 index 00000000..b22d1ee9 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdFhbtBH; +import com.yfd.platform.qgc_base.mapper.SdFhbtBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdFhbtBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdFhbtBHServiceImpl extends ServiceImpl implements ISdFhbtBHService { + + private static final String TABLE_NAME = "SD_FHBT_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdFhbtBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdFhbtBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdFhbtBH entity, String source) { + SdFhbtBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdFhbtBH::getStcd, stcd); + wrapper.set(SdFhbtBH::getIsDeleted, 1); + wrapper.set(SdFhbtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdFhbtBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java new file mode 100644 index 00000000..3ccad258 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; +import com.yfd.platform.qgc_base.mapper.SdOpinfoBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdOpinfoBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdOpinfoBHServiceImpl extends ServiceImpl implements ISdOpinfoBHService { + + private static final String TABLE_NAME = "SD_OPINFO_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdOpinfoBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdOpinfoBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdOpinfoBH entity, String source) { + SdOpinfoBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdOpinfoBH::getStcd, stcd); + wrapper.set(SdOpinfoBH::getIsDeleted, 1); + wrapper.set(SdOpinfoBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdOpinfoBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java new file mode 100644 index 00000000..1499673b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOtteBH; +import com.yfd.platform.qgc_base.mapper.SdOtteBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdOtteBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdOtteBHServiceImpl extends ServiceImpl implements ISdOtteBHService { + + private static final String TABLE_NAME = "SD_OTTE_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdOtteBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdOtteBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdOtteBH entity, String source) { + SdOtteBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java new file mode 100644 index 00000000..0b89a0b2 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdOtweBH; +import com.yfd.platform.qgc_base.mapper.SdOtweBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdOtweBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdOtweBHServiceImpl extends ServiceImpl implements ISdOtweBHService { + + private static final String TABLE_NAME = "SD_OTWE_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdOtweBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdOtweBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdOtweBH entity, String source) { + SdOtweBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java new file mode 100644 index 00000000..4a535f49 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdSonarBH; +import com.yfd.platform.qgc_base.mapper.SdSonarBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdSonarBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdSonarBHServiceImpl extends ServiceImpl implements ISdSonarBHService { + + private static final String TABLE_NAME = "SD_SONAR_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdSonarBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdSonarBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdSonarBH entity, String source) { + SdSonarBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdSonarBH::getStcd, stcd); + wrapper.set(SdSonarBH::getIsDeleted, 1); + wrapper.set(SdSonarBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdSonarBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java new file mode 100644 index 00000000..bd2e9767 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdTeBH; +import com.yfd.platform.qgc_base.mapper.SdTeBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdTeBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdTeBHServiceImpl extends ServiceImpl implements ISdTeBHService { + + private static final String TABLE_NAME = "SD_TE_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdTeBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdTeBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdTeBH entity, String source) { + SdTeBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java new file mode 100644 index 00000000..ac272e4b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVaBH; +import com.yfd.platform.qgc_base.mapper.SdVaBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdVaBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdVaBHServiceImpl extends ServiceImpl implements ISdVaBHService { + + private static final String TABLE_NAME = "SD_VA_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdVaBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdVaBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdVaBH entity, String source) { + SdVaBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdVaBH::getStcd, stcd); + wrapper.set(SdVaBH::getIsDeleted, 1); + wrapper.set(SdVaBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdVaBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java new file mode 100644 index 00000000..52bbbad3 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVdinfoB; +import com.yfd.platform.qgc_base.mapper.SdVdinfoBMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdVdinfoBService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdVdinfoBServiceImpl extends ServiceImpl implements ISdVdinfoBService { + + private static final String TABLE_NAME = "SD_VDINFO_B"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdVdinfoB.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdVdinfoB entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdVdinfoB entity, String source) { + SdVdinfoB before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java new file mode 100644 index 00000000..7038e14d --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdVpBH; +import com.yfd.platform.qgc_base.mapper.SdVpBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdVpBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdVpBHServiceImpl extends ServiceImpl implements ISdVpBHService { + + private static final String TABLE_NAME = "SD_VP_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdVpBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdVpBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdVpBH entity, String source) { + SdVpBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdVpBH::getStcd, stcd); + wrapper.set(SdVpBH::getIsDeleted, 1); + wrapper.set(SdVpBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdVpBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java new file mode 100644 index 00000000..5825e303 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -0,0 +1,64 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWeBH; +import com.yfd.platform.qgc_base.mapper.SdWeBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdWeBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class SdWeBHServiceImpl extends ServiceImpl implements ISdWeBHService { + + private static final String TABLE_NAME = "SD_WE_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdWeBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdWeBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdWeBH entity, String source) { + SdWeBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + if (this.removeById(stcd)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java new file mode 100644 index 00000000..2f1a9d1b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWqBH; +import com.yfd.platform.qgc_base.mapper.SdWqBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdWqBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdWqBHServiceImpl extends ServiceImpl implements ISdWqBHService { + + private static final String TABLE_NAME = "SD_WQ_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdWqBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdWqBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdWqBH entity, String source) { + SdWqBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdWqBH::getStcd, stcd); + wrapper.set(SdWqBH::getIsDeleted, 1); + wrapper.set(SdWqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdWqBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java new file mode 100644 index 00000000..42f4d7e8 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -0,0 +1,72 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdWtBH; +import com.yfd.platform.qgc_base.mapper.SdWtBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdWtBHService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +public class SdWtBHServiceImpl extends ServiceImpl implements ISdWtBHService { + + private static final String TABLE_NAME = "SD_WT_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, SdWtBH.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdWtBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdWtBH entity, String source) { + SdWtBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdWtBH::getStcd, stcd); + wrapper.set(SdWtBH::getIsDeleted, 1); + wrapper.set(SdWtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdWtBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + count++; + } + } + return count > 0; + } +} From c9ff984bd570ce295f7d7210f4c47df99df3903b Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 14:50:46 +0800 Subject: [PATCH 03/20] =?UTF-8?q?fix:=20=E7=AB=99=E7=82=B9=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_base/domain/SdAiboxBH.java | 15 +++++++ .../platform/qgc_base/domain/SdArtsgBH.java | 11 ++++++ .../yfd/platform/qgc_base/domain/SdDwBH.java | 12 ++++++ .../yfd/platform/qgc_base/domain/SdEqBH.java | 12 ++++++ .../platform/qgc_base/domain/SdFbrdBH.java | 12 ++++++ .../platform/qgc_base/domain/SdFhbtBH.java | 6 +++ .../platform/qgc_base/domain/SdOpinfoBH.java | 12 ++++++ .../platform/qgc_base/domain/SdOtteBH.java | 12 ++++++ .../platform/qgc_base/domain/SdOtweBH.java | 12 ++++++ .../platform/qgc_base/domain/SdSonarBH.java | 15 +++++++ .../yfd/platform/qgc_base/domain/SdTeBH.java | 12 ++++++ .../yfd/platform/qgc_base/domain/SdVaBH.java | 11 ++++++ .../platform/qgc_base/domain/SdVdinfoB.java | 12 ++++++ .../yfd/platform/qgc_base/domain/SdVpBH.java | 13 +++++++ .../yfd/platform/qgc_base/domain/SdWeBH.java | 12 ++++++ .../yfd/platform/qgc_base/domain/SdWqBH.java | 18 +++++++++ .../yfd/platform/qgc_base/domain/SdWtBH.java | 18 +++++++++ .../service/impl/SdAiboxBHServiceImpl.java | 36 ++++++++++++++++- .../service/impl/SdArtsgBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdDwBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdEqBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdFbrdBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdFhbtBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdOpinfoBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdOtteBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdOtweBHServiceImpl.java | 34 +++++++++++++++- .../service/impl/SdSonarBHServiceImpl.java | 35 ++++++++++++++++- .../service/impl/SdTeBHServiceImpl.java | 34 +++++++++++++++- .../service/impl/SdVaBHServiceImpl.java | 34 +++++++++++++++- .../service/impl/SdVdinfoBServiceImpl.java | 34 +++++++++++++++- .../service/impl/SdVpBHServiceImpl.java | 34 +++++++++++++++- .../service/impl/SdWeBHServiceImpl.java | 36 ++++++++++++++++- .../service/impl/SdWqBHServiceImpl.java | 36 ++++++++++++++++- .../service/impl/SdWtBHServiceImpl.java | 39 ++++++++++++++++++- 34 files changed, 795 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java index 919760a2..4a4f8409 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -37,6 +37,9 @@ public class SdAiboxBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -80,6 +83,9 @@ public class SdAiboxBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 是否启用 */ @@ -90,6 +96,9 @@ public class SdAiboxBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -101,6 +110,9 @@ public class SdAiboxBH implements Serializable { */ private Integer mway; + @TableField(exist = false) + private String mwayName; + /** * 站索引 */ @@ -121,6 +133,9 @@ public class SdAiboxBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java index 0fdc10a6..ddf3b79c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -37,6 +37,9 @@ public class SdArtsgBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -73,6 +76,9 @@ public class SdArtsgBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -94,6 +100,9 @@ public class SdArtsgBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -150,6 +159,8 @@ public class SdArtsgBH implements Serializable { */ private Integer bldsttCode; + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java index a371b55a..e235d033 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java @@ -43,6 +43,9 @@ public class SdDwBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 位置经度 */ @@ -73,6 +76,9 @@ public class SdDwBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -89,6 +95,9 @@ public class SdDwBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -140,6 +149,9 @@ public class SdDwBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java index 615d595a..b57e4ace 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java @@ -43,6 +43,9 @@ public class SdEqBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 所属建设阶段 */ @@ -78,6 +81,9 @@ public class SdEqBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -99,6 +105,9 @@ public class SdEqBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -145,6 +154,9 @@ public class SdEqBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java index 5eb9dcc5..71d6acea 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java @@ -37,6 +37,9 @@ public class SdFbrdBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + /** * 数据时间 */ @@ -78,6 +81,9 @@ public class SdFbrdBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -99,6 +105,9 @@ public class SdFbrdBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ @@ -150,6 +159,9 @@ public class SdFbrdBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java index 01caef6a..c7a7c0a5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -73,6 +73,9 @@ public class SdFhbtBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -94,6 +97,9 @@ public class SdFhbtBH implements Serializable { */ private String baseId; + @TableField(exist = false) + private String baseName; + /** * 所属基地流域编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index f4c7f644..56ed36be 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -20,6 +20,9 @@ public class SdOpinfoBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOpinfoBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOpinfoBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOpinfoBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java index 72cdd511..9ada1d4a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -20,6 +20,9 @@ public class SdOtteBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOtteBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOtteBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOtteBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java index c5aa7e0a..2dc6e874 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -20,6 +20,9 @@ public class SdOtweBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -37,6 +40,9 @@ public class SdOtweBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -49,6 +55,9 @@ public class SdOtweBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -82,6 +91,9 @@ public class SdOtweBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java index 51724149..507a4570 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -22,6 +22,9 @@ public class SdSonarBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -44,16 +47,25 @@ public class SdSonarBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private String mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -64,6 +76,9 @@ public class SdSonarBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java index 3aafa40d..8b54bd3a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -20,6 +20,9 @@ public class SdTeBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -35,6 +38,9 @@ public class SdTeBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") private Date dtinTm; @@ -47,6 +53,9 @@ public class SdTeBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -80,6 +89,9 @@ public class SdTeBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java index 2a22b642..536c56b1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java @@ -20,6 +20,9 @@ public class SdVaBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -36,6 +39,8 @@ public class SdVaBH implements Serializable { private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("DTIN_TM") @@ -49,6 +54,9 @@ public class SdVaBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rstcdmap; @@ -80,6 +88,9 @@ public class SdVaBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index 201f6a8e..900b68bd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -28,6 +28,9 @@ public class SdVdinfoB implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -53,6 +56,9 @@ public class SdVdinfoB implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String fhstcd; @@ -69,10 +75,16 @@ public class SdVdinfoB implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private Integer usfl; private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java index 97913f9b..6e8f9c2b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java @@ -23,6 +23,10 @@ public class SdVpBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -40,6 +44,9 @@ public class SdVpBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; @@ -52,6 +59,9 @@ public class SdVpBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -75,6 +85,9 @@ public class SdVpBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java index 01e0795f..396429f1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -23,6 +23,9 @@ public class SdWeBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; @@ -38,6 +41,9 @@ public class SdWeBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; @@ -50,6 +56,9 @@ public class SdWeBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String rvcd; @@ -77,6 +86,9 @@ public class SdWeBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java index 43acd821..9f8c3591 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -26,6 +26,9 @@ public class SdWqBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -47,6 +50,9 @@ public class SdWqBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private String introduce; private String logo; @@ -57,18 +63,27 @@ public class SdWqBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; @TableField("DTIN_TYPE") private Integer dtinType; + @TableField(exist = false) + private String dtinTypeName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private Integer mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -79,6 +94,9 @@ public class SdWqBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; private String fhstcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java index 4dcad49f..07f0be4e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java @@ -26,6 +26,9 @@ public class SdWtBH implements Serializable { private String sttp; + @TableField(exist = false) + private String sttpName; + private BigDecimal lgtd; private BigDecimal lttd; @@ -62,6 +65,9 @@ public class SdWtBH implements Serializable { @TableField("BLDSTT_CODE") private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + private BigDecimal inv; private Integer invinmn; @@ -76,18 +82,27 @@ public class SdWtBH implements Serializable { private Integer dtin; + @TableField(exist = false) + private String dtinName; + @TableField("DTIN_SRC") private String dtinSrc; @TableField("DTIN_TYPE") private Integer dtinType; + @TableField(exist = false) + private String dtinTypeName; + @TableField("DTIN_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; private Integer mway; + @TableField(exist = false) + private String mwayName; + private String stindx; @TableField("ORDER_INDEX") @@ -140,6 +155,9 @@ public class SdWtBH implements Serializable { @TableField("BASE_ID") private String baseId; + @TableField(exist = false) + private String baseName; + private String hbrvcd; @TableField("WARN_STATE") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index fd43b02a..525f718f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdAiboxBH; import com.yfd.platform.qgc_base.mapper.SdAiboxBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdAiboxBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,40 @@ public class SdAiboxBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdAiboxBH.class, this); + Page sdAiboxBHPage = DataSourceRequestUtil.executeQuery(request, SdAiboxBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdAiboxBHPage, CODE_TO_NAME_META_LIST); + return sdAiboxBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java index 5c73425b..47f0b135 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdArtsgBH; import com.yfd.platform.qgc_base.mapper.SdArtsgBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdArtsgBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -19,12 +22,42 @@ public class SdArtsgBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Resource private IMsOperationLogService msOperationLogService; @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdArtsgBH.class, this); + Page sdArtsgBHPage = DataSourceRequestUtil.executeQuery(request, SdArtsgBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdArtsgBHPage, CODE_TO_NAME_META_LIST); + return sdArtsgBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java index 5c7e8799..f2fbe57d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdDwBH; import com.yfd.platform.qgc_base.mapper.SdDwBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdDwBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdDwBH.class, this); + Page sdDwBHPage = DataSourceRequestUtil.executeQuery(request, SdDwBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdDwBHPage, CODE_TO_NAME_META_LIST); + return sdDwBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index 5b1ec0b4..91e4793e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdEqBH; import com.yfd.platform.qgc_base.mapper.SdEqBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdEqBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdEqBH.class, this); + Page sdEqBHPage = DataSourceRequestUtil.executeQuery(request, SdEqBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdEqBHPage, CODE_TO_NAME_META_LIST); + return sdEqBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index e6027445..fe3134c8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdFbrdBH; import com.yfd.platform.qgc_base.mapper.SdFbrdBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdFbrdBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,39 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdFbrdBH.class, this); + Page sdFbrdBHPage = DataSourceRequestUtil.executeQuery(request, SdFbrdBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdFbrdBHPage, CODE_TO_NAME_META_LIST); + return sdFbrdBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index b22d1ee9..2d6f26fa 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdFhbtBH; import com.yfd.platform.qgc_base.mapper.SdFhbtBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdFhbtBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdFhbtBH.class, this); + Page sdFhbtBHPage = DataSourceRequestUtil.executeQuery(request, SdFhbtBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdFhbtBHPage, CODE_TO_NAME_META_LIST); + return sdFhbtBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index 3ccad258..fb3e0d02 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdOpinfoBH; import com.yfd.platform.qgc_base.mapper.SdOpinfoBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOpinfoBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,39 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOpinfoBH.class, this); + Page sdOpinfoBHPage = DataSourceRequestUtil.executeQuery(request, SdOpinfoBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOpinfoBHPage, CODE_TO_NAME_META_LIST); + return sdOpinfoBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java index 1499673b..14553f59 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtteBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdOtteBH; import com.yfd.platform.qgc_base.mapper.SdOtteBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOtteBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,39 @@ public class SdOtteBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOtteBH.class, this); + Page sdOtteBHPage = DataSourceRequestUtil.executeQuery(request, SdOtteBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOtteBHPage, CODE_TO_NAME_META_LIST); + return sdOtteBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 0b89a0b2..94deb103 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdOtweBH; import com.yfd.platform.qgc_base.mapper.SdOtweBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdOtweBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdOtweBHServiceImpl extends ServiceImpl i @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdOtweBH.class, this); + Page sdOtweBHPage = DataSourceRequestUtil.executeQuery(request, SdOtweBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdOtweBHPage, CODE_TO_NAME_META_LIST); + return sdOtweBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 4a535f49..80827689 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdSonarBH; import com.yfd.platform.qgc_base.mapper.SdSonarBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdSonarBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,40 @@ public class SdSonarBHServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdSonarBH.class, this); + Page sdSonarBHPage = DataSourceRequestUtil.executeQuery(request, SdSonarBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdSonarBHPage, CODE_TO_NAME_META_LIST); + return sdSonarBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java index bd2e9767..1c30c4ba 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdTeBH; import com.yfd.platform.qgc_base.mapper.SdTeBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdTeBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdTeBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdTeBH.class, this); + Page sdTeBHPage = DataSourceRequestUtil.executeQuery(request, SdTeBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdTeBHPage, CODE_TO_NAME_META_LIST); + return sdTeBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index ac272e4b..b7868d86 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdVaBH; import com.yfd.platform.qgc_base.mapper.SdVaBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVaBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,39 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVaBH.class, this); + Page sdVaBHPage = DataSourceRequestUtil.executeQuery(request, SdVaBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdVaBHPage, CODE_TO_NAME_META_LIST); + return sdVaBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 52bbbad3..d8cf051d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdVdinfoB; import com.yfd.platform.qgc_base.mapper.SdVdinfoBMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVdinfoBService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -21,10 +24,39 @@ public class SdVdinfoBServiceImpl extends ServiceImpl + * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVdinfoB.class, this); + Page sdVdinfoBPage = DataSourceRequestUtil.executeQuery(request, SdVdinfoB.class, this); + dictCodeToNameConverter.convertCodeToName(sdVdinfoBPage, CODE_TO_NAME_META_LIST); + return sdVdinfoBPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java index 7038e14d..f52dee58 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdVpBH; import com.yfd.platform.qgc_base.mapper.SdVpBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdVpBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -24,10 +27,39 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdVpBH.class, this); + Page sdVpBHPage = DataSourceRequestUtil.executeQuery(request, SdVpBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdVpBHPage, CODE_TO_NAME_META_LIST); + return sdVpBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index 5825e303..abb7d382 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -7,11 +7,14 @@ import com.yfd.platform.qgc_base.domain.SdWeBH; import com.yfd.platform.qgc_base.mapper.SdWeBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWeBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -22,9 +25,40 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWeBH.class, this); + Page sdWeBHPage = DataSourceRequestUtil.executeQuery(request, SdWeBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWeBHPage, CODE_TO_NAME_META_LIST); + return sdWeBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index 2f1a9d1b..d52e2640 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -8,12 +8,15 @@ import com.yfd.platform.qgc_base.domain.SdWqBH; import com.yfd.platform.qgc_base.mapper.SdWqBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWqBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +28,40 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWqBH.class, this); + Page sdWqBHPage = DataSourceRequestUtil.executeQuery(request, SdWqBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWqBHPage, CODE_TO_NAME_META_LIST); + return sdWqBHPage; } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index 42f4d7e8..c112084a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -1,5 +1,6 @@ package com.yfd.platform.qgc_base.service.impl; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,12 +9,15 @@ import com.yfd.platform.qgc_base.domain.SdWtBH; import com.yfd.platform.qgc_base.mapper.SdWtBHMapper; import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdWtBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -25,9 +29,42 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme @Resource private IMsOperationLogService msOperationLogService; + + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + + } + + @Override public Page queryPageList(DataSourceRequest request) { - return DataSourceRequestUtil.executeQuery(request, SdWtBH.class, this); + Page sdWtBHPage = DataSourceRequestUtil.executeQuery(request, SdWtBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdWtBHPage, CODE_TO_NAME_META_LIST); + return sdWtBHPage; } @Override From bbac60655d206da43fdfe5f726b98b3978840603 Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 15:41:37 +0800 Subject: [PATCH 04/20] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=AD=9B=E9=80=89=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yfd/platform/config/SwaggerConfig.java | 8 ++ .../controller/MsUsercolumnBController.java | 44 ++++++++ .../cuscolumn/domain/MsColumncfgB.java | 90 +++++++++++++++ .../cuscolumn/domain/MsUsercolumnB.java | 105 ++++++++++++++++++ .../cuscolumn/mapper/MsColumncfgBMapper.java | 9 ++ .../cuscolumn/mapper/MsUsercolumnBMapper.java | 29 +++++ .../service/IMsUsercolumnBService.java | 19 ++++ .../impl/MsUsercolumnBServiceImpl.java | 59 ++++++++++ .../mapper/system/MsUsercolumnBMapper.xml | 82 ++++++++++++++ 9 files changed, 445 insertions(+) create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/controller/MsUsercolumnBController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsColumncfgB.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsUsercolumnB.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsColumncfgBMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsUsercolumnBMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/IMsUsercolumnBService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java create mode 100644 backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml diff --git a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java index 2e43cdb8..c28488e1 100644 --- a/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java @@ -257,6 +257,14 @@ public class SwaggerConfig { .build(); } + @Bean + public GroupedOpenApi groupCusColumnApi() { + return GroupedOpenApi.builder() + .group("5.4 自定义筛选列") + .packagesToScan("com.yfd.platform.qgc_sys.cuscolumn.controller") + .build(); + } + @Bean public GroupedOpenApi groupLygkApi() { diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/controller/MsUsercolumnBController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/controller/MsUsercolumnBController.java new file mode 100644 index 00000000..3a269e76 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/controller/MsUsercolumnBController.java @@ -0,0 +1,44 @@ +package com.yfd.platform.qgc_sys.cuscolumn.controller; + +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_sys.cuscolumn.domain.MsUsercolumnB; +import com.yfd.platform.qgc_sys.cuscolumn.service.IMsUsercolumnBService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用户自定义筛选列 控制层 + */ +@RestController +@RequestMapping("/sys/usercolumn") +@Tag(name = "用户自定义筛选列") +public class MsUsercolumnBController { + + @Resource + private IMsUsercolumnBService msUsercolumnBService; + + /** + * 批量保存用户自定义列数据 + */ + @PostMapping("/batchSave") + @Operation(summary = "保存用户自定义列数据") + public ResponseResult batchSave(@RequestBody MsUsercolumnB userColumn) { + boolean result = msUsercolumnBService.batchSave(userColumn); + return result ? ResponseResult.success("保存成功") : ResponseResult.error("保存失败"); + } + + /** + * 获取用户自定义列数据 + */ + @PostMapping("/getUserColumnData") + @Operation(summary = "获取用户自定义列数据") + public ResponseResult getUserColumnData(@RequestBody MsUsercolumnB userColumn) { + return ResponseResult.successData(msUsercolumnBService.getUserColumnData(userColumn)); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsColumncfgB.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsColumncfgB.java new file mode 100644 index 00000000..d21fb44c --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsColumncfgB.java @@ -0,0 +1,90 @@ +package com.yfd.platform.qgc_sys.cuscolumn.domain; + +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 lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 筛选列配置表 + */ +@Data +@TableName("MS_COLUMNCFG_B") +public class MsColumncfgB implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + @TableField("FUNCTION_ID") + private String functionId; + + @TableField("COLUMN_CFG") + private String columnCfg; + + @TableField("ENABLE") + private Integer enable; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DEFAULT_CHECKED") + private Integer defaultChecked; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; + + @TableField("IS_TEMP_STORAGE") + private Integer isTempStorage; + + @TableField("COLUMN_EN") + private String columnEn; + + @TableField("GROUP_TYPE") + private String groupType; + + @TableField("PARENT_ID") + private String parentId; + + @TableField("HAS_CHILDREN") + private Integer hasChildren; + + @TableField("DESCRIPTION") + private String description; + + @TableField("CAN_BE_UPDATED") + private Integer canBeUpdated; + + @TableField("WIDTH") + private Integer width; + + @TableField("CAN_BE_SORTED") + private Integer canBeSorted; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsUsercolumnB.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsUsercolumnB.java new file mode 100644 index 00000000..30361090 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/domain/MsUsercolumnB.java @@ -0,0 +1,105 @@ +package com.yfd.platform.qgc_sys.cuscolumn.domain; + +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.annotation.JsonProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 用户与筛选列映射表 + */ +@Data +@TableName("MS_USERCOLUMN_B") +public class MsUsercolumnB implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + @TableField("CFG_ID") + @JsonProperty("cfgId") + private String cfgId; + + @TableField("CAN_BE_CHECKED") + private Integer canBeChecked; + + @TableField("CHECKED") + private Integer checked; + + @TableField("DESCRIPTION") + private String description; + + @TableField("ENABLE") + private Integer enable; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; + + @TableField("IS_TEMP_STORAGE") + private Integer isTempStorage; + + @TableField("COLUMN_EN") + private String columnEn; + + @TableField("COLUMN_NAME") + private String columnName; + + /** + * 是否默认配置（非数据库字段） + */ + @TableField(exist = false) + @JsonProperty("defaultConfig") + private Boolean defaultConfig; + + /** + * 分组类型（非数据库字段，来自关联查询） + */ + @TableField(exist = false) + @JsonProperty("groupType") + private String groupType; + + /** + * 自定义列宽度（非数据库字段，来自关联查询） + */ + @TableField(exist = false) + @JsonProperty("width") + private Integer width; + + /** + * 批量操作时的对象集合（非数据库字段） + */ + @TableField(exist = false) + private List list; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsColumncfgBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsColumncfgBMapper.java new file mode 100644 index 00000000..067f4c38 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsColumncfgBMapper.java @@ -0,0 +1,9 @@ +package com.yfd.platform.qgc_sys.cuscolumn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_sys.cuscolumn.domain.MsColumncfgB; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MsColumncfgBMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsUsercolumnBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsUsercolumnBMapper.java new file mode 100644 index 00000000..9a00e07c --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/mapper/MsUsercolumnBMapper.java @@ -0,0 +1,29 @@ +package com.yfd.platform.qgc_sys.cuscolumn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_sys.cuscolumn.domain.MsUsercolumnB; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface MsUsercolumnBMapper extends BaseMapper { + + /** + * 根据用户ID和模块ID删除用户自定义列数据 + */ + void deleteUserColumn(@Param("recordUser") String recordUser, + @Param("cfgId") String cfgId); + + /** + * 查询用户自定义列数据（LEFT JOIN MS_COLUMNCFG_B，优先使用用户配置，无用户配置时使用默认配置） + */ + List getUserColumnList(@Param("recordUser") String recordUser, + @Param("cfgId") String cfgId); + + /** + * 根据模块ID查询默认列配置 + */ + List getUserColumnDefaultList(@Param("cfgId") String cfgId); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/IMsUsercolumnBService.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/IMsUsercolumnBService.java new file mode 100644 index 00000000..7a41fe3d --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/IMsUsercolumnBService.java @@ -0,0 +1,19 @@ +package com.yfd.platform.qgc_sys.cuscolumn.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.qgc_sys.cuscolumn.domain.MsUsercolumnB; + +import java.util.List; + +public interface IMsUsercolumnBService extends IService { + + /** + * 批量保存用户自定义列数据 + */ + boolean batchSave(MsUsercolumnB userColumn); + + /** + * 获取用户自定义列数据 + */ + List getUserColumnData(MsUsercolumnB userColumn); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java new file mode 100644 index 00000000..1524c95c --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/cuscolumn/service/impl/MsUsercolumnBServiceImpl.java @@ -0,0 +1,59 @@ +package com.yfd.platform.qgc_sys.cuscolumn.service.impl; + +import com.yfd.platform.qgc_sys.cuscolumn.domain.MsUsercolumnB; +import com.yfd.platform.qgc_sys.cuscolumn.mapper.MsUsercolumnBMapper; +import com.yfd.platform.qgc_sys.cuscolumn.service.IMsUsercolumnBService; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.Date; +import java.util.List; + +@Service +public class MsUsercolumnBServiceImpl + extends ServiceImpl + implements IMsUsercolumnBService { + + @Resource + private MsUsercolumnBMapper usercolumnBMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean batchSave(MsUsercolumnB userColumn) { + if (!StringUtils.hasText(userColumn.getCfgId())) { + throw new IllegalArgumentException("模块(cfgId)不能为空"); + } + + String currentUser = SecurityUtils.getCurrentUsername(); + List list = userColumn.getList(); + + if (list != null && !list.isEmpty()) { + for (MsUsercolumnB item : list) { + item.setCfgId(userColumn.getCfgId()); + item.setRecordUser(currentUser); + item.setRecordTime(new Date()); + // 列的中文名称通过COLUMN_EN和MS_COLUMNCFG_B关联查询，不额外存储 + item.setColumnName(null); + } + + // 先删除旧数据 + usercolumnBMapper.deleteUserColumn(currentUser, userColumn.getCfgId()); + + // 批量保存新数据 + return this.saveBatch(list); + } + + return false; + } + + @Override + public List getUserColumnData(MsUsercolumnB userColumn) { + String currentUser = SecurityUtils.getCurrentUsername(); + return usercolumnBMapper.getUserColumnList(currentUser, userColumn.getCfgId()); + } +} diff --git a/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml b/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml new file mode 100644 index 00000000..14819390 --- /dev/null +++ b/backend/src/main/resources/mapper/system/MsUsercolumnBMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + DELETE FROM MS_USERCOLUMN_B + WHERE CFG_ID = #{cfgId} + + AND RECORD_USER = #{recordUser} + + + + + + + + + + From 49466f3990b6b4448ede5ec57baadf6b1d7184b0 Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 17:10:54 +0800 Subject: [PATCH 05/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=B8=BB?= =?UTF-8?q?=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/MicroservicDynamicSQLMapper.java | 7 ++ .../config/DynamicPaginationInterceptor.java | 41 +++++++++ .../yfd/platform/config/MybitsPlusConfig.java | 26 +----- .../platform/datasource/DataSourceAspect.java | 40 +++------ .../platform/datasource/DataSourceKeys.java | 22 +++++ .../datasource/DynamicDataSourceConfig.java | 62 +++++++++---- .../platform/datasource/TargetDataSource.java | 23 +++++ .../service/impl/MapLegendServiceImpl.java | 4 +- .../controller/DataSourceController.java | 35 ++++---- .../service/impl/UserDetailsServiceImpl.java | 4 +- .../src/main/resources/application-dev.yml | 30 +++++-- .../src/main/resources/application-prod.yml | 86 +++++++++++++++---- 12 files changed, 269 insertions(+), 111 deletions(-) create mode 100644 backend/src/main/java/com/yfd/platform/config/DynamicPaginationInterceptor.java create mode 100644 backend/src/main/java/com/yfd/platform/datasource/DataSourceKeys.java create mode 100644 backend/src/main/java/com/yfd/platform/datasource/TargetDataSource.java diff --git a/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java b/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java index 319f2ffd..ce0c6225 100644 --- a/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java +++ b/backend/src/main/java/com/yfd/platform/common/MicroservicDynamicSQLMapper.java @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yfd.platform.datasource.DataSourceKeys; +import com.yfd.platform.datasource.TargetDataSource; import org.apache.ibatis.annotations.Mapper; import java.util.Collections; @@ -30,6 +32,11 @@ public interface MicroservicDynamicSQLMapper { Map getOneBySql(@Param("sql") String sql, @Param("map") Map map); + @Select({""}) + @TargetDataSource(DataSourceKeys.ORACLE_MASTER) + Map getOneOracleBySql(@Param("sql") String sql, @Param("map") Map map); + + default R getOneBySqlWithResultType(String sql, Map map, Class resultType) { diff --git a/backend/src/main/java/com/yfd/platform/config/DynamicPaginationInterceptor.java b/backend/src/main/java/com/yfd/platform/config/DynamicPaginationInterceptor.java new file mode 100644 index 00000000..79598636 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/config/DynamicPaginationInterceptor.java @@ -0,0 +1,41 @@ +package com.yfd.platform.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import com.yfd.platform.datasource.DynamicDataSource; +import org.apache.ibatis.executor.Executor; +import org.apache.ibatis.mapping.BoundSql; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.session.ResultHandler; +import org.apache.ibatis.session.RowBounds; + +import java.sql.SQLException; + +/** + * 动态分页拦截器，根据当前数据源自动切换 Oracle/DM 分页方言 + */ +public class DynamicPaginationInterceptor extends PaginationInnerInterceptor { + + public DynamicPaginationInterceptor() { + super(DbType.DM); + } + + @Override + public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, + RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) { + this.setDbType(resolveDbType()); + super.beforeQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql); + } + + /** + * 根据当前线程绑定的数据源 key 解析数据库类型： + * oracle-* → ORACLE，其他（dm-*、null）→ DM + */ + private DbType resolveDbType() { + String dsKey = DynamicDataSource.getDataSource(); + if (dsKey != null && dsKey.startsWith("oracle")) { + return DbType.ORACLE; + } + return DbType.DM; + } +} diff --git a/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java b/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java index eff73ed2..171503b6 100644 --- a/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/MybitsPlusConfig.java @@ -1,37 +1,19 @@ package com.yfd.platform.config; -import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -/****************************** - * 用途说明: - * 作者姓名: pcj - * 创建时间: 2022/10/24 10:50 - ******************************/ +/** + * MyBatis-Plus 配置，使用动态分页拦截器支持 Oracle/达梦 自动切换 + */ @Configuration public class MybitsPlusConfig { -// @Bean -// public MybatisPlusInterceptor mybatisPlusInterceptor() { -// MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor(); -// mybatisPlusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); -// return mybatisPlusInterceptor; -// } - - /** - * 分页插件配置（Oracle 兼容） - */ @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - // 添加分页拦截器，指定数据库类型为 Oracle -// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE)); - // 添加分页拦截器，指定数据库类型为 Oracle - interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.DM)); + interceptor.addInnerInterceptor(new DynamicPaginationInterceptor()); return interceptor; } - } diff --git a/backend/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java b/backend/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java index f20c0f87..33b7fb28 100644 --- a/backend/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java +++ b/backend/src/main/java/com/yfd/platform/datasource/DataSourceAspect.java @@ -1,55 +1,41 @@ package com.yfd.platform.datasource; -import cn.hutool.core.util.StrUtil; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.AnnotationUtils; import org.springframework.stereotype.Component; -import java.lang.reflect.Method; - -/****************************** - * 用途说明: - * 作者姓名: wxy - * 创建时间: 2022/9/23 17:50 - ******************************/ +/** + * 数据源切换切面，处理 @TargetDataSource 注解 + */ @Aspect @Component public class DataSourceAspect { - @Pointcut("@annotation(com.yfd.platform.datasource.DataSource)") + @Pointcut("@annotation(com.yfd.platform.datasource.TargetDataSource)") public void dataSourcePointCut() { - } - private String DataBaseName; - @Around("dataSourcePointCut()") public Object around(ProceedingJoinPoint point) throws Throwable { MethodSignature signature = (MethodSignature) point.getSignature(); - Method method = signature.getMethod(); - if (StrUtil.isNotBlank(DataBaseName)){ - DynamicDataSource.setDataSource(DataBaseName); - }else { - DynamicDataSource.setDataSource("master"); + TargetDataSource annotation = AnnotationUtils.findAnnotation(signature.getMethod(), TargetDataSource.class); + if (annotation == null) { + // 类级别注解 + annotation = AnnotationUtils.findAnnotation(point.getTarget().getClass(), TargetDataSource.class); } + String dsKey = (annotation != null && !annotation.value().isEmpty()) + ? annotation.value() + : DataSourceKeys.DEFAULT; + DynamicDataSource.setDataSource(dsKey); try { return point.proceed(); } finally { DynamicDataSource.clearDataSource(); } } - - public String getDataBase(Integer type){ - if (type == 1){ - DataBaseName="master"; - }else { - DataBaseName="slave"; - } - return DataBaseName; - } - } diff --git a/backend/src/main/java/com/yfd/platform/datasource/DataSourceKeys.java b/backend/src/main/java/com/yfd/platform/datasource/DataSourceKeys.java new file mode 100644 index 00000000..19a8459a --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/datasource/DataSourceKeys.java @@ -0,0 +1,22 @@ +package com.yfd.platform.datasource; + +/** + * 数据源 key 常量 + */ +public interface DataSourceKeys { + + /** 达梦主库 */ + String DM_MASTER = "dm-master"; + + /** 达梦从库 */ + String DM_SLAVE = "dm-slave"; + + /** Oracle 主库 */ + String ORACLE_MASTER = "oracle-master"; + + /** Oracle 从库 */ + String ORACLE_SLAVE = "oracle-slave"; + + /** 默认数据源 */ + String DEFAULT = DM_MASTER; +} diff --git a/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java index f5594437..d9e984ae 100644 --- a/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java +++ b/backend/src/main/java/com/yfd/platform/datasource/DynamicDataSourceConfig.java @@ -1,28 +1,28 @@ package com.yfd.platform.datasource; +import com.alibaba.druid.pool.DruidDataSource; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; -import com.alibaba.druid.pool.DruidDataSource; import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; -/****************************** - * 用途说明: - * 作者姓名: wxy - * 创建时间: 2022/9/23 17:45 - ******************************/ +/** + * 动态数据源配置，支持 达梦(DM) 和 Oracle 两种数据库，每种各有主从(master/slave) + * + * @author yfd + */ @Configuration -@Component public class DynamicDataSourceConfig { + // ==================== 达梦(DM) 数据源 ==================== + @Bean - @ConfigurationProperties("spring.datasource.druid.master") - public DataSource wglMasterDataSource(){ + @ConfigurationProperties("spring.datasource.druid.dm-master") + public DataSource dmMasterDataSource() { DruidDataSource dataSource = new DruidDataSource(); dataSource.setBreakAfterAcquireFailure(true); dataSource.setConnectionErrorRetryAttempts(0); @@ -30,22 +30,48 @@ public class DynamicDataSourceConfig { } @Bean - @ConfigurationProperties("spring.datasource.druid.slave") - public DataSource wglSlaveDataSource(){ + @ConfigurationProperties("spring.datasource.druid.dm-slave") + public DataSource dmSlaveDataSource() { DruidDataSource dataSource = new DruidDataSource(); dataSource.setBreakAfterAcquireFailure(true); dataSource.setConnectionErrorRetryAttempts(0); return dataSource; } + // ==================== Oracle 数据源 ==================== + + @Bean + @ConfigurationProperties("spring.datasource.druid.oracle-master") + public DataSource oracleMasterDataSource() { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setBreakAfterAcquireFailure(true); + dataSource.setConnectionErrorRetryAttempts(0); + return dataSource; + } + + @Bean + @ConfigurationProperties("spring.datasource.druid.oracle-slave") + public DataSource oracleSlaveDataSource() { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setBreakAfterAcquireFailure(true); + dataSource.setConnectionErrorRetryAttempts(0); + return dataSource; + } + + // ==================== 路由数据源 ==================== + @Bean @Primary - public DynamicDataSource dataSource(DataSource wglMasterDataSource, DataSource wglSlaveDataSource) { + public DynamicDataSource dataSource(DataSource dmMasterDataSource, + DataSource dmSlaveDataSource, + DataSource oracleMasterDataSource, + DataSource oracleSlaveDataSource) { Map targetDataSources = new HashMap<>(); - targetDataSources.put("master",wglMasterDataSource); - targetDataSources.put("slave",wglSlaveDataSource); - return new DynamicDataSource(wglMasterDataSource, targetDataSources); + targetDataSources.put(DataSourceKeys.DM_MASTER, dmMasterDataSource); + targetDataSources.put(DataSourceKeys.DM_SLAVE, dmSlaveDataSource); + targetDataSources.put(DataSourceKeys.ORACLE_MASTER, oracleMasterDataSource); + targetDataSources.put(DataSourceKeys.ORACLE_SLAVE, oracleSlaveDataSource); + // 默认使用达梦主库 + return new DynamicDataSource(dmMasterDataSource, targetDataSources); } - - } diff --git a/backend/src/main/java/com/yfd/platform/datasource/TargetDataSource.java b/backend/src/main/java/com/yfd/platform/datasource/TargetDataSource.java new file mode 100644 index 00000000..b208ff44 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/datasource/TargetDataSource.java @@ -0,0 +1,23 @@ +package com.yfd.platform.datasource; + +import java.lang.annotation.*; + +/** + * 动态数据源注解，用于方法级别切换数据源 + *

+ * 支持的取值： + *

    + *
  • "dm-master" / "dm-slave" — 达梦数据库
    • + *
  • "oracle-master" / "oracle-slave" — Oracle 数据库
    • + *
+ * 默认值为 "dm-master" + * + * @author yfd + */ +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface TargetDataSource { + + String value() default DataSourceKeys.DM_MASTER; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendServiceImpl.java index aecb081b..18f77b3a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapLayer/service/impl/MapLegendServiceImpl.java @@ -33,10 +33,10 @@ public class MapLegendServiceImpl extends ServiceImpl + * 支持的 dataSourceKey： + *
    + *
  • "dm-master" / "dm-slave" — 达梦数据库
    • + *
  • "oracle-master" / "oracle-slave" — Oracle 数据库
    • + *
+ * 注意：此方法仅对当前请求线程生效，且必须在被 @TargetDataSource 注解的方法中使用才会真正路由。 + * 建议使用 @TargetDataSource 注解方式切换数据源。 */ @GetMapping("/changeDataSource") @Operation(summary = "切换数据库") - public ResponseResult changeDataSource(Integer type) { + @Deprecated + public ResponseResult changeDataSource(@RequestParam(required = false) Integer type) { if (type == null) { return ResponseResult.error("参数为空"); } - String dataBase = dataSourceAspect.getDataBase(type); - String mess = "已切换为" + dataBase + "数据库"; - return ResponseResult.success(mess); + String dataSourceKey = (type == 1) ? DataSourceKeys.DM_MASTER : DataSourceKeys.DM_SLAVE; + DynamicDataSource.setDataSource(dataSourceKey); + return ResponseResult.success("已切换为" + dataSourceKey + "数据源"); } - } diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java index 77506150..b860f0bd 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/UserDetailsServiceImpl.java @@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yfd.platform.datasource.DataSource; +import com.yfd.platform.datasource.DataSourceKeys; +import com.yfd.platform.datasource.TargetDataSource; import com.yfd.platform.system.domain.LoginUser; import com.yfd.platform.system.domain.SysUser; import com.yfd.platform.system.mapper.SysMenuMapper; @@ -38,7 +40,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { private SysMenuMapper sysMenuMapper; @Override - @DataSource(name = "master") + @TargetDataSource() public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { // 获取当前请求 ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-dev.yml index ccbcb104..31f5159d 100644 --- a/backend/src/main/resources/application-dev.yml +++ b/backend/src/main/resources/application-dev.yml @@ -8,16 +8,30 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource druid: - master: + # ==================== 达梦(DM) 数据源 ==================== + dm-master: driverClassName: dm.jdbc.driver.DmDriver - url: "${DB_MASTER_URL:jdbc:dm://localhost:5236/WPPDB}" - username: "${DB_MASTER_USERNAME:WPPDB}" - password: "${DB_MASTER_PASSWORD:}" - slave: + url: "${DB_DM_MASTER_URL:jdbc:dm://localhost:5236/WPPDB}" + username: "${DB_DM_MASTER_USERNAME:WPPDB}" + password: "${DB_DM_MASTER_PASSWORD:}" + dm-slave: driverClassName: dm.jdbc.driver.DmDriver - url: "${DB_SLAVE_URL:jdbc:dm://localhost:5236/WPPDB}" - username: "${DB_SLAVE_USERNAME:WPPDB}" - password: "${DB_SLAVE_PASSWORD:}" + url: "${DB_DM_SLAVE_URL:jdbc:dm://localhost:5236/WPPDB}" + username: "${DB_DM_SLAVE_USERNAME:WPPDB}" + password: "${DB_DM_SLAVE_PASSWORD:}" + # ==================== Oracle 数据源 ==================== + oracle-master: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_ORACLE_MASTER_URL:jdbc:oracle:thin:@localhost:1521/ORCL}" + username: "${DB_ORACLE_MASTER_USERNAME:}" + password: "${DB_ORACLE_MASTER_PASSWORD:}" + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 + oracle-slave: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_ORACLE_SLAVE_URL:jdbc:oracle:thin:@localhost:1521/ORCL}" + username: "${DB_ORACLE_SLAVE_USERNAME:}" + password: "${DB_ORACLE_SLAVE_PASSWORD:}" + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 mvc: pathmatch: diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index cc37ba65..f7005940 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -10,13 +10,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource druid: - master: -# driverClassName: oracle.jdbc.OracleDriver -# url: "${DB_MASTER_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" + # ==================== 达梦(DM) 数据源 ==================== + dm-master: driverClassName: dm.jdbc.driver.DmDriver - url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" - username: "${DB_MASTER_USERNAME:QGC_REFA}" - password: "${DB_MASTER_PASSWORD:Y4M4K1oCkL8U}" + url: "${DB_DM_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" + username: "${DB_DM_MASTER_USERNAME:QGC_REFA}" + password: "${DB_DM_MASTER_PASSWORD:Y4M4K1oCkL8U}" initial-size: 5 min-idle: 5 max-active: 20 @@ -41,15 +40,11 @@ spring: pool-prepared-statements: true max-open-prepared-statements: 100 max-pool-prepared-statement-per-connection-size: 100 - connection-properties: connectTimeout=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 -# connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 - slave: + dm-slave: driverClassName: dm.jdbc.driver.DmDriver - url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" -# driverClassName: oracle.jdbc.OracleDriver -# url: "${DB_SLAVE_URL:jdbc:oracle:thin:@172.16.31.190:1521/SDLYZ}" - username: "${DB_SLAVE_USERNAME:QGC_REFA}" - password: "${DB_SLAVE_PASSWORD:Y4M4K1oCkL8U}" + url: "${DB_DM_SLAVE_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}" + username: "${DB_DM_SLAVE_USERNAME:QGC_REFA}" + password: "${DB_DM_SLAVE_PASSWORD:Y4M4K1oCkL8U}" initial-size: 5 min-idle: 5 max-active: 20 @@ -74,8 +69,67 @@ spring: pool-prepared-statements: true max-open-prepared-statements: 100 max-pool-prepared-statement-per-connection-size: 100 - connection-properties: connectTimeout=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 -# connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 + # ==================== Oracle 数据源 ==================== + oracle-master: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_ORACLE_MASTER_URL:jdbc:oracle:thin:@172.16.31.172:1521/SDLYZ}" + username: "${DB_ORACLE_MASTER_USERNAME:SDLY_QX}" + password: "${DB_ORACLE_MASTER_PASSWORD:jNHnqv3hH7}" + initial-size: 5 + min-idle: 5 + max-active: 20 + max-wait: 30000 + async-init: true + keep-alive-between-time-millis: 120000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 180000 + max-evictable-idle-time-millis: 300000 + phy-timeout-millis: 25200000 + validation-query: SELECT 1 FROM DUAL + validation-query-timeout: 3 + test-while-idle: true + test-on-borrow: false + test-on-return: false + keep-alive: true + remove-abandoned: true + remove-abandoned-timeout: 1800 + log-abandoned: true + break-after-acquire-failure: true + time-between-connect-error-millis: 30000 + pool-prepared-statements: true + max-open-prepared-statements: 100 + max-pool-prepared-statement-per-connection-size: 100 + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 + oracle-slave: + driverClassName: oracle.jdbc.OracleDriver + url: "${DB_ORACLE_SLAVE_URL:jdbc:oracle:thin:@172.16.31.172:1521/SDLYZ}" + username: "${DB_ORACLE_SLAVE_USERNAME:SDLY_QX}" + password: "${DB_ORACLE_SLAVE_PASSWORD:jNHnqv3hH7}" + initial-size: 5 + min-idle: 5 + max-active: 20 + max-wait: 30000 + async-init: true + keep-alive-between-time-millis: 120000 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 180000 + max-evictable-idle-time-millis: 300000 + phy-timeout-millis: 25200000 + validation-query: SELECT 1 FROM DUAL + validation-query-timeout: 3 + test-while-idle: true + test-on-borrow: false + test-on-return: false + keep-alive: true + remove-abandoned: true + remove-abandoned-timeout: 1800 + log-abandoned: true + break-after-acquire-failure: true + time-between-connect-error-millis: 30000 + pool-prepared-statements: true + max-open-prepared-statements: 100 + max-pool-prepared-statement-per-connection-size: 100 + connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000 filter: stat: enabled: true From 57699cc5effbb22b40c5aa0da459ab747b5d78fd Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 18:07:25 +0800 Subject: [PATCH 06/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IMsOperationLogService.java | 14 ++++ .../impl/MsOperationLogServiceImpl.java | 71 +++++++++++++++++++ .../service/impl/SdAiboxBHServiceImpl.java | 2 +- .../service/impl/SdArtsgBHServiceImpl.java | 2 +- .../service/impl/SdDwBHServiceImpl.java | 2 +- .../service/impl/SdEqBHServiceImpl.java | 2 +- .../service/impl/SdFbrdBHServiceImpl.java | 2 +- .../service/impl/SdFhbtBHServiceImpl.java | 2 +- .../service/impl/SdOpinfoBHServiceImpl.java | 2 +- .../service/impl/SdOtteBHServiceImpl.java | 2 +- .../service/impl/SdOtweBHServiceImpl.java | 2 +- .../service/impl/SdSonarBHServiceImpl.java | 2 +- .../service/impl/SdTeBHServiceImpl.java | 2 +- .../service/impl/SdVaBHServiceImpl.java | 2 +- .../service/impl/SdVpBHServiceImpl.java | 2 +- .../service/impl/SdWeBHServiceImpl.java | 2 +- .../service/impl/SdWqBHServiceImpl.java | 2 +- .../service/impl/SdWtBHServiceImpl.java | 2 +- .../wte/service/impl/WeFishServiceImpl.java | 20 ++++++ 19 files changed, 121 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java index 62dd1b07..85c9882a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java @@ -18,4 +18,18 @@ public interface IMsOperationLogService { * @param source 操作来源 */ void recordOperationLog(String tableName, String recordId, String operation, String source); + + /** + * 通用修改操作详情日志（含字段级变更详情） + *

+ * 通过反射遍历实体所有字段，对比修改前后的值差异， + * 将每个变更字段记录为一条操作日志详情。 + *

+ * @param tableName 表名 + * @param before 修改前的实体 + * @param after 修改后的实体 + * @param source 操作来源 + * @param 实体类型 + */ + void recordModifyDetailLog(String tableName, T before, T after, String source); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index b10e282b..b4854359 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -399,6 +399,45 @@ public class MsOperationLogServiceImpl implements IMsOperationLogService { msOperationLogMapper.insert(log); } + @Override + public void recordModifyDetailLog(String tableName, T before, T after, String source) { + if (before == null || after == null) { + return; + } + String recordId = getStcd(before); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "修改", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = before.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + Object oldValue = getFieldValue(field, before); + Object newValue = getFieldValue(field, after); + + //如果新值是null，则不记录 + if(newValue == null){ + continue; + } + if (equalsValue(oldValue, newValue)) { + continue; + } + details.add(buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + oldValue, newValue, "修改字段值")); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + private MsOperationLogDetail buildDetail(String mainId, String stationCode, String fieldCode, @@ -422,9 +461,41 @@ public class MsOperationLogServiceImpl implements IMsOperationLogService { } private void batchInsertDetails(List details) { + if (details == null || details.isEmpty()) { + return; + } msOperationLogDetailMapper.insert(details); } + /** + * 通过反射获取实体的 stcd（记录ID） + */ + private String getStcd(T entity) { + try { + return (String) entity.getClass().getMethod("getStcd").invoke(entity); + } catch (Exception e) { + return null; + } + } + + /** + * 构建通用的操作日志详情（不含字典名称解析） + */ + private MsOperationLogDetail buildGenericDetail(String mainId, String tableName, + String stationCode, String fieldCode, + Object oldValue, Object newValue, String remark) { + MsOperationLogDetail detail = new MsOperationLogDetail(); + detail.setMainId(mainId); + detail.setTableName(tableName); + detail.setStationCode(stationCode); + detail.setFieldCode(fieldCode); + detail.setFieldMeaning(fieldCode); + detail.setOldValueCode(formatValue(oldValue)); + detail.setNewValueCode(formatValue(newValue)); + detail.setRemark(remark); + return detail; + } + private boolean shouldSkipField(Field field) { if (Modifier.isStatic(field.getModifiers())) { return true; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index 525f718f..b456b322 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -80,7 +80,7 @@ public class SdAiboxBHServiceImpl extends ServiceImpl impleme SdDwBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index 91e4793e..e800a289 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -79,7 +79,7 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme SdEqBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index fe3134c8..f288fb96 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -76,7 +76,7 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i SdFbrdBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index 2d6f26fa..92f4b4ae 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -79,7 +79,7 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i SdFhbtBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index fb3e0d02..b996374a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -79,7 +79,7 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl i SdOtteBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 94deb103..c03ad298 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -75,7 +75,7 @@ public class SdOtweBHServiceImpl extends ServiceImpl i SdOtweBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 80827689..deb8bc2c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -79,7 +79,7 @@ public class SdSonarBHServiceImpl extends ServiceImpl impleme SdTeBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index b7868d86..52690f51 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -78,7 +78,7 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme SdVaBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java index f52dee58..b06d79c2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -78,7 +78,7 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme SdVpBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index abb7d382..36044706 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -77,7 +77,7 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme SdWeBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index d52e2640..c0cc1e55 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -80,7 +80,7 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme SdWqBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index c112084a..1578e43c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -83,7 +83,7 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme SdWtBH before = this.getById(entity.getStcd()); boolean result = this.updateById(entity); if (result && before != null) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "修改", source); + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); } return result; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java index d9b6f10a..c8faf6af 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java @@ -626,6 +626,13 @@ public class WeFishServiceImpl implements WeFishService { queryWeEnvmAutoMonitorCount(buildWeEnvmZjWqSql(baseId, rstcds)), 3, "WQ", "ENV,ENVM,WQ,", "水质监测" )); + if (showIds.isEmpty() || showIds.contains("4")) { + // 气象监测 + rows.add(buildWeEnvmAutoMonitorVo( + queryWeEnvmAutoMonitorCount(buildWeEnvmMmSql(baseId, hbrvcds)), + 4, "MM", "MM,", "气象监测" + )); + } rows.add(buildWeEnvmAutoMonitorVo( queryWeEnvmAutoMonitorCount(buildWeEnvmStGjSql(baseId)), 5, null, "ST,ZQ-ST,ZZ", "国家水文站" @@ -5346,6 +5353,19 @@ public class WeFishServiceImpl implements WeFishService { return new SqlAndParams(sql.toString(), paramMap); } + private SqlAndParams buildWeEnvmMmSql(String baseId, List hbrvcds) { + StringBuilder sql = new StringBuilder(); + Map paramMap = new HashMap<>(); + sql.append("SELECT COUNT(1) AS cnt FROM SD_MM_B_H mm ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = mm.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") + .append("WHERE NVL(mm.IS_DELETED, 0) = 0 ") + .append("AND mm.STTP = 'MM' ") + .append("AND NVL(mm.MWAY, 0) = 2 "); + appendWeEnvmBaseIdCondition(sql, paramMap, "eng.BASE_ID", baseId); + appendWeEnvmExactInCondition(sql, paramMap, "eng.HBRVCD", "hbrvcd", hbrvcds); + return new SqlAndParams(sql.toString(), paramMap); + } + private void appendWeEnvmBaseIdCondition(StringBuilder sql, Map paramMap, String column, String baseId) { if (StrUtil.isBlank(baseId)) { return; From 9d3e05a196ae7789393f5666b6fc1ea52f44a7df Mon Sep 17 00:00:00 2001 From: tangwei Date: Mon, 20 Jul 2026 18:16:59 +0800 Subject: [PATCH 07/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java | 3 +++ .../platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdOtteBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdOtweBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdSonarBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java | 2 +- .../platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java | 2 +- .../yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java | 2 +- 34 files changed, 68 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java index 4a4f8409..0d2a29f8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -128,6 +128,9 @@ public class SdAiboxBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 所属基地编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java index ddf3b79c..f65cbf98 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -95,6 +95,9 @@ public class SdArtsgBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 所属基地编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java index e235d033..6dff3306 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java @@ -108,6 +108,9 @@ public class SdDwBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 规划设计日期 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java index b57e4ace..642b1382 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java @@ -100,6 +100,9 @@ public class SdEqBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 所属基地编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java index 71d6acea..3c418154 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java @@ -100,6 +100,9 @@ public class SdFbrdBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 所属基地编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java index c7a7c0a5..ce3ba9fa 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -92,6 +92,9 @@ public class SdFhbtBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 所属基地编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index 56ed36be..a9d1b811 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -52,6 +52,9 @@ public class SdOpinfoBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java index 9ada1d4a..17b65bbf 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -52,6 +52,9 @@ public class SdOtteBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java index 2dc6e874..49f5350f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -52,6 +52,9 @@ public class SdOtweBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java index 507a4570..3db49b90 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -73,6 +73,9 @@ public class SdSonarBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java index 8b54bd3a..2ee432e3 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -50,6 +50,9 @@ public class SdTeBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java index 536c56b1..4faf5481 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java @@ -51,6 +51,9 @@ public class SdVaBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index 900b68bd..2128a75e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -45,6 +45,9 @@ public class SdVdinfoB implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + private String cstcd; private String rvcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java index 6e8f9c2b..4f25906b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java @@ -56,6 +56,9 @@ public class SdVpBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java index 396429f1..c5ee698e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -53,6 +53,9 @@ public class SdWeBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java index 9f8c3591..10dd07e4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -91,6 +91,9 @@ public class SdWqBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + @TableField("BASE_ID") private String baseId; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java index 07f0be4e..95376f97 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java @@ -112,6 +112,9 @@ public class SdWtBH implements Serializable { private String rstcd; + @TableField(exist = false) + private String ennm; + private String fhstcd; private Integer ispro; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index b456b322..d81e521a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -54,7 +54,7 @@ public class SdAiboxBHServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index e800a289..23bf1859 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -53,7 +53,7 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index f288fb96..fefa8f9b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -50,7 +50,7 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index 92f4b4ae..50254885 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -53,7 +53,7 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index b996374a..dd645d20 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -53,7 +53,7 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl i // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index c03ad298..900220cd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -49,7 +49,7 @@ public class SdOtweBHServiceImpl extends ServiceImpl i // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index deb8bc2c..262c7119 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -53,7 +53,7 @@ public class SdSonarBHServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index 52690f51..992d4536 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -52,7 +52,7 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index d8cf051d..a281fc49 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -49,7 +49,7 @@ public class SdVdinfoBServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index 36044706..29ced099 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -51,7 +51,7 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index c0cc1e55..0f7bb30c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -54,7 +54,7 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index 1578e43c..ac2e140c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -56,7 +56,7 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); - + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); } From f0aea67b3534b80b810299710e1e6d2db6ab6e52 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 08:32:08 +0800 Subject: [PATCH 08/20] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=B5=81?= =?UTF-8?q?=E5=9F=9F=E4=B8=AD=E6=96=87=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yfd/platform/config/SecurityConfig.java | 1 + .../main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java | 3 +++ .../main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java | 3 +++ .../src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java | 3 +++ .../platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java | 2 ++ .../platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java | 1 + .../platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java | 1 + .../platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java | 1 + .../platform/qgc_base/service/impl/SdOtteBHServiceImpl.java | 2 ++ .../platform/qgc_base/service/impl/SdOtweBHServiceImpl.java | 2 ++ .../platform/qgc_base/service/impl/SdSonarBHServiceImpl.java | 2 ++ .../yfd/platform/qgc_base/service/impl/SdTeBHServiceImpl.java | 2 ++ .../platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java | 2 ++ .../yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java | 2 ++ 21 files changed, 48 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 165beccc..f32fd789 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -69,6 +69,7 @@ public class SecurityConfig { .requestMatchers("/overview/**").permitAll() .requestMatchers("/wt/**").permitAll() .requestMatchers("/fb/**").permitAll() + .requestMatchers("/base/**").permitAll() .requestMatchers("/zq/**").permitAll() .requestMatchers("/wq/**").permitAll() .requestMatchers("/wte/**").permitAll() diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java index 0d2a29f8..5eb838d0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -149,6 +149,9 @@ public class SdAiboxBH implements Serializable { */ private String rvcd; + @TableField(exist = false) + private String rvnm; + /** * 简介 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java index f65cbf98..5786f368 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -116,6 +116,9 @@ public class SdArtsgBH implements Serializable { */ private String rvcd; + @TableField(exist = false) + private String rvnm; + /** * 所属行政区编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java index ce3ba9fa..28a3cc1b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -113,6 +113,9 @@ public class SdFhbtBH implements Serializable { */ private String rvcd; + @TableField(exist = false) + private String rvnm; + /** * 所属行政区编码 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index a9d1b811..68921b4d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -65,6 +65,9 @@ public class SdOpinfoBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; @TableField("STDSDT") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java index 17b65bbf..86be9e6f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -65,6 +65,9 @@ public class SdOtteBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; @TableField("STDSDT") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java index 49f5350f..cae415b2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -65,6 +65,9 @@ public class SdOtweBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; @TableField("STDSDT") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java index 3db49b90..5e6da073 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -86,6 +86,9 @@ public class SdSonarBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; private String introduce; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java index 2ee432e3..ee42bb57 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -63,6 +63,9 @@ public class SdTeBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; @TableField("STDSDT") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index 2128a75e..a993fcdf 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -52,6 +52,9 @@ public class SdVdinfoB implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; private String hycd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java index c5ee698e..df1891c8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -66,6 +66,9 @@ public class SdWeBH implements Serializable { private String rvcd; + @TableField(exist = false) + private String rvnm; + private String addvcd; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index d81e521a..0169a429 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -55,6 +55,8 @@ public class SdAiboxBHServiceImpl extends ServiceImpl i // CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index dd645d20..a696f953 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -54,6 +54,7 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl i CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 900220cd..00b87e2d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -50,6 +50,8 @@ public class SdOtweBHServiceImpl extends ServiceImpl i CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 262c7119..2ce05e0e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -54,6 +54,8 @@ public class SdSonarBHServiceImpl extends ServiceImpl impleme CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index a281fc49..2b01dd72 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -50,6 +50,8 @@ public class SdVdinfoBServiceImpl extends ServiceImpl impleme CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + } @Override From be1d3d95ffb55044e9e134762e2eeb377eb25e87 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 09:32:47 +0800 Subject: [PATCH 09/20] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=BF=87?= =?UTF-8?q?=E9=B1=BC=E8=AE=BE=E6=96=BD=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yfd/platform/config/SecurityConfig.java | 46 +++++++------- .../controller/SdFpssBHController.java | 22 +++++-- .../platform/qgc_base/domain/SdFpssBH.java | 46 ++++++++++++++ .../qgc_base/service/ISdFpssBHService.java | 8 ++- .../service/impl/SdFpssBHServiceImpl.java | 62 +++++++++++++++++-- .../service/impl/MsAlongBServiceImpl.java | 36 +++++++++-- 6 files changed, 180 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index f32fd789..3fbb007d 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -61,29 +61,29 @@ public class SecurityConfig { .requestMatchers("/tempFile/**").permitAll() .requestMatchers("/system/user/auditUser").permitAll() .requestMatchers("/register/accessToken").permitAll() - .requestMatchers("/eng/**").permitAll() - .requestMatchers("/eq/**").permitAll() - .requestMatchers("/env/**").permitAll() - .requestMatchers("/warn/**").permitAll() - .requestMatchers("/threedroamb/**").permitAll() - .requestMatchers("/overview/**").permitAll() - .requestMatchers("/wt/**").permitAll() - .requestMatchers("/fb/**").permitAll() - .requestMatchers("/base/**").permitAll() - .requestMatchers("/zq/**").permitAll() - .requestMatchers("/wq/**").permitAll() - .requestMatchers("/wte/**").permitAll() - .requestMatchers("/vd/**").permitAll() - .requestMatchers("/vap/**").permitAll() - .requestMatchers("/fp/**").permitAll() - .requestMatchers("/fpr/**").permitAll() - .requestMatchers("/fh/**").permitAll() - .requestMatchers("/data/**").permitAll() - .requestMatchers("/mapLayer/**").permitAll() - .requestMatchers("/mapmodule/**").permitAll() - .requestMatchers("/mapLegend/**").permitAll() - .requestMatchers("/base/msalongb/**").permitAll() - .requestMatchers("/base/msalongdetb/**").permitAll() +// .requestMatchers("/eng/**").permitAll() +// .requestMatchers("/eq/**").permitAll() +// .requestMatchers("/env/**").permitAll() +// .requestMatchers("/warn/**").permitAll() +// .requestMatchers("/threedroamb/**").permitAll() +// .requestMatchers("/overview/**").permitAll() +// .requestMatchers("/wt/**").permitAll() +// .requestMatchers("/fb/**").permitAll() +// .requestMatchers("/base/**").permitAll() +// .requestMatchers("/zq/**").permitAll() +// .requestMatchers("/wq/**").permitAll() +// .requestMatchers("/wte/**").permitAll() +// .requestMatchers("/vd/**").permitAll() +// .requestMatchers("/vap/**").permitAll() +// .requestMatchers("/fp/**").permitAll() +// .requestMatchers("/fpr/**").permitAll() +// .requestMatchers("/fh/**").permitAll() +// .requestMatchers("/data/**").permitAll() +// .requestMatchers("/mapLayer/**").permitAll() +// .requestMatchers("/mapmodule/**").permitAll() +// .requestMatchers("/mapLegend/**").permitAll() +// .requestMatchers("/base/msalongb/**").permitAll() +// .requestMatchers("/base/msalongdetb/**").permitAll() .requestMatchers("/sms/**").permitAll() .requestMatchers(HttpMethod.GET, "/").permitAll() .requestMatchers(HttpMethod.GET, diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java index 9c38b5d1..efbb84c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java @@ -1,8 +1,11 @@ package com.yfd.platform.qgc_base.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; import com.yfd.platform.annotation.Log; +import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; import com.yfd.platform.qgc_base.domain.SdFpssBH; import com.yfd.platform.qgc_base.service.ISdFpssBHService; import io.swagger.v3.oas.annotations.Operation; @@ -22,6 +25,8 @@ public class SdFpssBHController { @Resource private ISdFpssBHService sdFpssBHService; + @Resource + private ObjectMapper objectMapper; @GetMapping("/queryPageList") @Operation(summary = "分页查询过鱼设施列表") @@ -37,6 +42,13 @@ public class SdFpssBHController { return ResponseResult.successData(result); } + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = sdFpssBHService.queryPageList(request); + return ResponseResult.successData(page); + } + @GetMapping("/list") @Operation(summary = "查询所有过鱼设施") public ResponseResult list() { @@ -68,16 +80,18 @@ public class SdFpssBHController { @Log(module = "过鱼设施管理", value = "新增过鱼设施") @PostMapping("/add") @Operation(summary = "新增过鱼设施") - public ResponseResult add(@RequestBody SdFpssBH sdFpssBH) { - boolean result = sdFpssBHService.add(sdFpssBH); + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdFpssBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFpssBH.class); + boolean result = sdFpssBHService.add(entity, request == null ? null : request.getSource()); return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); } @Log(module = "过鱼设施管理", value = "修改过鱼设施") @PostMapping("/update") @Operation(summary = "修改过鱼设施") - public ResponseResult update(@RequestBody SdFpssBH sdFpssBH) { - boolean result = sdFpssBHService.updateById(sdFpssBH); + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdFpssBH entity = request == null || request.getEngInfo() == null ? null : objectMapper.convertValue(request.getEngInfo(), SdFpssBH.class); + boolean result = sdFpssBHService.updateById(entity, request == null ? null : request.getSource()); return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java index 66d4e2e9..eeee4a8a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java @@ -32,6 +32,11 @@ public class SdFpssBH implements Serializable { */ private String stnm; + /** + * 所属水电基地流域编码 + */ + private String hbrvcd; + /** * 数据时间 */ @@ -43,6 +48,17 @@ public class SdFpssBH implements Serializable { */ private String sttp; + @TableField(exist = false) + private String sttpName; + + /** + * 所属基地编码 + */ + private String baseId; + + @TableField(exist = false) + private String baseName; + /** * 所属建设阶段 字典编码：common.blprd * 1001000=规划 1002000=预可研 1003000=环评 1004000=可研 1005000=在建 1006000=招标设计 @@ -80,6 +96,9 @@ public class SdFpssBH implements Serializable { */ private Integer dtin; + @TableField(exist = false) + private String dtinName; + /** * 数据接入时间 */ @@ -95,6 +114,9 @@ public class SdFpssBH implements Serializable { */ private String rstcd; + @TableField(exist = false) + private String ennm; + /** * 规划设计日期 */ @@ -130,6 +152,9 @@ public class SdFpssBH implements Serializable { */ private Integer bldsttCode; + @TableField(exist = false) + private String bldsttCodeName; + /** * 简介 */ @@ -335,6 +360,11 @@ public class SdFpssBH implements Serializable { */ private String gytm; + /** + * 所属测站编码 + */ + private String stCode; + /** * 运行时间 */ @@ -360,11 +390,27 @@ public class SdFpssBH implements Serializable { */ private Integer isUp; + @TableField(exist = false) + private String isUpName; + /** * 设施是否实现鱼类下行 0=否 1=是 */ private Integer isDown; + @TableField(exist = false) + private String isDownName; + + /** + * 监测方式：1=人工 2=自动 + */ + private Integer mway; + + + @TableField(exist = false) + private String mwayName; + + /** * 备注 */ diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java index f9960352..cbcd2fcb 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_base.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdFhbtBH; import com.yfd.platform.qgc_base.domain.SdFpssBH; import java.util.List; @@ -20,11 +22,13 @@ public interface ISdFpssBHService extends IService { Set getUserAuthorizedStationCodes(); - boolean add(SdFpssBH sdFpssBH); + boolean add(SdFpssBH sdFpssBH, String source); - boolean updateById(SdFpssBH sdFpssBH); + boolean updateById(SdFpssBH sdFpssBH, String source); boolean deleteById(String stcd, String sttp); SdFpssBH getDetail(String stcd, String sttp); + + Page queryPageList(DataSourceRequest request); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java index c85ffa59..152ded95 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java @@ -3,14 +3,19 @@ package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yfd.platform.qgc_data.domain.SysUserDataScope; -import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.qgc_base.domain.SdEngInfoBH; import com.yfd.platform.qgc_base.domain.SdFpssBH; import com.yfd.platform.qgc_base.mapper.SdEngInfoBHMapper; import com.yfd.platform.qgc_base.mapper.SdFpssBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; import com.yfd.platform.qgc_base.service.ISdFpssBHService; +import com.yfd.platform.qgc_data.domain.SysUserDataScope; +import com.yfd.platform.qgc_data.mapper.SysUserDataScopeMapper; import com.yfd.platform.system.service.IAdminAuthService; +import com.yfd.platform.utils.CodeToNameMetadataBo; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -25,6 +30,7 @@ import java.util.stream.Collectors; @Service public class SdFpssBHServiceImpl extends ServiceImpl implements ISdFpssBHService { + private static final String TABLE_NAME = "SD_FPSS_B_H"; @Resource private SysUserDataScopeMapper sysUserDataScopeMapper; @Resource @@ -33,6 +39,41 @@ public class SdFpssBHServiceImpl extends ServiceImpl i @Resource private IAdminAuthService adminAuthService; + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + @Resource + private IMsOperationLogService msOperationLogService; + + /** + * 代码转名称元数据配置列表（静态初始化） + *

+ * 每个模块的 ServiceImpl 中可按需定义自己的 codeToNameMetadataBoList， + * 在查询方法返回前调用 dictCodeToNameConverter.convertCodeToName(voList, codeToNameMetadataBoList) + * 即可自动将 code 字段转为对应的 name 字段。 + *

+ * + * 
+     * 使用示例：
+     * // 在查询方法末尾调用：
+     * dictCodeToNameConverter.convertCodeToName(voList, CODE_TO_NAME_META_LIST);
+     *
+ */ + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); +// CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("isUp").modifyProperty("isUpName").dictType("STATIC").dictSource("TY_SF").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("isDown").modifyProperty("isDownName").dictType("STATIC").dictSource("TY_SF").build()); + + } @Override public Page selectPage(String stcd, String sttp, String rstcd, Integer usfl, Page page) { @@ -173,12 +214,16 @@ public class SdFpssBHServiceImpl extends ServiceImpl i } @Override - public boolean add(SdFpssBH sdFpssBH) { - return save(sdFpssBH); + public boolean add(SdFpssBH entity, String source) { + boolean result = save(entity); + if (result) { + msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + } + return result; } @Override - public boolean updateById(SdFpssBH sdFpssBH) { + public boolean updateById(SdFpssBH sdFpssBH, String source) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SdFpssBH::getStcd, sdFpssBH.getStcd()) .eq(SdFpssBH::getSttp, sdFpssBH.getSttp()); @@ -200,4 +245,11 @@ public class SdFpssBHServiceImpl extends ServiceImpl i .eq(SdFpssBH::getSttp, sttp); return getOne(wrapper); } + + @Override + public Page queryPageList(DataSourceRequest request) { + Page sdFpssBHPage = DataSourceRequestUtil.executeQuery(request, SdFpssBH.class, this); + dictCodeToNameConverter.convertCodeToName(sdFpssBHPage, CODE_TO_NAME_META_LIST); + return sdFpssBHPage; + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java index 64647c88..1ffdaba2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java @@ -162,14 +162,26 @@ public class MsAlongBServiceImpl extends ServiceImpl i StringBuilder sql = new StringBuilder("SELECT * FROM SD_STTP_B WHERE NVL(IS_DELETED, 0) = 0"); Map paramMap = new HashMap<>(); - // 解析过滤条件 - if (dataSourceRequest != null && dataSourceRequest.getFilter() != null) { - String filterSql = parseSttpFilter(dataSourceRequest.getFilter(), paramMap, new int[]{0}); - if (StrUtil.isNotBlank(filterSql)) { - sql.append(" AND ").append(filterSql); - } + + String filterSql = QgcQueryWrapperUtil.buildFilterCondition( + dataSourceRequest.getFilter(), + paramMap, + new int[]{0}, + this::mapWeFvColumn + ); + + if (StrUtil.isNotBlank(filterSql)) { + sql.append("AND ").append(filterSql).append(" "); } + // 解析过滤条件 +// if (dataSourceRequest != null && dataSourceRequest.getFilter() != null) { +// String filterSql = parseSttpFilter(dataSourceRequest.getFilter(), paramMap, new int[]{0}); +// if (StrUtil.isNotBlank(filterSql)) { +// sql.append(" AND ").append(filterSql); +// } +// } + // 解析排序 if (dataSourceRequest != null && CollUtil.isNotEmpty(dataSourceRequest.getSort())) { List orderList = new ArrayList<>(); @@ -200,6 +212,18 @@ public class MsAlongBServiceImpl extends ServiceImpl i return result; } + private String mapWeFvColumn(String field) { + if (StrUtil.isBlank(field)) { + return null; + } + return switch (field.toLowerCase()) { + case "sttpcode" -> "STTP_CODE"; + case "lgtd" -> "lgtd"; + default -> null; + }; + } + + /** * 递归解析站类过滤条件 */ From 5425db84e839c5f6cd79e95f943c991126e71a37 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 09:57:44 +0800 Subject: [PATCH 10/20] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=92=8C=E6=96=B0=E5=A2=9E=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SdFpssBHController.java | 15 +++-- .../platform/qgc_base/domain/SdFpssBH.java | 39 ++++++++++++ .../service/IMsOperationLogService.java | 26 ++++++++ .../qgc_base/service/ISdFpssBHService.java | 2 + .../impl/MsOperationLogServiceImpl.java | 63 +++++++++++++++++++ .../service/impl/SdAiboxBHServiceImpl.java | 6 +- .../service/impl/SdArtsgBHServiceImpl.java | 6 +- .../service/impl/SdDwBHServiceImpl.java | 6 +- .../service/impl/SdEqBHServiceImpl.java | 6 +- .../service/impl/SdFbrdBHServiceImpl.java | 5 +- .../service/impl/SdFhbtBHServiceImpl.java | 6 +- .../service/impl/SdFpssBHServiceImpl.java | 39 +++++++++--- .../service/impl/SdOpinfoBHServiceImpl.java | 5 +- .../service/impl/SdOtteBHServiceImpl.java | 5 +- .../service/impl/SdOtweBHServiceImpl.java | 5 +- .../service/impl/SdSonarBHServiceImpl.java | 5 +- .../service/impl/SdTeBHServiceImpl.java | 5 +- .../service/impl/SdVaBHServiceImpl.java | 5 +- .../service/impl/SdVdinfoBServiceImpl.java | 7 +-- .../service/impl/SdVpBHServiceImpl.java | 7 +-- .../service/impl/SdWeBHServiceImpl.java | 7 +-- .../service/impl/SdWqBHServiceImpl.java | 7 +-- .../service/impl/SdWtBHServiceImpl.java | 5 +- .../service/impl/MsAlongBServiceImpl.java | 2 +- 24 files changed, 222 insertions(+), 62 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java index efbb84c1..9089ba20 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdFpssBHController.java @@ -95,11 +95,18 @@ public class SdFpssBHController { return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); } - @Log(module = "过鱼设施管理", value = "删除过鱼设施") +// @Log(module = "过鱼设施管理", value = "删除过鱼设施") +// @PostMapping("/delete") +// @Operation(summary = "删除过鱼设施") +// public ResponseResult delete(@RequestParam String stcd, @RequestParam String sttp) { +// boolean result = sdFpssBHService.deleteById(stcd, sttp); +// return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); +// } + @PostMapping("/delete") - @Operation(summary = "删除过鱼设施") - public ResponseResult delete(@RequestParam String stcd, @RequestParam String sttp) { - boolean result = sdFpssBHService.deleteById(stcd, sttp); + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = sdFpssBHService.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java index eeee4a8a..a1696b68 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java @@ -4,6 +4,7 @@ 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 lombok.Data; import java.io.Serializable; @@ -425,4 +426,42 @@ public class SdFpssBH implements Serializable { * 数据来源时间 */ private Date vlsrTm; + + /** + * 创建人 + */ + private String recordUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + /** + * 更新人 + */ + private String modifyUser; + + /** + * 更新时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + /** + * 是否已删除 + */ + private Integer isDeleted; + + /** + * 删除人 + */ + private String deleteUser; + + /** + * 删除时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java index 85c9882a..203aae65 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsOperationLogService.java @@ -32,4 +32,30 @@ public interface IMsOperationLogService { * @param 实体类型 */ void recordModifyDetailLog(String tableName, T before, T after, String source); + + /** + * 通用新增操作详情日志（含字段级详情） + *

+ * 通过反射遍历实体所有非空字段，将每个字段值 + * 记录为一条操作日志详情。 + *

+ * @param tableName 表名 + * @param entity 新增的实体 + * @param source 操作来源 + * @param 实体类型 + */ + void recordAddDetailLog(String tableName, T entity, String source); + + /** + * 通用删除操作详情日志（含字段级详情） + *

+ * 通过反射遍历实体所有非空字段，将每个被删除的字段值 + * 记录为一条操作日志详情。 + *

+ * @param tableName 表名 + * @param entity 被删除的实体 + * @param source 操作来源 + * @param 实体类型 + */ + void recordDeleteDetailLog(String tableName, T entity, String source); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java index cbcd2fcb..d3009d7f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdFpssBHService.java @@ -31,4 +31,6 @@ public interface ISdFpssBHService extends IService { SdFpssBH getDetail(String stcd, String sttp); Page queryPageList(DataSourceRequest request); + + boolean delete(List stcds, String source); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java index b4854359..9067a8dd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsOperationLogServiceImpl.java @@ -438,6 +438,69 @@ public class MsOperationLogServiceImpl implements IMsOperationLogService { batchInsertDetails(details); } + @Override + public void recordAddDetailLog(String tableName, T entity, String source) { + if (entity == null) { + return; + } + String recordId = getStcd(entity); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "新增", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = entity.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + Object newValue = getFieldValue(field, entity); + details.add(buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + null, newValue, "新增字段值")); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + + @Override + public void recordDeleteDetailLog(String tableName, T entity, String source) { + if (entity == null) { + return; + } + String recordId = getStcd(entity); + MsOperationLog mainLog = buildMainLog(tableName, recordId, "删除", source); + msOperationLogMapper.insert(mainLog); + + List details = new ArrayList<>(); + Set processedColumns = new HashSet<>(); + Class entityClass = entity.getClass(); + + for (Field field : entityClass.getDeclaredFields()) { + if (shouldSkipField(field)) { + continue; + } + field.setAccessible(true); + String columnName = resolveColumnName(field); + if (processedColumns.contains(columnName)) { + continue; + } + Object oldValue = getFieldValue(field, entity); +// if (oldValue == null) { +// continue; +// } + details.add(buildGenericDetail(mainLog.getId(), tableName, recordId, columnName, + oldValue, null, "删除字段值")); + processedColumns.add(columnName); + } + batchInsertDetails(details); + } + private MsOperationLogDetail buildDetail(String mainId, String stationCode, String fieldCode, diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java index 0169a429..37e13342 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAiboxBHServiceImpl.java @@ -71,7 +71,7 @@ public class SdAiboxBHServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java index 6d3e6087..9c25ab10 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdArtsgBHServiceImpl.java @@ -66,7 +66,7 @@ public class SdArtsgBHServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java index 0688aee9..04109a2f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdDwBHServiceImpl.java @@ -68,7 +68,7 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme public boolean add(SdDwBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -96,8 +96,8 @@ public class SdDwBHServiceImpl extends ServiceImpl impleme wrapper.set(SdDwBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdDwBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdDwBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java index 23bf1859..bda41c3b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEqBHServiceImpl.java @@ -68,7 +68,7 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme public boolean add(SdEqBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -96,8 +96,8 @@ public class SdEqBHServiceImpl extends ServiceImpl impleme wrapper.set(SdEqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdEqBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdEqBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java index fefa8f9b..36f8caa5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFbrdBHServiceImpl.java @@ -65,7 +65,7 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i public boolean add(SdFbrdBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -88,7 +88,8 @@ public class SdFbrdBHServiceImpl extends ServiceImpl i int count = 0; for (String stcd : stcds) { if (this.removeById(stcd)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdFbrdBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java index 407806d9..c61dd69a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFhbtBHServiceImpl.java @@ -69,7 +69,7 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i public boolean add(SdFhbtBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -97,8 +97,8 @@ public class SdFhbtBHServiceImpl extends ServiceImpl i wrapper.set(SdFhbtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdFhbtBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdFhbtBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java index 152ded95..99528a60 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdFpssBHServiceImpl.java @@ -1,6 +1,7 @@ package com.yfd.platform.qgc_base.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceRequest; @@ -21,10 +22,7 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Service @@ -217,17 +215,20 @@ public class SdFpssBHServiceImpl extends ServiceImpl i public boolean add(SdFpssBH entity, String source) { boolean result = save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); +// msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @Override - public boolean updateById(SdFpssBH sdFpssBH, String source) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SdFpssBH::getStcd, sdFpssBH.getStcd()) - .eq(SdFpssBH::getSttp, sdFpssBH.getSttp()); - return update(sdFpssBH, wrapper); + public boolean updateById(SdFpssBH entity, String source) { + SdFpssBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); + } + return result; } @Override @@ -252,4 +253,22 @@ public class SdFpssBHServiceImpl extends ServiceImpl i dictCodeToNameConverter.convertCodeToName(sdFpssBHPage, CODE_TO_NAME_META_LIST); return sdFpssBHPage; } + + @Override + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdFpssBH::getStcd, stcd); + wrapper.set(SdFpssBH::getIsDeleted, 1); + wrapper.set(SdFpssBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdFpssBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + SdFpssBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; + } + } + return count > 0; + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java index a696f953..c6eb7fc2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOpinfoBHServiceImpl.java @@ -69,7 +69,7 @@ public class SdOpinfoBHServiceImpl extends ServiceImpl i public boolean add(SdOtteBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -90,7 +90,8 @@ public class SdOtteBHServiceImpl extends ServiceImpl i int count = 0; for (String stcd : stcds) { if (this.removeById(stcd)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdOtteBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java index 00b87e2d..4a3a4516 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdOtweBHServiceImpl.java @@ -66,7 +66,7 @@ public class SdOtweBHServiceImpl extends ServiceImpl i public boolean add(SdOtweBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -89,7 +89,8 @@ public class SdOtweBHServiceImpl extends ServiceImpl i int count = 0; for (String stcd : stcds) { if (this.removeById(stcd)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdOtweBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java index 2ce05e0e..4b48a182 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdSonarBHServiceImpl.java @@ -70,7 +70,7 @@ public class SdSonarBHServiceImpl extends ServiceImpl impleme public boolean add(SdTeBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -89,7 +89,8 @@ public class SdTeBHServiceImpl extends ServiceImpl impleme int count = 0; for (String stcd : stcds) { if (this.removeById(stcd)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdTeBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java index 992d4536..5be94d58 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVaBHServiceImpl.java @@ -67,7 +67,7 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme public boolean add(SdVaBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -95,7 +95,8 @@ public class SdVaBHServiceImpl extends ServiceImpl impleme wrapper.set(SdVaBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdVaBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdVaBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 2b01dd72..6d431473 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -66,8 +66,7 @@ public class SdVdinfoBServiceImpl extends ServiceImpl 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java index 57480536..5ae15e39 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVpBHServiceImpl.java @@ -67,8 +67,7 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme public boolean add(SdVpBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); - } + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -95,8 +94,8 @@ public class SdVpBHServiceImpl extends ServiceImpl impleme wrapper.set(SdVpBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdVpBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdVpBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java index 171d91b5..b0ca0a7e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWeBHServiceImpl.java @@ -68,8 +68,7 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme public boolean add(SdWeBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); - } + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -91,8 +90,8 @@ public class SdWeBHServiceImpl extends ServiceImpl impleme int count = 0; for (String stcd : stcds) { if (this.removeById(stcd)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdWeBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index 0f7bb30c..c9ec411f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -69,8 +69,7 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme public boolean add(SdWqBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); - } + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -97,8 +96,8 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme wrapper.set(SdWqBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdWqBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); - count++; + SdWqBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } return count > 0; diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java index ac2e140c..b7e4838b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWtBHServiceImpl.java @@ -72,7 +72,7 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme public boolean add(SdWtBH entity, String source) { boolean result = this.save(entity); if (result) { - msOperationLogService.recordOperationLog(TABLE_NAME, entity.getStcd(), "新增", source); + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); } return result; } @@ -100,7 +100,8 @@ public class SdWtBHServiceImpl extends ServiceImpl impleme wrapper.set(SdWtBH::getDeleteUser, SecurityUtils.getCurrentUsername()); wrapper.set(SdWtBH::getDeleteTime, new Date()); if (this.update(wrapper)) { - msOperationLogService.recordOperationLog(TABLE_NAME, stcd, "删除", source); + SdWtBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); count++; } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java index 1ffdaba2..50a58573 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_lygk/along/service/impl/MsAlongBServiceImpl.java @@ -171,7 +171,7 @@ public class MsAlongBServiceImpl extends ServiceImpl i ); if (StrUtil.isNotBlank(filterSql)) { - sql.append("AND ").append(filterSql).append(" "); + sql.append(" AND ").append(filterSql).append(" "); } // 解析过滤条件 From 8a6c319933941a80490551b0fd4a8e06d3bb168e Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 10:20:25 +0800 Subject: [PATCH 11/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_base/domain/SdFhbtBH.java | 6 ++-- .../yfd/platform/qgc_base/domain/SdWqBH.java | 3 ++ .../service/impl/SdWqBHServiceImpl.java | 1 + .../impl/MsThreedRoamMServiceImpl.java | 30 +++++++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java index 28a3cc1b..b42b0282 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFhbtBH.java @@ -179,12 +179,12 @@ public class SdFhbtBH implements Serializable { /** * 保护河流 */ - private Integer bhhl; + private String bhhl; /** * 保护河道 */ - private Integer bhhd; + private String bhhd; /** * 保护措施 @@ -224,7 +224,7 @@ public class SdFhbtBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java index 10dd07e4..2ff8c41d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -39,6 +39,9 @@ public class SdWqBH implements Serializable { private String wwqtg; + @TableField(exist = false) + private String wwqtgName; + private String wqtype; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java index c9ec411f..cb5fd299 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdWqBHServiceImpl.java @@ -51,6 +51,7 @@ public class SdWqBHServiceImpl extends ServiceImpl impleme CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("wwqtg").modifyProperty("wwqtgName").dictType("STATIC").dictSource("WWQTG").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtinType").modifyProperty("dtinTypeName").dictType("STATIC").dictSource("DTIN_TYPE").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java index e7602266..ccd38999 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java @@ -67,8 +67,8 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake()); List list = microservicDynamicSQLMapper.pageAllListWithResultType( @@ -82,6 +82,31 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl sorts) { + if (CollUtil.isEmpty(sorts)) { + return " ORDER BY r.tm DESC NULLS LAST, r.stcd ASC, r.name ASC"; + } + List orderByParts = new ArrayList<>(); + for (DataSourceRequest.SortDescriptor sort : sorts) { + if (sort == null || StrUtil.isBlank(sort.getField())) { + continue; + } + String column = mapToListColumn(sort.getField()); + if (StrUtil.isBlank(column)) { + continue; + } + String direction = "desc".equalsIgnoreCase(sort.getDir()) ? "DESC" : "ASC"; + orderByParts.add(column + " " + direction + " NULLS LAST"); + } + if (orderByParts.isEmpty()) { + return " ORDER BY r.tm DESC NULLS LAST, r.stcd ASC, r.name ASC"; + } + return " ORDER BY " + String.join(", ", orderByParts); + } + + + /** * 递归构建过滤 SQL */ @@ -141,6 +166,7 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl "a.NAME"; case "rvcd" -> "a.RVCD"; case "remark" -> "a.REMARK"; + case "modifyTime" -> "a.MODIFY_TIME"; default -> null; }; } From ac1498b4b2a371ca83d43d088fa1d7619ef30fee Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 10:25:43 +0800 Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../threedRoam/service/impl/MsThreedRoamMServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java index ccd38999..ce7790eb 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java @@ -85,7 +85,7 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl sorts) { if (CollUtil.isEmpty(sorts)) { - return " ORDER BY r.tm DESC NULLS LAST, r.stcd ASC, r.name ASC"; + return " ORDER BY a.CODE ASC"; } List orderByParts = new ArrayList<>(); for (DataSourceRequest.SortDescriptor sort : sorts) { @@ -100,7 +100,7 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl "a.RVCD"; case "remark" -> "a.REMARK"; case "modifyTime" -> "a.MODIFY_TIME"; + case "recordTime" -> "a.RECORD_TIME"; default -> null; }; } From 777571930c042f813772eb91925fa642d0b32d8c Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 11:28:35 +0800 Subject: [PATCH 13/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=85=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_base/domain/SdFbrdBH.java | 4 +-- .../platform/qgc_base/domain/SdOpinfoBH.java | 8 +++++ .../impl/MsThreedRoamMServiceImpl.java | 30 ++++++++++++++----- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java index 3c418154..139ddff5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFbrdBH.java @@ -198,7 +198,7 @@ public class SdFbrdBH implements Serializable { /** * 增殖放流工艺 */ - private BigDecimal zzflgy; + private String zzflgy; /** * 增殖放流鱼种描述 @@ -259,7 +259,7 @@ public class SdFbrdBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index 68921b4d..a519b50a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -218,4 +218,12 @@ public class SdOpinfoBH implements Serializable { @TableField("DELETE_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date deleteTime; + + /** 所属站类全路径（非数据库字段） */ + @TableField(exist = false) + private String sttpFullPath; + + /** 所属站类层级（非数据库字段） */ + @TableField(exist = false) + private Integer sttpTreeLevel; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java index ce7790eb..09604787 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java @@ -266,6 +266,10 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl 0; } + + /** 时间缩放系数 */ + private static final BigDecimal TIME_SCALE = new BigDecimal("0.2"); + @Override public MsThreedRoamBVO getThreedRoamData(DataSourceRequest dataSourceRequest) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest.toDevRequest(); @@ -282,22 +286,34 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl threedRoamList = msThreedRoamMapper.selectList(wrapper); - BigDecimal totalTime = BigDecimal.ZERO; - List lists = new ArrayList<>(); - String baseCode = ""; + if (CollUtil.isEmpty(threedRoamList)) { + MsThreedRoamBVO empty = new MsThreedRoamBVO(); + empty.setList(Collections.emptyList()); + empty.setTotalTime(BigDecimal.ZERO); + empty.setCode(""); + empty.setMilestoneList(Collections.emptyList()); + return empty; + } + + int size = threedRoamList.size(); + // 每条记录输出4个元素（总时间+经度+纬度+高程），预分配避免扩容 + List lists = new ArrayList<>(size * 4); List milestoneList = new ArrayList<>(); - List stcdList = new ArrayList<>(); + // HashSet O(1) 去重，避免 ArrayList.contains() 的 O(n) 查找 + Set stcdSet = new HashSet<>(); + + BigDecimal totalTime = BigDecimal.ZERO; + String baseCode = ""; for (MsThreedRoamEntity detail : threedRoamList) { - totalTime = totalTime.add(detail.getTime().multiply(new BigDecimal("0.2"))); + totalTime = totalTime.add(detail.getTime().multiply(TIME_SCALE)); lists.add(totalTime); lists.add(detail.getLgtd()); lists.add(detail.getLttd()); lists.add(detail.getDtmel()); baseCode = detail.getCode(); - if (StrUtil.isNotBlank(detail.getStcd()) && !stcdList.contains(detail.getStnm())) { - stcdList.add(detail.getStnm()); + if (StrUtil.isNotBlank(detail.getStcd()) && stcdSet.add(detail.getStnm())) { milestoneList.add(new String[]{detail.getStnm(), totalTime.toString()}); } } From dc61620464af1c75069d21c8e4a934a2766ad72f Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 11:34:11 +0800 Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java | 5 +++-- .../java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java | 5 +++-- .../java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java | 5 +++-- .../com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java | 5 +++-- .../yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java | 5 +++-- .../yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java | 4 ++-- .../platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java | 5 +++-- .../com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java | 4 ++-- .../yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java | 5 +++-- .../yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java | 6 ++++-- .../qgc_env/fpr/service/impl/FprMonitorServiceImpl.java | 4 ++-- .../qgc_env/overview/entity/vo/OverviewMsstbprptVo.java | 5 +++-- .../platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java | 6 ++++-- .../yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java | 4 ++-- .../com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java | 6 ++++-- .../com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java | 5 +++-- .../yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java | 5 +++-- .../com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java | 4 ++-- .../com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java | 5 +++-- .../qgc_sys/obliqueImage/domain/MsObliqueImageB.java | 5 +++-- 20 files changed, 58 insertions(+), 40 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java index 69223c3e..813addef 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAddvcdDic.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; /** *

@@ -54,12 +55,12 @@ public class SdAddvcdDic implements Serializable { /** * 中心经度 */ - private Double lgtd; + private BigDecimal lgtd; /** * 中心纬度 */ - private Double lttd; + private BigDecimal lttd; /** * 面积 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java index a34a36ae..464ddc2f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBH.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -48,12 +49,12 @@ public class SdEngInfoBH implements Serializable { /** * 位置经度。单位：(°) */ - private Double lgtd; + private BigDecimal lgtd; /** * 位置纬度。单位：(°) */ - private Double lttd; + private BigDecimal lttd; /** * 高程。单位：m diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java index 53178c88..4ceb5cb2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdRvcdDic.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -54,12 +55,12 @@ public class SdRvcdDic implements Serializable { /** * 经度 */ - private Double lgtd; + private BigDecimal lgtd; /** * 纬度 */ - private Double lttd; + private BigDecimal lttd; /** * 面积 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java index 4ccc4736..ca7f29c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java @@ -2,6 +2,7 @@ package com.yfd.platform.qgc_base.domain.vo; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -35,9 +36,9 @@ public class EngRsvrcscdBVo { private Integer isDeleted; - private Double lgtd; + private BigDecimal lgtd; - private Double lttd; + private BigDecimal lttd; private String stlc; } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java index 28c657ee..0554dae5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngVmsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -32,8 +33,8 @@ public class EngVmsstbprptVo implements Serializable { private String hycd; private String topHycd; private String stlc; - private Double lgtd; - private Double lttd; + private BigDecimal lgtd; + private BigDecimal lttd; private Date jcdt; private Date piodt; private Date aiodt; diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java index b87da039..69a378d2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_data/domain/vo/FishDraftDataVO.java @@ -210,12 +210,12 @@ public class FishDraftDataVO implements Serializable { /** * 电站经度（电站表） */ - private Double lgtd; + private BigDecimal lgtd; /** * 电站纬度（电站表） */ - private Double lttd; + private BigDecimal lttd; /** * 排序字段 diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java index e90510ac..f998dd54 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/entity/vo/EngEqBaseMsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -46,10 +47,10 @@ public class EngEqBaseMsstbprptVo implements Serializable { private String stlc; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java index 93105dc0..e10c44cd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fh/entity/vo/FhBaseInfoVo.java @@ -23,10 +23,10 @@ public class FhBaseInfoVo { private Integer blprd; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java index 3482b334..be4a6d52 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprMsstbprptVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.fpr.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -40,10 +41,10 @@ public class FprMsstbprptVo { private Date tm; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "高程") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java index 81ea189f..6ac7036b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/entity/vo/FprdPointInfoVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.fpr.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class FprdPointInfoVo { @@ -15,9 +17,9 @@ public class FprdPointInfoVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java index 6a55e3c3..30bbd928 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/service/impl/FprMonitorServiceImpl.java @@ -216,8 +216,8 @@ public class FprMonitorServiceImpl implements FprMonitorService { SiteAvoidanceUtils.calcSiteMapLev(resultList, FprdPointInfoVo::getStcd, - vo -> vo.getLgtd() != null ? java.math.BigDecimal.valueOf(vo.getLgtd()) : null, - vo -> vo.getLttd() != null ? java.math.BigDecimal.valueOf(vo.getLttd()) : null, + vo -> vo.getLgtd() != null ? vo.getLgtd() : null, + vo -> vo.getLttd() != null ? vo.getLttd() : null, FprdPointInfoVo::getAnchoPointState, FprdPointInfoVo::setDistance ); diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java index effa1e33..dd7732c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/overview/entity/vo/OverviewMsstbprptVo.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -21,8 +22,8 @@ public class OverviewMsstbprptVo implements Serializable { private String sttpFullPath; private Integer sttpTreeLevel; private String blprdId; - private Double lgtd; - private Double lttd; + private BigDecimal lgtd; + private BigDecimal lttd; private Double dtmel; private String stlc; private Integer usfl; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java index f71df8e4..5f4d8c60 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/FhvapBuiltPointVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.vap.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class FhvapBuiltPointVo { @@ -15,9 +17,9 @@ public class FhvapBuiltPointVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java index 12bbfcad..5d099b80 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/VpVmsstbprptVo.java @@ -62,10 +62,10 @@ public class VpVmsstbprptVo implements Serializable { private Integer sttpTreeLevel; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "站址") private String stlc; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java index ac2802b5..b6bbb8f2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/vap/entity/vo/WvaPointVo.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_env.vap.entity.vo; import lombok.Data; +import java.math.BigDecimal; + @Data public class WvaPointVo { @@ -17,9 +19,9 @@ public class WvaPointVo { private String bldstt; - private Double lttd; + private BigDecimal lttd; - private Double lgtd; + private BigDecimal lgtd; private Double dtmel; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java index 0fc81648..afda0eb0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wq/entity/vo/WqBaseInfoVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.wq.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -22,10 +23,10 @@ public class WqBaseInfoVo { private String sttp; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "海拔") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java index 18561f8f..adbd1315 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/SdWtBaseInfoVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; @Data @@ -99,8 +100,8 @@ public class SdWtBaseInfoVO implements Serializable { private String hbrvcdName; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java index 37d0f22f..8acf3809 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtBaseInfoVo.java @@ -23,10 +23,10 @@ public class WtBaseInfoVo { private String sttp; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "海拔") private Double elev; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java index ed88d45b..2a666002 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/zq/entity/vo/ZqBaseInfoVo.java @@ -3,6 +3,7 @@ package com.yfd.platform.qgc_env.zq.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -25,10 +26,10 @@ public class ZqBaseInfoVo { private String sttpCode; @Schema(description = "经度") - private Double lgtd; + private BigDecimal lgtd; @Schema(description = "纬度") - private Double lttd; + private BigDecimal lttd; @Schema(description = "水温设备类型") private Integer wtDeviceType; diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java index d3ea5efd..9c545c74 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -91,11 +92,11 @@ public class MsObliqueImageB implements Serializable { /** 电站经度（非数据库字段） */ @TableField("LGTD") - private Double lgtd; + private BigDecimal lgtd; /** 电站纬度（非数据库字段） */ @TableField("LTTD") - private Double lttd; + private BigDecimal lttd; /** 电站坐标JSON串 */ @TableField("LOCATION") From 690896627197f6ec25a499931c87d6ac037f86bd Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 11:39:29 +0800 Subject: [PATCH 15/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java | 2 +- .../main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java | 2 +- .../src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java index 5eb838d0..8edd3ef0 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAiboxBH.java @@ -220,7 +220,7 @@ public class SdAiboxBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java index 5786f368..5bdeb096 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdArtsgBH.java @@ -230,7 +230,7 @@ public class SdArtsgBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java index 6dff3306..81adf7a5 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdDwBH.java @@ -313,7 +313,7 @@ public class SdDwBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java index 642b1382..1bfffc83 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEqBH.java @@ -268,7 +268,7 @@ public class SdEqBH implements Serializable { /** * 植被覆盖类型 */ - private BigDecimal vlsr; + private String vlsr; /** * 植被覆盖调查时间 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index a519b50a..dff3466c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -189,7 +189,7 @@ public class SdOpinfoBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java index 86be9e6f..f38789f6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtteBH.java @@ -114,7 +114,7 @@ public class SdOtteBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java index cae415b2..7c162c2e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOtweBH.java @@ -116,7 +116,7 @@ public class SdOtweBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java index 5e6da073..a775f3ab 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdSonarBH.java @@ -105,7 +105,7 @@ public class SdSonarBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java index ee42bb57..ebf5402b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdTeBH.java @@ -112,7 +112,7 @@ public class SdTeBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java index 4faf5481..3b0d445a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVaBH.java @@ -118,7 +118,7 @@ public class SdVaBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index a993fcdf..3865d5c1 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -186,7 +186,7 @@ public class SdVdinfoB implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java index 4f25906b..fdb7b945 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVpBH.java @@ -119,7 +119,7 @@ public class SdVpBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java index df1891c8..f3014353 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWeBH.java @@ -109,7 +109,7 @@ public class SdWeBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java index 2ff8c41d..043e6df2 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWqBH.java @@ -113,7 +113,7 @@ public class SdWqBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java index 95376f97..8bef14a8 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdWtBH.java @@ -125,7 +125,7 @@ public class SdWtBH implements Serializable { private String remark; - private BigDecimal vlsr; + private String vlsr; @TableField("VLSR_TM") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") From fd07f94f9872a67e7ddeabd2668f8a63dae9d905 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 14:00:27 +0800 Subject: [PATCH 16/20] =?UTF-8?q?fix:=20=E6=B0=94=E8=B1=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2&=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_env/wte/service/impl/WeFishServiceImpl.java | 3 ++- .../threedRoam/service/impl/MsThreedRoamMServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java index c8faf6af..78834cd4 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/wte/service/impl/WeFishServiceImpl.java @@ -5358,7 +5358,8 @@ public class WeFishServiceImpl implements WeFishService { Map paramMap = new HashMap<>(); sql.append("SELECT COUNT(1) AS cnt FROM SD_MM_B_H mm ") .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = mm.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") - .append("WHERE NVL(mm.IS_DELETED, 0) = 0 ") + .append("WHERE 1=1 ") +// .append("AND NVL(mm.IS_DELETED, 0) = 0 ") .append("AND mm.STTP = 'MM' ") .append("AND NVL(mm.MWAY, 0) = 2 "); appendWeEnvmBaseIdCondition(sql, paramMap, "eng.BASE_ID", baseId); diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java index 09604787..fbef37ff 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/service/impl/MsThreedRoamMServiceImpl.java @@ -23,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -48,6 +49,7 @@ public class MsThreedRoamMServiceImpl extends ServiceImpl getKendoListCustReturn(DataSourceRequest dataSourceRequest) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); From 7650d20e1333ed821d11cedf7ee38da4b81ecc57 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 14:52:45 +0800 Subject: [PATCH 17/20] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=80=BE?= =?UTF-8?q?=E6=96=9C=E6=91=84=E5=BD=B1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/qgc_base/domain/SdOpinfoBH.java | 18 +- .../service/impl/SdVdinfoBServiceImpl.java | 5 + .../controller/MsObliqueImageBController.java | 25 +- .../obliqueImage/domain/MsObliqueImageB.java | 152 --------- .../mapper/MsObliqueImageBMapper.java | 16 +- .../service/IMsObliqueImageBService.java | 21 +- .../impl/MsObliqueImageBServiceImpl.java | 302 +++++++++++------- 7 files changed, 238 insertions(+), 301 deletions(-) delete mode 100644 backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java index dff3466c..b71e9983 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdOpinfoBH.java @@ -2,6 +2,8 @@ package com.yfd.platform.qgc_base.domain; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yfd.platform.annotation.UserIdField; +import com.yfd.platform.annotation.UserNameField; import lombok.Data; import java.io.Serializable; @@ -63,6 +65,9 @@ public class SdOpinfoBH implements Serializable { private String hbrvcd; + @TableField(exist = false) + private String hbrvcdName; + private String rvcd; @TableField(exist = false) @@ -195,9 +200,6 @@ public class SdOpinfoBH implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date vlsrTm; - @TableField("RECORD_USER") - private String recordUser; - @TableField("RECORD_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date recordTime; @@ -226,4 +228,14 @@ public class SdOpinfoBH implements Serializable { /** 所属站类层级（非数据库字段） */ @TableField(exist = false) private Integer sttpTreeLevel; + + /** 创建人 */ + @TableField("RECORD_USER") + @UserIdField + private String recordUser; + + /** 创建人名称（非数据库字段） */ + @TableField(exist = false) + @UserNameField + private String recordUserName; } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 6d431473..e5599d34 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -1,5 +1,6 @@ package com.yfd.platform.qgc_base.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceRequest; @@ -64,6 +65,10 @@ public class SdVdinfoBServiceImpl extends ServiceImpl基于 SD_OPINFO_B_H 表，管理 STTP = 'OSGB' 的倾斜摄影数据

* * @author migration */ @@ -25,37 +27,40 @@ public class MsObliqueImageBController { @Resource private IMsObliqueImageBService msObliqueImageBService; + @Resource + private UserNameFillHelper userNameFillHelper; + /** * 条件过滤数据列表 */ @Operation(summary = "条件过滤数据列表") @PostMapping("/GetKendoListCust") public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { - DataSourceResult result = msObliqueImageBService.getKendoList(dataSourceRequest); + DataSourceResult result = msObliqueImageBService.getKendoList(dataSourceRequest); + userNameFillHelper.fillUserNames(result.getData()); return ResponseResult.successData(result); } - /** * 新增或修改 */ @Operation(summary = "新增或修改") @PostMapping("/addOrUpdate") - public ResponseResult addOrUpdate(@RequestBody MsObliqueImageB msObliqueImageB) { - msObliqueImageBService.addOrUpdate(msObliqueImageB); + public ResponseResult addOrUpdate(@RequestBody SdOpinfoBH entity) { + msObliqueImageBService.addOrUpdate(entity); return ResponseResult.success(); } /** - * 删除 + * 逻辑删除（id 即 stcd） */ @Operation(summary = "删除") @GetMapping("/delete") - public ResponseResult delete(@RequestParam("id") String id) { - if (StrUtil.isBlank(id)) { + public ResponseResult delete(@RequestParam("stcd") String stcd) { + if (StrUtil.isBlank(stcd)) { throw new BizException("ID不能为空"); } - msObliqueImageBService.delete(id); + msObliqueImageBService.delete(stcd); return ResponseResult.success(); } -} \ No newline at end of file +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java deleted file mode 100644 index 9c545c74..00000000 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/domain/MsObliqueImageB.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.yfd.platform.qgc_sys.obliqueImage.domain; - -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 io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 倾斜摄影管理实体类 - * - * @author migration - */ -@Data -@TableName("MS_OBL_PHOTO") -@Schema(description = "倾斜摄影管理实体类") -public class MsObliqueImageB implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(type = IdType.ASSIGN_UUID) - private String id; - - /** 站码 */ - @TableField("STCD") - private String stcd; - - /** 站名 */ - @TableField("STNM") - private String stnm; - - /** 所属站类ID */ - @TableField("STTP") - private String sttp; - - /** 所属站类编码 */ - @TableField("STTP_CODE") - private String sttpCode; - - /** 所属站类名称 */ - @TableField("STTP_NAME") - private String sttpName; - - /** 所属站类全路径（非数据库字段） */ - @TableField(exist = false) - private String sttpFullPath; - - /** 所属站类层级（非数据库字段） */ - @TableField(exist = false) - private Integer sttpTreeLevel; - - /** 所属水电基地编码 */ - @TableField("BASE_ID") - private String baseId; - - /** 所属水电基地名称 */ - @TableField("BASE_NAME") - private String baseName; - - /** 所属流域编码 */ - @TableField("HBRVCD") - private String hbrvcd; - - /** 所属流域名称 */ - @TableField("HBRVCD_NAME") - private String hbrvcdName; - - /** 所属河段编码（非数据库字段，与HBRVCD同源） */ - @TableField(exist = false) - private String rvcd; - - /** 所属河段名称（非数据库字段，与HBRVCD_NAME同源） */ - @TableField(exist = false) - private String rvcdName; - - /** 在线地址 */ - @TableField("URL") - private String url; - - /** 所属电站编码 */ - @TableField("RSTCD") - private String rstcd; - - /** 所属电站名称 */ - @TableField("ENNM") - private String ennm; - - /** 电站经度（非数据库字段） */ - @TableField("LGTD") - private BigDecimal lgtd; - - /** 电站纬度（非数据库字段） */ - @TableField("LTTD") - private BigDecimal lttd; - - /** 电站坐标JSON串 */ - @TableField("LOCATION") - private String location; - - /** 模型精度 */ - @TableField("ACCURACY") - private Integer accuracy; - - /** 边界范围 */ - @TableField("BOUNDARY") - private String boundary; - - /** 自定义高程 */ - @TableField("HEIGHT") - private Integer height; - - /** 备注 */ - @TableField("COMMENTS") - private String comments; - - /** 创建人 */ - @TableField("RECORD_USER") - private String recordUser; - - /** 创建人名称（非数据库字段） */ - @TableField(exist = false) - private String recordUserName; - - /** 创建时间（非数据库字段） */ - @TableField(exist = false) - private Date recordTime; - - /** 更新人 */ - @TableField("MODIFY_USER") - private String modifyUser; - - /** 更新时间 */ - @TableField("MODIFY_TIME") - private Date modifyTime; - - /** 是否已删除：0=未删除 1=已删除 */ - @TableField("IS_DELETED") - private Integer isDeleted; - - /** 删除人 */ - @TableField("DELETE_USER") - private String deleteUser; - - /** 删除时间 */ - @TableField("DELETE_TIME") - private Date deleteTime; -} \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/mapper/MsObliqueImageBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/mapper/MsObliqueImageBMapper.java index 7e527915..8629be31 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/mapper/MsObliqueImageBMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/mapper/MsObliqueImageBMapper.java @@ -1,11 +1,8 @@ package com.yfd.platform.qgc_sys.obliqueImage.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yfd.platform.qgc_sys.obliqueImage.domain.MsObliqueImageB; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; import org.apache.ibatis.annotations.Mapper; - -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -14,11 +11,8 @@ import org.apache.ibatis.annotations.Select; * @author migration */ @Mapper -public interface MsObliqueImageBMapper extends BaseMapper { +public interface MsObliqueImageBMapper extends BaseMapper { - @Delete("DELETE FROM MS_OBL_PHOTO WHERE ID = #{id}") - void deleteById(@Param("id") String id); - - @Select("SELECT ID FROM SD_STTP_B WHERE STTP_CODE = 'OSGB'") - String getSttp(); -} \ No newline at end of file + @Select("SELECT STTP_CODE FROM SD_STTP_B WHERE STTP_CODE = 'OSGB' AND NVL(IS_DELETED, 0) = 0") + String getOpgbSttpId(); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/IMsObliqueImageBService.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/IMsObliqueImageBService.java index 9f95d550..90490722 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/IMsObliqueImageBService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/IMsObliqueImageBService.java @@ -3,34 +3,27 @@ package com.yfd.platform.qgc_sys.obliqueImage.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; -import com.yfd.platform.qgc_sys.obliqueImage.domain.MsObliqueImageB; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; /** * 倾斜摄影管理 Service 接口 * * @author migration */ -public interface IMsObliqueImageBService extends IService { +public interface IMsObliqueImageBService extends IService { /** * 条件过滤数据列表（Kendo 数据源） - * - * @param dataSourceRequest 数据源请求 - * @return 数据源结果 */ - DataSourceResult getKendoList(DataSourceRequest dataSourceRequest); + DataSourceResult getKendoList(DataSourceRequest dataSourceRequest); /** * 新增或修改 - * - * @param msObliqueImageB 倾斜摄影实体 */ - void addOrUpdate(MsObliqueImageB msObliqueImageB); + void addOrUpdate(SdOpinfoBH entity); /** - * 删除 - * - * @param id 主键ID + * 逻辑删除 */ - void delete(String id); -} \ No newline at end of file + void delete(String stcd); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/impl/MsObliqueImageBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/impl/MsObliqueImageBServiceImpl.java index a5686be2..a57bc793 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/impl/MsObliqueImageBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/obliqueImage/service/impl/MsObliqueImageBServiceImpl.java @@ -1,38 +1,37 @@ package com.yfd.platform.qgc_sys.obliqueImage.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yfd.platform.common.DataSourceLoadOptionsBase; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; +import com.yfd.platform.common.MicroservicDynamicSQLMapper; import com.yfd.platform.common.exception.BizException; import com.yfd.platform.qgc_base.domain.SdEngInfoBH; +import com.yfd.platform.qgc_base.domain.SdOpinfoBH; import com.yfd.platform.qgc_base.service.ISdEngInfoBHService; -import com.yfd.platform.qgc_sys.obliqueImage.domain.MsObliqueImageB; import com.yfd.platform.qgc_sys.obliqueImage.mapper.MsObliqueImageBMapper; import com.yfd.platform.qgc_sys.obliqueImage.service.IMsObliqueImageBService; -import com.yfd.platform.utils.DataSourceRequestUtil; import com.yfd.platform.utils.QgcQueryWrapperUtil; -import com.yfd.platform.utils.QueryWrapperUtil; import com.yfd.platform.utils.SecurityUtils; import jakarta.annotation.Resource; -import lombok.Data; import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; +import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 倾斜摄影管理 Service 实现类 + *

基于 SD_OPINFO_B_H 表，STTP = 'OSGB' 的数据

* * @author migration */ @Service -public class MsObliqueImageBServiceImpl extends ServiceImpl implements IMsObliqueImageBService { +public class MsObliqueImageBServiceImpl extends ServiceImpl implements IMsObliqueImageBService { @Resource private MsObliqueImageBMapper msObliqueImageBMapper; @@ -40,132 +39,213 @@ public class MsObliqueImageBServiceImpl extends ServiceImpl getKendoList(DataSourceRequest dataSourceRequest) { - // 1. 构建查询条件 + public DataSourceResult getKendoList(DataSourceRequest dataSourceRequest) { DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); - QueryWrapper wrapper = DataSourceRequestUtil.buildQueryWrapper( - dataSourceRequest, MsObliqueImageB.class); + String osgbSttpId = msObliqueImageBMapper.getOpgbSttpId(); + if (StrUtil.isBlank(osgbSttpId)) { + DataSourceResult empty = new DataSourceResult<>(); + empty.setData(Collections.emptyList()); + empty.setTotal(0L); + return empty; + } - // 固定条件：STTP_CODE = 'OSGB' AND IS_DELETED = 0 AND RSTCD IS NOT NULL - wrapper.eq("STTP_CODE", "OSGB"); - wrapper.eq("IS_DELETED", 0); - wrapper.isNotNull("RSTCD"); + StringBuilder sql = new StringBuilder(); + sql.append("SELECT a.STCD, a.STNM, a.STTP, a.LGTD, a.LTTD, a.ELEV, a.STLC, ") + .append("a.USFL, a.DTIN, a.ORDER_INDEX, a.RSTCD, a.BASE_ID, ") + .append("a.HBRVCD, a.RVCD, a.ADDVCD, a.URL, a.HEIGHT, a.BOUNDARY, ") + .append("a.LOCATION, a.ACCURACY, a.REMARK, a.RECORD_USER,a.RECORD_TIME, ") + .append("a.MODIFY_USER, a.MODIFY_TIME, a.IS_DELETED, ") + .append("eng.ENNM, eng.LGTD AS engLgtd, eng.LTTD AS engLttd, ") + .append("eng.BASE_ID AS engBaseId, eng.BASE_NAME, ") + .append("vsrd.RVNM AS hbrvcdName ") + .append("FROM SD_OPINFO_B_H a ") + .append("LEFT JOIN SD_ENGINFO_B_H eng ON eng.STCD = a.RSTCD AND NVL(eng.IS_DELETED, 0) = 0 ") + .append("LEFT JOIN SD_HBRV_DIC hbrv ON a.HBRVCD = hbrv.HBRVCD AND NVL(hbrv.IS_DELETED, 0) = 0 ") + .append("LEFT JOIN V_SD_RVCD_DIC_TREE vsrd ON eng.REACHCD = vsrd.RVCD AND NVL(hbrv.IS_DELETED, 0) = 0 ") + .append("WHERE a.IS_DELETED = 0 ") + .append("AND a.STTP = '").append(osgbSttpId).append("' "); - // 旧系统 rvcd 字段映射到 HBRVCD 列（前端传参保持 rvcd 不变） - if (loadOptions != null) { - String rvcd = QueryWrapperUtil.getFilterFieldValue(loadOptions, "rvcd"); - if (StrUtil.isNotBlank(rvcd)) { - wrapper.eq("HBRVCD", rvcd); - } + Map paramMap = new HashMap<>(); + String filterSql = buildFilterSql(dataSourceRequest == null ? null : dataSourceRequest.getFilter(), paramMap, new int[]{0}); + if (StrUtil.isNotBlank(filterSql)) { + sql.append(" AND ").append(filterSql); } // 默认按修改时间倒序 - wrapper.orderByDesc("MODIFY_TIME"); + sql.append(" ORDER BY a.MODIFY_TIME DESC NULLS LAST"); - // 2. 分页参数处理 - Page page = loadOptions == null ? null - : (Page) QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake()); + Page page = loadOptions == null ? null + : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake()); + List list = microservicDynamicSQLMapper.pageAllListWithResultType( + page, sql.toString(), paramMap, SdOpinfoBH.class + ); - // 3. 执行查询 - Page resultPage; - if (page != null) { - resultPage = this.page(page, wrapper); - } else { - List list = this.list(wrapper); - resultPage = new Page<>(); - resultPage.setRecords(list); - resultPage.setTotal(list.size()); + DataSourceResult result = new DataSourceResult<>(); + result.setData(list); + result.setTotal(page == null ? list.size() : page.getTotal()); + return result; + } + + /** + * 递归构建过滤 SQL + */ + private String buildFilterSql(DataSourceRequest.FilterDescriptor filter, + Map paramMap, int[] indexHolder) { + if (filter == null) return ""; + + List childFilters = filter.getFilters(); + if (CollUtil.isNotEmpty(childFilters)) { + List childConditions = new ArrayList<>(); + for (DataSourceRequest.FilterDescriptor child : childFilters) { + String childSql = buildFilterSql(child, paramMap, indexHolder); + if (StrUtil.isNotBlank(childSql)) { + childConditions.add(childSql); + } + } + if (childConditions.isEmpty()) return ""; + String logic = StrUtil.isNotBlank(filter.getLogic()) ? filter.getLogic() : "and"; + String connector = "and".equalsIgnoreCase(logic) ? " AND " : " OR "; + return "(" + String.join(connector, childConditions) + ")"; } - // 4. 构建结果 - DataSourceResult dataSourceResult = new DataSourceResult<>(); - dataSourceResult.setData(resultPage.getRecords()); - dataSourceResult.setTotal(resultPage.getTotal()); - return dataSourceResult; + String field = filter.getField(); + Object value = filter.getValue(); + String operator = filter.getOperator(); + + if (StrUtil.isBlank(field)) return ""; + + String column = mapToColumn(field); + if (StrUtil.isBlank(column)) return ""; + + if ("isnull".equalsIgnoreCase(operator)) return column + " IS NULL"; + if ("isnotnull".equalsIgnoreCase(operator)) return column + " IS NOT NULL"; + if (value == null) return ""; + + String paramKey = "p" + indexHolder[0]++; + paramMap.put(paramKey, value); + + if ("eq".equalsIgnoreCase(operator)) { + return column + " = #{map." + paramKey + "}"; + } else if ("neq".equalsIgnoreCase(operator)) { + return column + " != #{map." + paramKey + "}"; + } else if ("contains".equalsIgnoreCase(operator)) { + return column + " LIKE '%' || #{map." + paramKey + "} || '%'"; + } else if ("startswith".equalsIgnoreCase(operator)) { + return column + " LIKE #{map." + paramKey + "} || '%'"; + } else if ("endswith".equalsIgnoreCase(operator)) { + return column + " LIKE '%' || #{map." + paramKey + "}"; + } else if ("gt".equalsIgnoreCase(operator)) { + return column + " > #{map." + paramKey + "}"; + } else if ("gte".equalsIgnoreCase(operator)) { + return column + " >= #{map." + paramKey + "}"; + } else if ("lt".equalsIgnoreCase(operator)) { + return column + " < #{map." + paramKey + "}"; + } else if ("lte".equalsIgnoreCase(operator)) { + return column + " <= #{map." + paramKey + "}"; + } else if ("in".equalsIgnoreCase(operator)) { + return column + " IN (#{map." + paramKey + "})"; + } + return ""; + } + + /** + * 前端字段名 -> SQL 列名映射 + */ + private String mapToColumn(String field) { + if (StrUtil.isBlank(field)) return null; + return switch (field) { + case "stcd" -> "a.STCD"; + case "stnm" -> "a.STNM"; + case "rstcd" -> "a.RSTCD"; + case "ennm" -> "eng.ENNM"; + case "baseId" -> "a.BASE_ID"; + case "baseName" -> "eng.BASE_NAME"; + // 旧系统 rvcd 字段映射到 HBRVCD 列（保持兼容） + case "rvcd" -> "a.HBRVCD"; + case "hbrvcd" -> "vsrd.RVCD"; + case "url" -> "a.URL"; + case "remark" -> "a.REMARK"; + case "modifyTime" -> "a.MODIFY_TIME"; + case "usfl" -> "a.USFL"; + default -> null; + }; } @Override - public void addOrUpdate(MsObliqueImageB msObliqueImageB) { - if (StrUtil.isNotBlank(msObliqueImageB.getRstcd())){ - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StrUtil.isNotBlank(msObliqueImageB.getRstcd()), SdEngInfoBH::getStcd, msObliqueImageB.getRstcd()) - .eq(SdEngInfoBH::getIsDeleted, 0) - .select(SdEngInfoBH::getLgtd, SdEngInfoBH::getLttd, SdEngInfoBH::getBaseId, SdEngInfoBH::getBaseName) - .orderByAsc(SdEngInfoBH::getBaseId, SdEngInfoBH::getOrderIndex); - SdEngInfoBH sdEngInfoBH = engInfoBHService.getOne(wrapper); - if (sdEngInfoBH.getLgtd() != null){ - msObliqueImageB.setLgtd(sdEngInfoBH.getLgtd()); - } - if (sdEngInfoBH.getLttd() != null){ - msObliqueImageB.setLttd(sdEngInfoBH.getLttd()); - } - if (StrUtil.isNotBlank(sdEngInfoBH.getBaseName())){ - msObliqueImageB.setBaseName(sdEngInfoBH.getBaseName()); - } - if (StrUtil.isNotBlank(sdEngInfoBH.getBaseId())){ - msObliqueImageB.setBaseId(sdEngInfoBH.getBaseId()); - } - - } - - if (StrUtil.isBlank(msObliqueImageB.getId())) { - addMsObliqueImageB(msObliqueImageB); - } else { - updateMsObliqueImageB(msObliqueImageB); - } - } - - @Override - public void delete(String id) { - msObliqueImageBMapper.deleteById(id); - } - - private void addMsObliqueImageB(MsObliqueImageB msObliqueImageB) { - // 查询新增的倾斜摄影是否已存在 - String rstcd = msObliqueImageB.getRstcd(); - if (StrUtil.isBlank(rstcd)) { + @Transactional(rollbackFor = Exception.class) + public void addOrUpdate(SdOpinfoBH entity) { + if (StrUtil.isBlank(entity.getRstcd())) { throw new BizException("电站不能为空"); } - String id = "OSGB_" + rstcd; - MsObliqueImageB old = msObliqueImageBMapper.selectById(id); - if (old != null) { - throw new BizException("该电站已存在倾斜摄影"); + + // 查询电站信息补充经纬度和基地信息 + SdEngInfoBH engInfo = engInfoBHService.lambdaQuery() + .eq(SdEngInfoBH::getStcd, entity.getRstcd()) + .eq(SdEngInfoBH::getIsDeleted, 0) + .select(SdEngInfoBH::getLgtd, SdEngInfoBH::getLttd, + SdEngInfoBH::getBaseId, SdEngInfoBH::getBaseName) + .one(); + if (engInfo == null) { + throw new BizException("电站不存在：" + entity.getRstcd()); } - msObliqueImageB.setSttpCode("OSGB"); - msObliqueImageB.setSttpName("倾斜摄影"); - if (StrUtil.isBlank(msObliqueImageB.getRvcd())) { - msObliqueImageB.setRvcd(msObliqueImageB.getHbrvcd()); + if (engInfo.getLgtd() != null) { + entity.setLgtd(engInfo.getLgtd()); } - if (StrUtil.isBlank(msObliqueImageB.getRvcdName())) { - msObliqueImageB.setRvcdName(msObliqueImageB.getHbrvcdName()); + if (engInfo.getLttd() != null) { + entity.setLttd(engInfo.getLttd()); } - msObliqueImageB.setStcd("OSGB_" + msObliqueImageB.getRstcd()); - msObliqueImageB.setId("OSGB_" + msObliqueImageB.getRstcd()); - msObliqueImageB.setSttpFullPath("OSGB,"); - msObliqueImageB.setSttpTreeLevel(1); - String sttp = msObliqueImageBMapper.getSttp(); - if (StrUtil.isBlank(sttp)) { + if (StrUtil.isNotBlank(engInfo.getBaseId())) { + entity.setBaseId(engInfo.getBaseId()); + } + + // 获取 OSGB 对应的 STTP ID + String osgbSttpId = msObliqueImageBMapper.getOpgbSttpId(); + if (StrUtil.isBlank(osgbSttpId)) { throw new BizException("倾斜摄影对应的sttp在SD_STTP_B中找不到"); } - msObliqueImageB.setSttp(sttp); - // 设置通用字段 + entity.setSttp(osgbSttpId); + + // 生成 ID 和 STCD + String stcd = "OSGB_" + entity.getRstcd(); + entity.setStcd(stcd); + + long count = this.count(new LambdaQueryWrapper().eq(SdOpinfoBH::getStcd, stcd)); + String userId = currentUserIdOrSystem(); - msObliqueImageB.setRecordUser(userId); - Date now = new java.util.Date(); - msObliqueImageB.setModifyTime(now); - msObliqueImageB.setModifyUser(userId); - msObliqueImageB.setIsDeleted(0); - msObliqueImageBMapper.insert(msObliqueImageB); + Date now = new Date(); + + if (count==0) { + entity.setRecordUser(userId); + entity.setRecordTime(now); + entity.setModifyUser(userId); + entity.setModifyTime(now); + entity.setIsDeleted(0); + this.save(entity); + } else { + entity.setModifyUser(userId); + entity.setModifyTime(now); + this.updateById(entity); + } } - private void updateMsObliqueImageB(MsObliqueImageB msObliqueImageB) { - String userId = currentUserIdOrSystem(); - msObliqueImageB.setModifyUser(userId); - msObliqueImageB.setModifyTime(new java.util.Date()); - this.updateById(msObliqueImageB); + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String stcd) { + msObliqueImageBMapper.deleteById(stcd); + // id 即 stcd +// LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); +// wrapper.eq(SdOpinfoBH::getStcd, stcd); +// wrapper.set(SdOpinfoBH::getIsDeleted, 1); +// wrapper.set(SdOpinfoBH::getDeleteUser, SecurityUtils.getCurrentUsername()); +// wrapper.set(SdOpinfoBH::getDeleteTime, new Date()); +// if (!this.update(wrapper)) { +// throw new BizException("删除失败：" + stcd); +// } } private String currentUserIdOrSystem() { @@ -175,4 +255,4 @@ public class MsObliqueImageBServiceImpl extends ServiceImpl Date: Tue, 21 Jul 2026 15:22:51 +0800 Subject: [PATCH 18/20] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=89=B9?= =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6curd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MsEiaApprovalBController.java | 60 +++++++ .../qgc_base/domain/MsEiaApprovalB.java | 148 ++++++++++++++++++ .../qgc_base/mapper/MsEiaApprovalBMapper.java | 7 + .../service/IMsEiaApprovalBService.java | 18 +++ .../impl/MsEiaApprovalBServiceImpl.java | 76 +++++++++ 5 files changed, 309 insertions(+) create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/MsEiaApprovalBController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/MsEiaApprovalB.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsEiaApprovalBMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/IMsEiaApprovalBService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsEiaApprovalBServiceImpl.java diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsEiaApprovalBController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsEiaApprovalBController.java new file mode 100644 index 00000000..5dd44363 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsEiaApprovalBController.java @@ -0,0 +1,60 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.MsEiaApprovalB; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.IMsEiaApprovalBService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +/** + * 生态环保批复文件管理 + */ +@RestController +@RequestMapping("/base/eiaApproval") +@Tag(name = "生态环保批复文件管理") +public class MsEiaApprovalBController { + + @Resource + private IMsEiaApprovalBService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + MsEiaApprovalB entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), MsEiaApprovalB.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + MsEiaApprovalB entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), MsEiaApprovalB.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsEiaApprovalB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsEiaApprovalB.java new file mode 100644 index 00000000..485aa4fb --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsEiaApprovalB.java @@ -0,0 +1,148 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 生态环保批复文件表 + * + * @author migration + */ +@Data +@TableName("MS_EIAAPPROVAL_B") +public class MsEiaApprovalB implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 电站编码 */ + @TableField("STCD") + private String stcd; + + /** 电站名称 */ + @TableField("ENNM") + private String ennm; + + /** 所属流域 */ + @TableField("BASIN") + private String basin; + + /** 所属河流 */ + @TableField("RIVER") + private String river; + + /** 所属水电基地 */ + @TableField("BASEID") + private String baseid; + + /** 所属水电基地流域 */ + @TableField("HBRVCD") + private String hbrvcd; + + /** 批复文号 */ + @TableField("APPROVAL_FILE_NO") + private String approvalFileNo; + + /** 批复文件标题 */ + @TableField("APPROVAL_FILE_TITLE") + private String approvalFileTitle; + + /** 文件名 */ + @TableField("FILE_NAME") + private String fileName; + + /** 附件下载地址 */ + @TableField("FLPATH") + private String flpath; + + /** 生态流量 */ + @TableField("ECOLOGICAL_FLOW") + private String ecologicalFlow; + + /** 水环境保护措施 */ + @TableField("WATER_ENV_PROTECTION") + private String waterEnvProtection; + + /** 低温水减缓措施 */ + @TableField("COLD_WATER_MITIGATION") + private String coldWaterMitigation; + + /** 栖息地保护 */ + @TableField("HABITAT_PROTECTION") + private String habitatProtection; + + /** 过鱼措施 */ + @TableField("FISH_PASSAGE_MEASURES") + private String fishPassageMeasures; + + /** 鱼类增殖放流 */ + @TableField("FISH_STOCKING") + private String fishStocking; + + /** 陆生生态保护/水土保持措施 */ + @TableField("TERRESTRIAL_ECO_SOIL_CONS") + private String terrestrialEcoSoilCons; + + /** 珍稀植物保护措施 */ + @TableField("RARE_PLANT_PROTECTION") + private String rarePlantProtection; + + /** 动物救助 */ + @TableField("ANIMAL_RESCUE") + private String animalRescue; + + /** 移民安置 */ + @TableField("RESETTLEMENT_MEASURES") + private String resettlementMeasures; + + /** 施工期防治措施或其他环境保护措施 */ + @TableField("CONSTRUCTION_POLLUTION_CTRL") + private String constructionPollutionCtrl; + + /** 地下水及地质环境保护措施 */ + @TableField("GROUNDWATER_GEO_PROTECT") + private String groundwaterGeoProtect; + + /** 风景名胜区保护措施 */ + @TableField("SCENIC_AREA_PROTECTION") + private String scenicAreaProtection; + + /** 环境监测要求 */ + @TableField("ENV_MONITORING_REQUIRE") + private String envMonitoringRequire; + + /** 附件ID */ + @TableField("FLID") + private String flid; + + // ---------- 审计字段 ---------- + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsEiaApprovalBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsEiaApprovalBMapper.java new file mode 100644 index 00000000..b0922ca0 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsEiaApprovalBMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.MsEiaApprovalB; + +public interface MsEiaApprovalBMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsEiaApprovalBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsEiaApprovalBService.java new file mode 100644 index 00000000..cb282c90 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsEiaApprovalBService.java @@ -0,0 +1,18 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.MsEiaApprovalB; + +import java.util.List; + +/** + * 生态环保批复文件 Service 接口 + */ +public interface IMsEiaApprovalBService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(MsEiaApprovalB entity, String source); + boolean update(MsEiaApprovalB entity, String source); + boolean delete(List ids, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsEiaApprovalBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsEiaApprovalBServiceImpl.java new file mode 100644 index 00000000..f2df0ee4 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsEiaApprovalBServiceImpl.java @@ -0,0 +1,76 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.MsEiaApprovalB; +import com.yfd.platform.qgc_base.mapper.MsEiaApprovalBMapper; +import com.yfd.platform.qgc_base.service.IMsEiaApprovalBService; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * 生态环保批复文件 Service 实现类 + */ +@Service +public class MsEiaApprovalBServiceImpl extends ServiceImpl implements IMsEiaApprovalBService { + + private static final String TABLE_NAME = "MS_EIAAPPROVAL_B"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, MsEiaApprovalB.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(MsEiaApprovalB entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(MsEiaApprovalB entity, String source) { + MsEiaApprovalB before = this.getById(entity.getId()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List ids, String source) { + if (ids == null || ids.isEmpty()) return false; + int count = 0; + for (String id : ids) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(MsEiaApprovalB::getId, id); + wrapper.set(MsEiaApprovalB::getIsDeleted, 1); + wrapper.set(MsEiaApprovalB::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(MsEiaApprovalB::getDeleteTime, new Date()); + if (this.update(wrapper)) { + MsEiaApprovalB entity = this.getById(id); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); + count++; + } + } + return count > 0; + } +} From 35dfd82e8dfe2e387aad63d9c508f1b285b60ac1 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 16:11:50 +0800 Subject: [PATCH 19/20] =?UTF-8?q?fix:=20=E8=BF=87=E9=B1=BC=E8=AE=BE?= =?UTF-8?q?=E6=96=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yfd/platform/qgc_base/domain/SdFpssBH.java | 9 +++++++++ .../threedRoam/controller/MsThreedRoamMController.java | 5 +++++ .../qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java index a1696b68..0faae642 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java @@ -41,6 +41,7 @@ public class SdFpssBH implements Serializable { /** * 数据时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date tm; /** @@ -103,6 +104,7 @@ public class SdFpssBH implements Serializable { /** * 数据接入时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date dtinTm; /** @@ -121,31 +123,37 @@ public class SdFpssBH implements Serializable { /** * 规划设计日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date stdsdt; /** * 计划开工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date pststdt; /** * 计划完工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date pesstdt; /** * 开工日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date swdt; /** * 建成日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date jcdt; /** * 退役/拆除日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date wddt; /** @@ -425,6 +433,7 @@ public class SdFpssBH implements Serializable { /** * 数据来源时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date vlsrTm; /** diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java index 6583e97e..8cd8695e 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.exception.BizException; +import com.yfd.platform.common.utils.UserNameFillHelper; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.qgc_sys.threedRoam.domain.MsThreedRoamMEntity; import com.yfd.platform.qgc_sys.threedRoam.dto.MsThreedRoamBVO; @@ -35,10 +36,14 @@ public class MsThreedRoamMController { @Resource private IMsThreedRoamMService msThreedRoamMService; + @Resource + private UserNameFillHelper userNameFillHelper; + @PostMapping("/GetKendoListCust") @Operation(summary = "条件过滤数据列表") public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { DataSourceResult result = msThreedRoamMService.getKendoListCustReturn(dataSourceRequest); + userNameFillHelper.fillUserNames(result.getData()); return ResponseResult.successData(result); } diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java index 28c28121..526a5180 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java @@ -1,6 +1,8 @@ package com.yfd.platform.qgc_sys.threedRoam.domain; import com.baomidou.mybatisplus.annotation.*; +import com.yfd.platform.annotation.UserIdField; +import com.yfd.platform.annotation.UserNameField; import lombok.Data; import java.io.Serializable; @@ -34,8 +36,13 @@ public class MsThreedRoamMEntity implements Serializable { private String remark; @TableField(value = "RECORD_USER",fill = FieldFill.INSERT) + @UserIdField private String recordUser; + @TableField(exist = false) + @UserNameField + private String recordUserName; + @TableField(value = "RECORD_TIME",fill = FieldFill.INSERT) private Date recordTime; From 3afbf3d33a633d5dfa78c66762f2853800127891 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 21 Jul 2026 16:38:03 +0800 Subject: [PATCH 20/20] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=A2=84?= =?UTF-8?q?=E8=AD=A6&AI=E6=99=BA=E8=83=BD=E7=9B=91=E6=B5=8B=E8=A3=85?= =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MsWarnRuleBController.java | 60 ++++++ .../controller/SdAiboxBHController.java | 2 +- .../controller/SdAimonitorBHController.java | 60 ++++++ .../platform/qgc_base/domain/MsWarnRuleB.java | 85 +++++++++ .../qgc_base/domain/SdAimonitorBH.java | 171 ++++++++++++++++++ .../qgc_base/mapper/MsWarnRuleBMapper.java | 7 + .../qgc_base/mapper/SdAimonitorBHMapper.java | 7 + .../qgc_base/service/IMsWarnRuleBService.java | 18 ++ .../service/ISdAimonitorBHService.java | 18 ++ .../service/impl/MsWarnRuleBServiceImpl.java | 76 ++++++++ .../impl/SdAimonitorBHServiceImpl.java | 97 ++++++++++ 11 files changed, 600 insertions(+), 1 deletion(-) create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/MsWarnRuleBController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAimonitorBHController.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAimonitorBH.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsWarnRuleBMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAimonitorBHMapper.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAimonitorBHService.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java create mode 100644 backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsWarnRuleBController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsWarnRuleBController.java new file mode 100644 index 00000000..dfa03d7b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/MsWarnRuleBController.java @@ -0,0 +1,60 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.MsWarnRuleB; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.IMsWarnRuleBService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +/** + * 预警规则配置管理 + */ +@RestController +@RequestMapping("/base/warnRule") +@Tag(name = "预警规则配置管理") +public class MsWarnRuleBController { + + @Resource + private IMsWarnRuleBService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + MsWarnRuleB entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), MsWarnRuleB.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + MsWarnRuleB entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), MsWarnRuleB.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java index 8718a421..dee34d42 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAiboxBHController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/base/aibox") -@Tag(name = "AI智能监测装置管理") +@Tag(name = "AI边缘计算盒子管理") public class SdAiboxBHController { @Resource diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAimonitorBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAimonitorBHController.java new file mode 100644 index 00000000..6b243a40 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdAimonitorBHController.java @@ -0,0 +1,60 @@ +package com.yfd.platform.qgc_base.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_base.domain.SdAimonitorBH; +import com.yfd.platform.qgc_base.domain.SdEngInfoBHOperateRequest; +import com.yfd.platform.qgc_base.service.ISdAimonitorBHService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.*; + +/** + * AI智能监测装置管理 + */ +@RestController +@RequestMapping("/base/aimonitor") +@Tag(name = "AI智能监测装置管理") +public class SdAimonitorBHController { + + @Resource + private ISdAimonitorBHService service; + + @Resource + private ObjectMapper objectMapper; + + @PostMapping("/page") + @Operation(summary = "分页查询") + public ResponseResult queryPageList(@RequestBody DataSourceRequest request) { + Page page = service.queryPageList(request); + return ResponseResult.successData(page); + } + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseResult add(@RequestBody SdEngInfoBHOperateRequest request) { + SdAimonitorBH entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), SdAimonitorBH.class); + boolean result = service.add(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("新增成功") : ResponseResult.error("新增失败"); + } + + @PostMapping("/update") + @Operation(summary = "修改") + public ResponseResult update(@RequestBody SdEngInfoBHOperateRequest request) { + SdAimonitorBH entity = request == null || request.getEngInfo() == null ? null + : objectMapper.convertValue(request.getEngInfo(), SdAimonitorBH.class); + boolean result = service.update(entity, request == null ? null : request.getSource()); + return result ? ResponseResult.success("修改成功") : ResponseResult.error("修改失败"); + } + + @PostMapping("/delete") + @Operation(summary = "删除") + public ResponseResult delete(@RequestBody SdEngInfoBHOperateRequest request) { + boolean result = service.delete(request == null ? null : request.getIds(), request == null ? null : request.getSource()); + return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java new file mode 100644 index 00000000..f3e806e8 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/MsWarnRuleB.java @@ -0,0 +1,85 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 预警规则配置基础表 + * + * @author migration + */ +@Data +@TableName("MS_WARN_RULE_B") +public class MsWarnRuleB implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.ASSIGN_UUID) + private String id; + + /** 预警规则类型：WQLVL=水质预警 EQMN=电站生态流量(环保部) EQMNMWR=电站生态流量(水利部) RSVRFSR=水位预警 */ + @TableField("RULE_TYPE") + private String ruleType; + + /** 预警规则名称 */ + @TableField("RULE_NAME") + private String ruleName; + + /** 规则编码 global=全局规则 common=通用告警规则 custom=自定义告警规则 */ + @TableField("RULE_CODE") + private String ruleCode; + + /** 自定义规则时，标识规则所属测站 */ + @TableField("STCD") + private String stcd; + + /** 备注 */ + @TableField("DESCRIPTION") + private String description; + + /** 是否展示告警等级 0=不展示 1=展示 */ + @TableField("IS_SHOW") + private Integer isShow; + + /** 隔离ID */ + @TableField("ISOLATE_ID") + private String isolateId; + + /** 数据来源 */ + @TableField("VLSR") + private String vlsr; + + /** 数据来源时间 */ + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + // ---------- 审计字段 ---------- + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAimonitorBH.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAimonitorBH.java new file mode 100644 index 00000000..1a976bf0 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdAimonitorBH.java @@ -0,0 +1,171 @@ +package com.yfd.platform.qgc_base.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * AI智能监测装置基本属性表 + * + * @author migration + */ +@Data +@TableName("SD_AIMONITOR_B_H") +public class SdAimonitorBH implements Serializable { + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.INPUT) + private String stcd; + + private String stnm; + + private String sttp; + + @TableField(exist = false) + private String sttpName; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date tm; + + private BigDecimal lgtd; + + private BigDecimal lttd; + + private BigDecimal elev; + + private String stlc; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jcdt; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date wddt; + + @TableField("BLDSTT_CODE") + private Integer bldsttCode; + + @TableField(exist = false) + private String bldsttCodeName; + + private Integer usfl; + + private Integer dtin; + + @TableField(exist = false) + private String dtinName; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("DTIN_TM") + private Date dtinTm; + + private Integer mway; + + @TableField(exist = false) + private String mwayName; + + @TableField("STINDX") + private String stindx; + + @TableField("ORDER_INDEX") + private Integer orderIndex; + + private String rstcd; + + @TableField(exist = false) + private String ennm; + + @TableField("BASE_ID") + private String baseId; + + @TableField(exist = false) + private String baseName; + + private String hbrvcd; + + private String rvcd; + + @TableField(exist = false) + private String rvnm; + + private String introduce; + + private String logo; + + private String inffile; + + private Integer dtfrqcy; + + private String remark; + + private String vlsr; + + @TableField("VLSR_TM") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date vlsrTm; + + /** 服务对象 */ + @TableField("FWDX") + private String fwdx; + + /** 供电方式 */ + @TableField("GDFS") + private String gdfs; + + /** AI盒子配置 */ + @TableField("AIPZ") + private String aipz; + + /** 模型版本 */ + @TableField("MXBB") + private String mxbb; + + /** IP地址 */ + @TableField("IPADDR") + private String ipaddr; + + /** SIM卡信息 */ + @TableField("SIMINFO") + private String siminfo; + + /** 用途 */ + @TableField("PURPOSE") + private String purpose; + + /** 观察方式 */ + @TableField("OBSERVE") + private String observe; + + /** 地形裁剪范围 */ + @TableField("BOX") + private String box; + + // ---------- 审计字段 ---------- + + @TableField("RECORD_USER") + private String recordUser; + + @TableField("RECORD_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date recordTime; + + @TableField("MODIFY_USER") + private String modifyUser; + + @TableField("MODIFY_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date modifyTime; + + @TableField("IS_DELETED") + private Integer isDeleted; + + @TableField("DELETE_USER") + private String deleteUser; + + @TableField("DELETE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date deleteTime; +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsWarnRuleBMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsWarnRuleBMapper.java new file mode 100644 index 00000000..65897007 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/MsWarnRuleBMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.MsWarnRuleB; + +public interface MsWarnRuleBMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAimonitorBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAimonitorBHMapper.java new file mode 100644 index 00000000..5262360b --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdAimonitorBHMapper.java @@ -0,0 +1,7 @@ +package com.yfd.platform.qgc_base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yfd.platform.qgc_base.domain.SdAimonitorBH; + +public interface SdAimonitorBHMapper extends BaseMapper { +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java new file mode 100644 index 00000000..d15d8d16 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/IMsWarnRuleBService.java @@ -0,0 +1,18 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.MsWarnRuleB; + +import java.util.List; + +/** + * 预警规则配置 Service 接口 + */ +public interface IMsWarnRuleBService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(MsWarnRuleB entity, String source); + boolean update(MsWarnRuleB entity, String source); + boolean delete(List ids, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAimonitorBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAimonitorBHService.java new file mode 100644 index 00000000..8450be92 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdAimonitorBHService.java @@ -0,0 +1,18 @@ +package com.yfd.platform.qgc_base.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdAimonitorBH; + +import java.util.List; + +/** + * AI智能监测装置 Service 接口 + */ +public interface ISdAimonitorBHService extends IService { + Page queryPageList(DataSourceRequest request); + boolean add(SdAimonitorBH entity, String source); + boolean update(SdAimonitorBH entity, String source); + boolean delete(List stcds, String source); +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java new file mode 100644 index 00000000..08d10876 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/MsWarnRuleBServiceImpl.java @@ -0,0 +1,76 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.MsWarnRuleB; +import com.yfd.platform.qgc_base.mapper.MsWarnRuleBMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.IMsWarnRuleBService; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +/** + * 预警规则配置 Service 实现类 + */ +@Service +public class MsWarnRuleBServiceImpl extends ServiceImpl implements IMsWarnRuleBService { + + private static final String TABLE_NAME = "MS_WARN_RULE_B"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Override + public Page queryPageList(DataSourceRequest request) { + return DataSourceRequestUtil.executeQuery(request, MsWarnRuleB.class, this); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(MsWarnRuleB entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(MsWarnRuleB entity, String source) { + MsWarnRuleB before = this.getById(entity.getId()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List ids, String source) { + if (ids == null || ids.isEmpty()) return false; + int count = 0; + for (String id : ids) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(MsWarnRuleB::getId, id); + wrapper.set(MsWarnRuleB::getIsDeleted, 1); + wrapper.set(MsWarnRuleB::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(MsWarnRuleB::getDeleteTime, new Date()); + if (this.update(wrapper)) { + MsWarnRuleB entity = this.getById(id); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); + count++; + } + } + return count > 0; + } +} diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java new file mode 100644 index 00000000..1d31a321 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdAimonitorBHServiceImpl.java @@ -0,0 +1,97 @@ +package com.yfd.platform.qgc_base.service.impl; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.common.DataSourceRequest; +import com.yfd.platform.qgc_base.domain.SdAimonitorBH; +import com.yfd.platform.qgc_base.mapper.SdAimonitorBHMapper; +import com.yfd.platform.qgc_base.service.IMsOperationLogService; +import com.yfd.platform.qgc_base.service.ISdAimonitorBHService; +import com.yfd.platform.utils.CodeToNameMetadataBo; +import com.yfd.platform.utils.DataSourceRequestUtil; +import com.yfd.platform.utils.DictCodeToNameConverter; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * AI智能监测装置 Service 实现类 + */ +@Service +public class SdAimonitorBHServiceImpl extends ServiceImpl implements ISdAimonitorBHService { + + private static final String TABLE_NAME = "SD_AIMONITOR_B_H"; + + @Resource + private IMsOperationLogService msOperationLogService; + + @Resource + private DictCodeToNameConverter dictCodeToNameConverter; + + private static final List CODE_TO_NAME_META_LIST = new ArrayList<>(); + + static { + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("dtin").modifyProperty("dtinName").dictType("STATIC").dictSource("DTIN").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("mway").modifyProperty("mwayName").dictType("STATIC").dictSource("MWAY").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("bldsttCode").modifyProperty("bldsttCodeName").dictType("STATIC").dictSource("BLDSTT_CODE").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("sttp").modifyProperty("sttpName").dictType("DYNAMIC").dictSource("SD_STTP_B").codeColumn("STTP_CODE").nameColumn("STTP_NAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("baseId").modifyProperty("baseName").dictType("DYNAMIC").dictSource("SD_HYDROBASE").codeColumn("BASEID").nameColumn("BASENAME").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rstcd").modifyProperty("ennm").dictType("DYNAMIC").dictSource("SD_ENGINFO_B_H").codeColumn("STCD").nameColumn("ENNM").filter("NVL(IS_DELETED, 0) = 0 ").build()); + CODE_TO_NAME_META_LIST.add(CodeToNameMetadataBo.builder().codeProperty("rvcd").modifyProperty("rvnm").dictType("DYNAMIC").dictSource("V_SD_RVCD_DIC_TREE").codeColumn("RVCD").nameColumn("RVNM").build()); + + } + + @Override + public Page queryPageList(DataSourceRequest request) { + Page page = DataSourceRequestUtil.executeQuery(request, SdAimonitorBH.class, this); + dictCodeToNameConverter.convertCodeToName(page, CODE_TO_NAME_META_LIST); + return page; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean add(SdAimonitorBH entity, String source) { + boolean result = this.save(entity); + if (result) { + msOperationLogService.recordAddDetailLog(TABLE_NAME, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean update(SdAimonitorBH entity, String source) { + SdAimonitorBH before = this.getById(entity.getStcd()); + boolean result = this.updateById(entity); + if (result && before != null) { + msOperationLogService.recordModifyDetailLog(TABLE_NAME, before, entity, source); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean delete(List stcds, String source) { + if (stcds == null || stcds.isEmpty()) return false; + int count = 0; + for (String stcd : stcds) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(SdAimonitorBH::getStcd, stcd); + wrapper.set(SdAimonitorBH::getIsDeleted, 1); + wrapper.set(SdAimonitorBH::getDeleteUser, SecurityUtils.getCurrentUsername()); + wrapper.set(SdAimonitorBH::getDeleteTime, new Date()); + if (this.update(wrapper)) { + SdAimonitorBH entity = this.getById(stcd); + msOperationLogService.recordDeleteDetailLog(TABLE_NAME, entity, source); + count++; + } + } + return count > 0; + } +}