开发

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<BsSgcDfSafeJbxx> jbxx;
+
+        private List<BsSgcDfDfhdm> hdm;
+        private List<BsSgcDfHdmtzz> hdmtzz;
+        private List<BsSgcDfSwtz> swtz;
+        private List<BsSgcDfJyjl> jyjl;
+        private List<BsSgcDfGcxy> gcxy;
+
+    }
+
 
 
     @GetMapping("/{embankmentCode}")
@@ -36,19 +61,19 @@ public class DfContrastController {
 
         //基本信息
         //查询当前使用的版本
-        QueryWrapper<BsSgcDfJbxx> queryWrapper = Wrappers.query();
+        QueryWrapper<BsSgcDfSafeJbxx> queryWrapper = Wrappers.query();
         queryWrapper.isNull("EXPR_DATE");
         queryWrapper.eq("dike_code", embankmentCode);
 
-        BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper);
+        BsSgcDfSafeJbxx one = bsSgcDfGcglService.getOne(queryWrapper);
 
         //查询之前的10个版本
-        QueryWrapper<BsSgcDfJbxx> query = Wrappers.query();
+        QueryWrapper<BsSgcDfSafeJbxx> query = Wrappers.query();
         query.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
                 .orderByDesc("EXPR_DATE")
                 .last("limit 10");
 
-        List<BsSgcDfJbxx> list = bsSgcDfJbxxService.list(query);
+        List<BsSgcDfSafeJbxx> list = bsSgcDfGcglService.list(query);
         if (one != null) {
             list.add(0,one);
 
@@ -58,34 +83,108 @@ public class DfContrastController {
 
         //工程管理
         //查询当前版本
-        QueryWrapper<BsSgcDfGcgl> wrapper = new QueryWrapper<>();
+        QueryWrapper<BsSgcDfDfhdm> wrapper = new QueryWrapper<>();
         wrapper.isNull("EXPR_DATE");
         wrapper.eq("dike_code", embankmentCode);
 
-        BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper);
+        BsSgcDfDfhdm one1 = bsSgcDfDfhdmService.getOne(wrapper);
 
         //查询之前的10个版本
-        QueryWrapper<BsSgcDfGcgl> query1 = Wrappers.query();
+        QueryWrapper<BsSgcDfDfhdm> query1 = Wrappers.query();
         query1.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
                 .orderByDesc("EXPR_DATE")
                 .last("limit 10");
 
-        List<BsSgcDfGcgl> list1 = bsSgcDfGcglService.list(query1);
+        List<BsSgcDfDfhdm> 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<BsSgcDfJbxx> jbxx;
 
-        private List<BsSgcDfGcgl> gcgl;
+        QueryWrapper<BsSgcDfHdmtzz> wrapper1 = new QueryWrapper<>();
+        wrapper1.isNull("EXPR_DATE");
+        wrapper1.eq("dike_code", embankmentCode);
+
+        BsSgcDfHdmtzz one2 = bsSgcDfHdmtzzService.getOne(wrapper1);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfHdmtzz> query2 = Wrappers.query();
+        query2.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcDfHdmtzz> list2 = bsSgcDfHdmtzzService.list(query2);
+
+        if (one1 != null){
+            list2.add(0,one2);
+        }
+        contrastResult.setHdmtzz(list2);
+
+        QueryWrapper<BsSgcDfSwtz> wrapper2 = new QueryWrapper<>();
+        wrapper2.isNull("EXPR_DATE");
+        wrapper2.eq("dike_code", embankmentCode);
+
+        BsSgcDfSwtz one3 = bsSgcDfSwtzService.getOne(wrapper2);
 
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfSwtz> query3 = Wrappers.query();
+        query3.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcDfSwtz> list3 = bsSgcDfSwtzService.list(query3);
+
+        if (one3 != null){
+            list3.add(0,one3);
+        }
+        contrastResult.setSwtz(list3);
+
+        QueryWrapper<BsSgcDfJyjl> wrapper3 = new QueryWrapper<>();
+        wrapper3.isNull("EXPR_DATE");
+        wrapper3.eq("dike_code", embankmentCode);
+
+        BsSgcDfJyjl one4 = bsSgcDfJyjlService.getOne(wrapper3);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfJyjl> query4 = Wrappers.query();
+        query4.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcDfJyjl> list4 = bsSgcDfJyjlService.list(query4);
+
+        if (one4 != null){
+            list4.add(0,one4);
+        }
+        contrastResult.setJyjl(list4);
+
+
+
+        QueryWrapper<BsSgcDfGcxy> wrapper4 = new QueryWrapper<>();
+        wrapper4.isNull("EXPR_DATE");
+        wrapper4.eq("dike_code", embankmentCode);
+
+        BsSgcDfGcxy one5 = bsSgcDfGcxyService.getOne(wrapper4);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcDfGcxy> query5 = Wrappers.query();
+        query5.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcDfGcxy> list5 = bsSgcDfGcxyService.list(query5);
+
+        if (one5 != null){
+            list5.add(0,one5);
+        }
+        contrastResult.setGcxy(list5);
+        return AjaxResult.success(contrastResult);
     }
 
