From 44354cd86277885cea7e1749aead502ea4e41f1a Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 17:11:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/DfContrastController.java | 141 ++++++++++++++--- .../sz/controller/SzContrastController.java | 143 +++++++++++++++--- 2 files changed, 242 insertions(+), 42 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java index c719aaee..62b1c916 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java @@ -2,13 +2,12 @@ package com.kms.yg.df.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.yg.df.domain.BsSgcDfGcgl; -import com.kms.yg.df.domain.BsSgcDfJbxx; -import com.kms.yg.df.service.BsSgcDfGcglService; -import com.kms.yg.df.service.BsSgcDfJbxxService; +import com.kms.yg.df.domain.*; +import com.kms.yg.df.service.*; import com.kms.yg.sz.controller.SzContrastController; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzGcgl; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.domain.AjaxResult; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -24,10 +23,36 @@ import java.util.List; public class DfContrastController { @Autowired - private BsSgcDfGcglService bsSgcDfGcglService; + private BsSgcDfSafeJbxxService bsSgcDfGcglService; @Autowired - private BsSgcDfJbxxService bsSgcDfJbxxService; + private BsSgcDfDfhdmService bsSgcDfDfhdmService; + + @Autowired + private BsSgcDfHdmtzzService bsSgcDfHdmtzzService; + + @Autowired + private BsSgcDfSwtzService bsSgcDfSwtzService; + + @Autowired + private BsSgcDfJyjlService bsSgcDfJyjlService; + + @Autowired + private BsSgcDfGcxyService bsSgcDfGcxyService; + + + @Data + public class ContrastResult { + private List jbxx; + + private List hdm; + private List hdmtzz; + private List swtz; + private List jyjl; + private List gcxy; + + } + @GetMapping("/{embankmentCode}") @@ -36,19 +61,19 @@ public class DfContrastController { //基本信息 //查询当前使用的版本 - QueryWrapper queryWrapper = Wrappers.query(); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("dike_code", embankmentCode); - BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper); + BsSgcDfSafeJbxx one = bsSgcDfGcglService.getOne(queryWrapper); //查询之前的10个版本 - QueryWrapper query = Wrappers.query(); + QueryWrapper query = Wrappers.query(); query.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list = bsSgcDfJbxxService.list(query); + List list = bsSgcDfGcglService.list(query); if (one != null) { list.add(0,one); @@ -58,34 +83,108 @@ public class DfContrastController { //工程管理 //查询当前版本 - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.isNull("EXPR_DATE"); wrapper.eq("dike_code", embankmentCode); - BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper); + BsSgcDfDfhdm one1 = bsSgcDfDfhdmService.getOne(wrapper); //查询之前的10个版本 - QueryWrapper query1 = Wrappers.query(); + QueryWrapper query1 = Wrappers.query(); query1.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list1 = bsSgcDfGcglService.list(query1); + List list1 = bsSgcDfDfhdmService.list(query1); if (one1 != null){ list1.add(0,one1); } - contrastResult.setGcgl(list1); - return AjaxResult.success(contrastResult); - } + contrastResult.setHdm(list1); - @Data - public class ContrastResult { - private List jbxx; - private List gcgl; + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.isNull("EXPR_DATE"); + wrapper1.eq("dike_code", embankmentCode); + + BsSgcDfHdmtzz one2 = bsSgcDfHdmtzzService.getOne(wrapper1); + + //查询之前的10个版本 + QueryWrapper query2 = Wrappers.query(); + query2.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list2 = bsSgcDfHdmtzzService.list(query2); + + if (one1 != null){ + list2.add(0,one2); + } + contrastResult.setHdmtzz(list2); + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.isNull("EXPR_DATE"); + wrapper2.eq("dike_code", embankmentCode); + + BsSgcDfSwtz one3 = bsSgcDfSwtzService.getOne(wrapper2); + //查询之前的10个版本 + QueryWrapper query3 = Wrappers.query(); + query3.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list3 = bsSgcDfSwtzService.list(query3); + + if (one3 != null){ + list3.add(0,one3); + } + contrastResult.setSwtz(list3); + + QueryWrapper wrapper3 = new QueryWrapper<>(); + wrapper3.isNull("EXPR_DATE"); + wrapper3.eq("dike_code", embankmentCode); + + BsSgcDfJyjl one4 = bsSgcDfJyjlService.getOne(wrapper3); + + //查询之前的10个版本 + QueryWrapper query4 = Wrappers.query(); + query4.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list4 = bsSgcDfJyjlService.list(query4); + + if (one4 != null){ + list4.add(0,one4); + } + contrastResult.setJyjl(list4); + + + + QueryWrapper wrapper4 = new QueryWrapper<>(); + wrapper4.isNull("EXPR_DATE"); + wrapper4.eq("dike_code", embankmentCode); + + BsSgcDfGcxy one5 = bsSgcDfGcxyService.getOne(wrapper4); + + //查询之前的10个版本 + QueryWrapper query5 = Wrappers.query(); + query5.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list5 = bsSgcDfGcxyService.list(query5); + + if (one5 != null){ + list5.add(0,one5); + } + contrastResult.setGcxy(list5); + return AjaxResult.success(contrastResult); } + + + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java index 41cac568..3d2715a0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java @@ -2,10 +2,8 @@ package com.kms.yg.sz.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.yg.sz.domain.BsSgcSzGcda; -import com.kms.yg.sz.domain.BsSgcSzGcgl; -import com.kms.yg.sz.service.BsSgcSzGcdaService; -import com.kms.yg.sz.service.BsSgcSzGcglService; +import com.kms.yg.sz.domain.*; +import com.kms.yg.sz.service.*; import com.shuili.common.core.domain.AjaxResult; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -21,12 +19,36 @@ import java.util.List; public class SzContrastController { @Autowired - private BsSgcSzGcdaService bsSgcSzGcdaService; + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; @Autowired - private BsSgcSzGcglService bsSgcSzGcglService; + private BsSgcSzSjcsService bsSgcSzSjcsService; + + @Autowired + private BsSgcSzXlnlService bsSgcSzXlnlService; + + @Autowired + private BsSgcSzGctxService bsSgcSzGctxService; + + @Autowired + private BsSgcSzGcjgService bsSgcSzGcjgService; + + @Autowired + private BsSgcSzCxjlService bsSgcSzCxjlService; + @Data + public class ContrastResult { + private List jbxx; + + private List sjcs; + private List xlnl; + private List gctx; + private List gcjg; + private List cxjl; + + } + @GetMapping("/{sluiceCode}") public AjaxResult contrast(@PathVariable String sluiceCode) { @@ -34,19 +56,19 @@ public class SzContrastController { //基本信息 //查询当前使用的版本 - QueryWrapper queryWrapper = Wrappers.query(); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("waga_code", sluiceCode); - BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper); + BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(queryWrapper); //查询之前的10个版本 - QueryWrapper query = Wrappers.query(); + QueryWrapper query = Wrappers.query(); query.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list = bsSgcSzGcdaService.list(query); + List list = bsSgcSzSafeJbxxService.list(query); if (one != null) { list.add(0,one); @@ -56,34 +78,113 @@ public class SzContrastController { //工程管理 //查询当前版本 - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.isNull("EXPR_DATE"); wrapper.eq("waga_code", sluiceCode); - BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper); + BsSgcSzSjcs one1 = bsSgcSzSjcsService.getOne(wrapper); //查询之前的10个版本 - QueryWrapper query1 = Wrappers.query(); + QueryWrapper query1 = Wrappers.query(); query1.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list1 = bsSgcSzGcglService.list(query1); + List list1 = bsSgcSzSjcsService.list(query1); if (one1 != null){ list1.add(0,one1); } - contrastResult.setGcgl(list1); - return AjaxResult.success(contrastResult); + contrastResult.setSjcs(list1); - } - @Data - public class ContrastResult { - private List jbxx; + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.isNull("EXPR_DATE"); + wrapper1.eq("waga_code", sluiceCode); + + BsSgcSzXlnl one2 = bsSgcSzXlnlService.getOne(wrapper1); + + //查询之前的10个版本 + QueryWrapper query2 = Wrappers.query(); + query2.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list2 = bsSgcSzXlnlService.list(query2); - private List gcgl; + if (one2 != null){ + list2.add(0,one2); + + } + contrastResult.setXlnl(list2); + + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.isNull("EXPR_DATE"); + wrapper2.eq("waga_code", sluiceCode); + + BsSgcSzGctx one3 = bsSgcSzGctxService.getOne(wrapper2); + + //查询之前的10个版本 + QueryWrapper query3 = Wrappers.query(); + query3.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list3 = bsSgcSzGctxService.list(query3); + + if (one3 != null){ + list3.add(0,one3); + + } + contrastResult.setGctx(list3); + + + + QueryWrapper wrapper3 = new QueryWrapper<>(); + wrapper3.isNull("EXPR_DATE"); + wrapper3.eq("waga_code", sluiceCode); + + BsSgcSzGcjg one4 = bsSgcSzGcjgService.getOne(wrapper3); + + //查询之前的10个版本 + QueryWrapper query4 = Wrappers.query(); + query4.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list4 = bsSgcSzGcjgService.list(query4); + + if (one4 != null){ + list4.add(0,one4); + + } + contrastResult.setGcjg(list4); + + + QueryWrapper wrapper4 = new QueryWrapper<>(); + wrapper4.isNull("EXPR_DATE"); + wrapper4.eq("waga_code", sluiceCode); + + BsSgcSzCxjl one5 = bsSgcSzCxjlService.getOne(wrapper4); + + //查询之前的10个版本 + QueryWrapper query5 = Wrappers.query(); + query5.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list5 = bsSgcSzCxjlService.list(query5); + + if (one5 != null){ + list5.add(0,one5); + + } + contrastResult.setCxjl(list5); + return AjaxResult.success(contrastResult); } + + }