地块统计数据和面积

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/geoAnalysis/entity/Result.java

@@ -13,6 +13,7 @@ public class Result {
     private String info;
     private String dkbh;
     private String zfghyt;
+    private String zfghytString;
     private Float tdjz;
     private String remark;
 }

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/geoAnalysis/service/impl/GeoAnalysisServiceImpl.java

@@ -37,6 +37,7 @@ import org.opengis.feature.simple.SimpleFeatureType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
+
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -62,15 +63,6 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
     @Autowired
     QcJzxxMapper qcJzxxMapper;
 
-    //if (map.get("info") instanceof Clob) {
-    //    Clob clob = (Clob) map.get("info");
-    //    try {
-    //        result.setInfo(clob.getSubString((long) 1, (int) clob.length()));
-    //    } catch (SQLException throwables) {
-    //        throwables.printStackTrace();
-    //    }
-    //}
-
     @Override
     public ArrayList<GeoAnalysis> DrawMap(List<ZYFXPZB> zyfxpzb, String shape) {
         ArrayList list = new ArrayList();
@@ -96,21 +88,24 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
                 result.setObjectid(map.get("objectid").toString());
                 result.setInfo(map.get("info").toString());
                 //增加地块编号
-                if (null!=map.get("dkbh")){
+                if (null != map.get("dkbh")) {
                     result.setDkbh(map.get("dkbh").toString());
                     //根据zfghyt判断价值,单位(亩),地块可能涉及到多块
-                    QcJzxx qcJzxx=qcJzxxMapper.queryDkInfo(result.getDkbh());
-                    if (null!=qcJzxx){
+                    QcJzxx qcJzxx = qcJzxxMapper.queryDkInfo(result.getDkbh());
+                    if (null != qcJzxx) {
                         //计算地块和土地面积价值 面积单位是公顷, 地块价值面积单位是亩
-                        //类型
                         result.setZfghyt(qcJzxx.getZfghyt());
+                        result.setZfghytString(qcJzxx.getRemark());
+                        result.setRemark("面积单位:亩,价值单位:元");
                         //价值计算公顷转换成亩
-                        try{
-                            Float f=Float.parseFloat(result.getArea());
-                            result.setTdjz(f*15*qcJzxx.getJz());
-                        }catch (Exception e){
-                            result.setRemark("土地价值无法计算");
+                        try {
+                            result.setTdjz(Float.parseFloat(result.getArea()) * 15 * qcJzxx.getJz());
+                        } catch (Exception e) {
+                            result.setRemark("土地面积数据异常");
                         }
+                    } else {
+                        //查不到地块的情况
+                        result.setRemark("该地块没有分类信息");
                     }
                 }
                 result.setAtableenam(atableenam);
@@ -121,6 +116,7 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
         }
         return list;
     }
+
     @Override
     public ZYFXPZB SelectByTbs(String MTABLENAME, String atableename) {
         return geoAnalysisMapper.SelectByTbs(MTABLENAME, atableename);
@@ -187,16 +183,14 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
     }
 
     @Override
-    public Boolean exportShps(HttpServletResponse response,String id) {
+    public Boolean exportShps(HttpServletResponse response, String id) {
         List<Map<String, Object>> list = geoAnalysisMapper.exportShp(id);
         boolean b = exportShp(response, list);
-        return b ;
+        return b;
     }
 
     /**
-
      * 导出Shp
-
      */
 
     public static boolean exportShp(HttpServletResponse response, List<Map<String, Object>> list) {
@@ -207,11 +201,11 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
 
         String id = UUID.randomUUID().toString();
 
-        String tempPath =  "D:"+"/temp/"+ id + "/" ;
+        String tempPath = "D:" + "/temp/" + id + "/";
 
         String shpFilePath = tempPath + id + ".shp";//临时文件
 
-        String zippath =  "D:" + "/temp/" + id + ".zip";//压缩包,把xls文件压缩到zip中，在浏览器下载
+        String zippath = "D:" + "/temp/" + id + ".zip";//压缩包,把xls文件压缩到zip中，在浏览器下载
 
         File dir = new File(tempPath);
 
@@ -230,7 +224,6 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
         try {
 
 
-
 //定义属性
 
             final SimpleFeatureType TYPE = DataUtilities.createType("Location",
@@ -241,15 +234,15 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
 
             );
 
-           /* SimpleFeatureCollection collection = FeatureCollections.newCollection();*/
+            /* SimpleFeatureCollection collection = FeatureCollections.newCollection();*/
             List<SimpleFeature> features = new ArrayList<>();
             SimpleFeatureBuilder featureBuilder = new SimpleFeatureBuilder(TYPE);
 
             for (Map<String, Object> row : list) {
-                if(row.get("GEOM") instanceof Clob){
-                    Clob clob=(Clob) row.get("GEOM");
-                    try{
-                        row.put("GEOM",clob.getSubString((long)1,(int)clob.length()));
+                if (row.get("GEOM") instanceof Clob) {
+                    Clob clob = (Clob) row.get("GEOM");
+                    try {
+                        row.put("GEOM", clob.getSubString((long) 1, (int) clob.length()));
                     } catch (SQLException throwables) {
                         throwables.printStackTrace();
                     }
@@ -259,7 +252,7 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
                 WKTReader wktReader = new WKTReader();
                 Geometry geometry = null;
                 try {
-                    geometry =  wktReader.read(wkt);
+                    geometry = wktReader.read(wkt);
 
 //geometry.setSRID(4326);
                 } catch (Exception e) {
@@ -268,7 +261,7 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
                     e.printStackTrace();
                 }
                 featureBuilder.add(geometry);
-                System.out.println("78888888888888888888888"+row.get("DKMC"));
+                System.out.println("78888888888888888888888" + row.get("DKMC"));
                 featureBuilder.add(row.get("DKMC"));
 
                 SimpleFeature feature = featureBuilder.buildFeature(null);
@@ -279,7 +272,7 @@ public class GeoAnalysisServiceImpl extends ServiceImpl<GeoAnalysisMapper, GeoAn
 collection.add(feature);*/
 
             }
-            SimpleFeatureCollection collection = new ListFeatureCollection(TYPE,features);
+            SimpleFeatureCollection collection = new ListFeatureCollection(TYPE, features);
 
 
             ShapefileDataStoreFactory dataStoreFactory = new ShapefileDataStoreFactory();
@@ -297,7 +290,6 @@ collection.add(feature);*/
             newDataStore.forceSchemaCRS(DefaultGeographicCRS.WGS84);
 
 
-
             Transaction transaction = new DefaultTransaction("create");
 
             String typeName = newDataStore.getTypeNames()[0];
@@ -305,7 +297,6 @@ collection.add(feature);*/
             SimpleFeatureSource featureSource = newDataStore.getFeatureSource(typeName);
 
 
-
             if (featureSource instanceof SimpleFeatureStore) {
 
                 SimpleFeatureStore featureStore = (SimpleFeatureStore) featureSource;
@@ -360,51 +351,26 @@ collection.add(feature);*/
             log.error("【shp导出失败】" + e.getMessage());
 
         } finally {
-
             if (fileOutputStream != null) {
-
                 try {
-
                     fileOutputStream.close();
-
                 } catch (Exception e) {
-
                     log.error("【shp导出流关闭失败】" + e.getMessage());
-
                 }
-
             }
-
             File filedir = new File(tempPath);
-
             if (filedir.exists() && filedir.isDirectory()) {
-
                 File[] files = filedir.listFiles();
-
                 for (File f : files) {
-
                     if (f.exists()) {
-
                         f.delete();
-
                     }
-
-
-
                 }
-
                 filedir.delete();
-
-
-
             }
-
             if (zipfile.exists()) {
-
                 zipfile.delete();
-
             }
-
         }
         return flag;
 

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -144,6 +144,7 @@ spring:
           validationQuery: select 1
           driver-class-name: org.postgresql.Driver
           url: jdbc:postgresql://10.233.1.64:5432/zrzyqc_test
+          #url: jdbc:postgresql://49.235.111.199:15432/zrzyqc_test
           username: postgres
           password: 660c1d95
           # url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/controller/QcSsgqzysytdqkGzvController.java

@@ -21,6 +21,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.GuavaRateLimiter.RateLimiter;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
+import org.jeecg.modules.zrzyqc.gzvhb.model.ResultCount;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqk1;
 import org.jeecg.modules.zrzyqc.qcsb.entity.QcSsgqzysytdqkzc;
@@ -781,10 +782,13 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	@GetMapping(value = "/sumList")
 	@PermissionData(pageComponent = "qcsb/QcSsgqzysytdqkList")
 	public Result<?> queryPageList(QcSsgqzysytdqkGzv qcSsgqzysytdqk,
-								   HttpServletRequest req) {
+								   HttpServletRequest req,String year) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
 		queryWrapper.gt("sfsb", 0);
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
 		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
 		List<Map<String, Double>> map = qcSsgqzysytdqkGzvService.sumList(list);
 		return Result.OK(map);
@@ -803,10 +807,13 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 	@ApiOperation(value = "省直列表数据查询", notes = "省直列表数据查询")
 	@GetMapping(value = "/sumListBysz")
 	public Result<?> sumListBysz(QcSsgqzysytdqkGzv qcSsgqzysytdqk,
-								 HttpServletRequest req) {
+								 HttpServletRequest req,String year) {
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A03");
 		queryWrapper.gt("sfsb", 0);
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
 		List<QcSsgqzysytdqkGzv> list = qcSsgqzysytdqkGzvService.list(queryWrapper);
 		List<Map<String, Double>> map = qcSsgqzysytdqkGzvService.sumListBysz(list);
 		return Result.OK(map);
@@ -910,6 +917,58 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		return Result.OK(pageList);
 	}
 
+	/**
+	 *
+	 * @AutoLog(value = "查询地块数量和面积")
+	 * @param qcSsgqzysytdqk
+	 * @param year
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value = "查询地块数量和面积", notes = "查询地块数量和面积")
+	@GetMapping(value = "/listByglyyCount")
+	public Result<ResultCount> queryPageListByglyyCount(QcSsgqzysytdqkGzv qcSsgqzysytdqk,String year,HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		queryWrapper.likeRight("sys_org_code", "A03");
+		queryWrapper.gt("sfsb", 0);
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
+		System.out.println("#############################>>>");
+		System.out.println(qcSsgqzysytdqk.toString());
+		ResultCount resultCount = qcSsgqzysytdqkGzvService.queryResultCount(queryWrapper);
+		if (resultCount==null){
+			resultCount = new ResultCount();
+			resultCount.setAreaDk(0.0);
+			resultCount.setCountDk(0);
+		}
+		return Result.OK(resultCount);
+	}
+	/**
+	 *
+	 * @AutoLog(value = "查询地块数量和面积")
+	 * @param qcSsgqzysytdqk
+	 * @param year
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value = "查询地块数量和面积", notes = "查询地块数量和面积")
+	@GetMapping(value = "/listByglyCount")
+	public Result<ResultCount> queryPageListByglyCount(QcSsgqzysytdqkGzv qcSsgqzysytdqk,String year,HttpServletRequest req) {
+		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
+		queryWrapper.likeRight("sys_org_code", "A04");
+		queryWrapper.gt("sfsb", 0);
+		if (year!=null){
+			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
+		}
+		ResultCount resultCount = qcSsgqzysytdqkGzvService.queryResultCount(queryWrapper);
+		if (resultCount==null){
+			resultCount = new ResultCount();
+			resultCount.setAreaDk(0.0);
+			resultCount.setCountDk(0);
+		}
+		return Result.OK(resultCount);
+	}
 
 	@AutoLog(value = "用地单位信息是否可以撤回")
 	@ApiOperation(value = "用地单位信息是否可以撤回", notes = "用地单位信息是否可以撤回")

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/model/ResultCount.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.zrzyqc.gzvhb.model;
+
+import lombok.Data;
+
+@Data
+public class ResultCount {
+    private Integer countDk;
+    private Double areaDk;
+}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/service/IQcSsgqzysytdqkGzvService.java

@@ -1,7 +1,9 @@
 package org.jeecg.modules.zrzyqc.gzvhb.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
+import org.jeecg.modules.zrzyqc.gzvhb.model.ResultCount;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 
 import java.util.HashMap;
@@ -22,6 +24,10 @@ public interface IQcSsgqzysytdqkGzvService extends IService<QcSsgqzysytdqkGzv> {
     List<Map<String, Double>> sumListBysz(List<QcSsgqzysytdqkGzv> list);
 
     void upSfsb(String id);
+
     QcQyxx selectQyxx(String username, String orCode);
+
     void insertDkxx(HashMap<String, Object> map);
+
+    ResultCount queryResultCount(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper);
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/service/impl/QcSsgqzysytdqkGzvServiceImpl.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.zrzyqc.gzvhb.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.SysCategoryModel;
 import org.jeecg.modules.zrzyqc.gzvhb.entity.QcSsgqzysytdqkGzv;
 import org.jeecg.modules.zrzyqc.gzvhb.mapper.QcSsgqzysytdqkGzvMapper;
+import org.jeecg.modules.zrzyqc.gzvhb.model.ResultCount;
 import org.jeecg.modules.zrzyqc.gzvhb.service.IQcSsgqzysytdqkGzvService;
 import org.jeecg.modules.zrzyqc.qyxx.entity.QcQyxx;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,6 +47,23 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         qcSsgqzysytdqkGzvMapper.insertDkxx(map);
     }
 
+    /**
+     * 查询地块面积和数量
+     * @param queryWrapper
+     * @return
+     */
+    @Override
+    public ResultCount queryResultCount(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper) {
+        List<QcSsgqzysytdqkGzv> qcSsgqzysytdqkGzvs = qcSsgqzysytdqkGzvMapper.selectList(queryWrapper);
+        if (!qcSsgqzysytdqkGzvs.isEmpty()) {
+            ResultCount resultCount = new ResultCount();
+            resultCount.setCountDk(qcSsgqzysytdqkGzvs.size());
+            resultCount.setAreaDk((qcSsgqzysytdqkGzvs.stream().mapToDouble(QcSsgqzysytdqkGzv::getSjzytdmj).sum())*0.0015);
+            return resultCount;
+        }
+        return null;
+    }
+
 
     @Override
     public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {
@@ -70,6 +90,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
                 }
             }
         }
+
         //面积亩
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
@@ -136,10 +157,10 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
                 }
             }
         }
-        //前端进行了亩的处理转换
+        //实际使用
         Map<String, Double> xzqhByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getXzqh,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjsyjzmj()*0.0015).orElse(0.0))));
         result.add(xzqhByAreaCollect);
 
         Map<String, List<QcSsgqzysytdqkGzv>> syxzCollect = list.stream().collect(
@@ -151,7 +172,7 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
 
         Map<String, Double> syxzByAreaCollect = list.stream().collect(
                 Collectors.groupingBy(QcSsgqzysytdqkGzv::getSyqsyfs,
-                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()).orElse(0.0))));
+                        Collectors.summingDouble(s -> Optional.ofNullable(s.getSjzytdmj()*0.0015).orElse(0.0))));
         result.add(syxzByAreaCollect);
 
         Map<String, Long> wjlxCollect = list.stream().collect(