+
+
+
 }

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<BsSgcSzSafeJbxx> jbxx;
+
+        private List<BsSgcSzSjcs> sjcs;
+        private List<BsSgcSzXlnl> xlnl;
+        private List<BsSgcSzGctx> gctx;
+        private List<BsSgcSzGcjg> gcjg;
+        private List<BsSgcSzCxjl> cxjl;
+
+    }
+
     @GetMapping("/{sluiceCode}")
     public AjaxResult contrast(@PathVariable String sluiceCode) {
 
@@ -34,19 +56,19 @@ public class SzContrastController {
 
         //基本信息
         //查询当前使用的版本
-        QueryWrapper<BsSgcSzGcda> queryWrapper = Wrappers.query();
+        QueryWrapper<BsSgcSzSafeJbxx> queryWrapper = Wrappers.query();
         queryWrapper.isNull("EXPR_DATE");
         queryWrapper.eq("waga_code", sluiceCode);
 
-        BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper);
+        BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(queryWrapper);
 
         //查询之前的10个版本
-        QueryWrapper<BsSgcSzGcda> query = Wrappers.query();
+        QueryWrapper<BsSgcSzSafeJbxx> query = Wrappers.query();
         query.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
                 .orderByDesc("EXPR_DATE")
                 .last("limit 10");
 
-        List<BsSgcSzGcda> list = bsSgcSzGcdaService.list(query);
+        List<BsSgcSzSafeJbxx> list = bsSgcSzSafeJbxxService.list(query);
         if (one != null) {
             list.add(0,one);
 
@@ -56,34 +78,113 @@ public class SzContrastController {
 
         //工程管理
         //查询当前版本
-        QueryWrapper<BsSgcSzGcgl> wrapper = new QueryWrapper<>();
+        QueryWrapper<BsSgcSzSjcs> wrapper = new QueryWrapper<>();
         wrapper.isNull("EXPR_DATE");
         wrapper.eq("waga_code", sluiceCode);
 
-        BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper);
+        BsSgcSzSjcs one1 = bsSgcSzSjcsService.getOne(wrapper);
 
         //查询之前的10个版本
-        QueryWrapper<BsSgcSzGcgl> query1 = Wrappers.query();
+        QueryWrapper<BsSgcSzSjcs> query1 = Wrappers.query();
         query1.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
                 .orderByDesc("EXPR_DATE")
                 .last("limit 10");
 
-        List<BsSgcSzGcgl> list1 = bsSgcSzGcglService.list(query1);
+        List<BsSgcSzSjcs> 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<BsSgcSzGcda> jbxx;
+        QueryWrapper<BsSgcSzXlnl> wrapper1 = new QueryWrapper<>();
+        wrapper1.isNull("EXPR_DATE");
+        wrapper1.eq("waga_code", sluiceCode);
+
+        BsSgcSzXlnl one2 = bsSgcSzXlnlService.getOne(wrapper1);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzXlnl> query2 = Wrappers.query();
+        query2.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcSzXlnl> list2 = bsSgcSzXlnlService.list(query2);
 
-        private List<BsSgcSzGcgl> gcgl;
+        if (one2 != null){
+            list2.add(0,one2);
+
+        }
+        contrastResult.setXlnl(list2);
+
+
+        QueryWrapper<BsSgcSzGctx> wrapper2 = new QueryWrapper<>();
+        wrapper2.isNull("EXPR_DATE");
+        wrapper2.eq("waga_code", sluiceCode);
+
+        BsSgcSzGctx one3 = bsSgcSzGctxService.getOne(wrapper2);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGctx> query3 = Wrappers.query();
+        query3.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcSzGctx> list3 = bsSgcSzGctxService.list(query3);
+
+        if (one3 != null){
+            list3.add(0,one3);
+
+        }
+        contrastResult.setGctx(list3);
+
+
+
+        QueryWrapper<BsSgcSzGcjg> wrapper3 = new QueryWrapper<>();
+        wrapper3.isNull("EXPR_DATE");
+        wrapper3.eq("waga_code", sluiceCode);
+
+        BsSgcSzGcjg one4 = bsSgcSzGcjgService.getOne(wrapper3);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzGcjg> query4 = Wrappers.query();
+        query4.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcSzGcjg> list4 = bsSgcSzGcjgService.list(query4);
+
+        if (one4 != null){
+            list4.add(0,one4);
+
+        }
+        contrastResult.setGcjg(list4);
+
+
+        QueryWrapper<BsSgcSzCxjl> wrapper4 = new QueryWrapper<>();
+        wrapper4.isNull("EXPR_DATE");
+        wrapper4.eq("waga_code", sluiceCode);
+
+        BsSgcSzCxjl one5 = bsSgcSzCxjlService.getOne(wrapper4);
+
+        //查询之前的10个版本
+        QueryWrapper<BsSgcSzCxjl> query5 = Wrappers.query();
+        query5.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE")
+                .orderByDesc("EXPR_DATE")
+                .last("limit 10");
+
+        List<BsSgcSzCxjl> list5 = bsSgcSzCxjlService.list(query5);
+
+        if (one5 != null){
+            list5.add(0,one5);
+
+        }
+        contrastResult.setCxjl(list5);
+        return AjaxResult.success(contrastResult);
 
     }
+
+
 }