验收终版

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java

@@ -189,8 +189,8 @@ public class PasswordUtil {
 
 
 	public static void main(String[] args) {
-	String pass=	decrypt("fdce3e9f319ece7c","lcq","cLfYfAnM");
-		System.out.println(pass);
+//	String pass=decrypt("87dc0ef74b6e2de0","lcq","Wjm72suR");
+//		System.out.println(pass);
 	}
 
 }

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/commonQueryConfig/mapper/xml/CommonQueryConfigMapper.xml

@@ -7,7 +7,7 @@
         where ${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')
     </select>
     <select id="commonQuery2" parameterType="hashmap" resultType="hashmap">
-        select a.* from (select a.OBJECTID,b.*, st_astext(ST_GeometryN(geom, generate_series(1, ST_NumGeometries(geom))))  as wkt
+        select a.* from (select a.OBJECTID,b.id,b.dkbh,b.dk, st_astext(ST_GeometryN(geom, generate_series(1, ST_NumGeometries(geom))))  as wkt
         from ${tablename} a
                  left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
         where b.${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/geoAnalysis/controller/GeoAnalysisController.java

@@ -85,7 +85,7 @@ public class GeoAnalysisController extends JeecgController<GeoAnalysis, IGeoAnly
         //System.out.println(jsonString);
         Geometry geometry = GeometryEngine.jsonToGeometry(jsonString).getGeometry();
         String drawWkt = GeometryEngine.geometryToWkt(geometry, WktExportFlags.wktExportPolygon);
-
+        log.info(drawWkt);
         String[] split = drawMapDto.getAtableename().split(",");
         ArrayList<ZYFXPZB> yj_kszlq = new ArrayList<>();
         //省属地块,省直地块参数(atableename: sz_dkxx,ss_dkxx)

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

@@ -144,7 +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
+#          url: jdbc:postgresql://172.16.40.48:5432/zrzyqc
           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-system/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 9001
   tomcat:
     max-swallow-size: -1
   error:
@@ -150,7 +150,10 @@ spring:
           #          password: jeecgboot
           validationQuery: select 1
           driver-class-name: org.postgresql.Driver
-          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc_test
+#          url: jdbc:postgresql://10.233.1.64:5432/zrzyqc_test
+          url: jdbc:postgresql://127.0.0.1:9003/zrzyqc
+#          url: jdbc:postgresql://172.16.21.94:9003/zrzyqc
+#          url: jdbc:postgresql://10.168.1.101:9003/zrzyqc
           username: postgres
           password: 660c1d95
           # 多数据源配置

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/dkjz/controller/DkjzController.java

@@ -0,0 +1,102 @@
+package org.jeecg.modules.zrzyqc.dkjz.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: qc_ssgqzysytdqk_gzv
+ * @Author: jeecg-boot
+ * @Date: 2024-11-22
+ * @Version: V1.0
+ */
+@Api(tags = "qc_ssgqzysytdqk_gzv")
+@RestController
+@RequestMapping("/com/qcSsgqzysytdqkGzv")
+@Slf4j
+public class DkjzController extends JeecgController<QcSsgqzysytdqkGzv, IQcSsgqzysytdqkGzvService> {
+    @Autowired
+    private IQcSsgqzysytdqkGzvService qcSsgqzysytdqkGzvService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param qcSsgqzysytdqkGzv
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "qc_ssgqzysytdqk_gzv-分页列表查询")
+    @ApiOperation(value = "qc_ssgqzysytdqk_gzv-分页列表查询", notes = "qc_ssgqzysytdqk_gzv-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<QcSsgqzysytdqkGzv>> queryPageList(QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          HttpServletRequest req) {
+        if (qcSsgqzysytdqkGzv.getXzqh() != null) {
+            if (qcSsgqzysytdqkGzv.getXzqh().equals("370000*")) {
+                qcSsgqzysytdqkGzv.setXzqh("37*");
+            }
+        }
+        QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqkGzv, req.getParameterMap());
+        if (qcSsgqzysytdqkGzv.getCreateBy() != null) {
+            queryWrapper.like("create_by", qcSsgqzysytdqkGzv.getCreateBy());
+        }
+        getQueryWrapper(qcSsgqzysytdqkGzv, queryWrapper);
+        Page<QcSsgqzysytdqkGzv> page = new Page<QcSsgqzysytdqkGzv>(pageNo, pageSize);
+        IPage<QcSsgqzysytdqkGzv> pageList = qcSsgqzysytdqkGzvService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @ApiOperation(value = "查询地块数量和面积", notes = "查询地块数量和面积")
+    @GetMapping(value = "/listQueryMoney")
+    public Result<ResultCount> queryPageListByglyyCount(QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv, HttpServletRequest req) {
+        if (qcSsgqzysytdqkGzv.getXzqh() != null) {
+            if (qcSsgqzysytdqkGzv.getXzqh().equals("370000*")) {
+                qcSsgqzysytdqkGzv.setXzqh("37*");
+            }
+        }
+        QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqkGzv, req.getParameterMap());
+        if (qcSsgqzysytdqkGzv.getCreateBy() != null) {
+            queryWrapper.like("create_by", qcSsgqzysytdqkGzv.getCreateBy());
+        }
+        getQueryWrapper(qcSsgqzysytdqkGzv, queryWrapper);
+        ResultCount resultCount = qcSsgqzysytdqkGzvService.queryResultCountMoney(queryWrapper);
+        if (resultCount == null) {
+            resultCount = new ResultCount();
+            resultCount.setAreaDk(0.0);
+            resultCount.setCountDk(0);
+        }
+        return Result.OK(resultCount);
+    }
+
+    /**
+     * 统一解析参数
+     *
+     * @param qcSsgqzysytdqkGzv
+     * @param queryWrapper
+     */
+    public void getQueryWrapper(QcSsgqzysytdqkGzv qcSsgqzysytdqkGzv, QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper) {
+//        if (qcSsgqzysytdqkGzv.getXzqh().equals("370000")){
+//            queryWrapper.likeRight("xzqh","37");
+//        }
+    }
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/gzvhb/entity/QcSsgqzysytdqkGzv.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.zrzyqc.gzvhb.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -553,60 +554,22 @@ public class QcSsgqzysytdqkGzv implements Serializable {
     @ApiModelProperty(value = "数据原" )
     private String source;
 
-//    /**所属权利类型*/
-//    @Excel(name = "所属权利类型", width = 15)
-//    @ApiModelProperty(value = "所属权利类型")
-//    private String ssqType;
-//    /**权属期限编码（土地使用年限编码）*/
-//    @Excel(name = "权属期限编码（土地使用年限编码）", width = 15)
-//    @ApiModelProperty(value = "权属期限编码（土地使用年限编码）")
-//    private String qsqxCode;
-//    /**证书类型产权证持有情况*/
-//    @Excel(name = "证书类型产权证持有情况", width = 15)
-//    @ApiModelProperty(value = "证书类型产权证持有情况")
-//    private String zscyqkCode;
-//    /**证载批准用途代码*/
-//    @Excel(name = "证载批准用途代码", width = 15)
-//    @ApiModelProperty(value = "证载批准用途代码")
-//    private String pzytCode;
-//    /**权属登记使用人名称是否与实际使用人一致代码*/
-//    @Excel(name = "权属登记使用人名称是否与实际使用人一致代码", width = 15)
-//    @ApiModelProperty(value = "权属登记使用人名称是否与实际使用人一致代码")
-//    private String sfyzCode;
-//    /**政府规划用途是否与实际用途一致代码*/
-//    @Excel(name = "政府规划用途是否与实际用途一致代码", width = 15)
-//    @ApiModelProperty(value = "政府规划用途是否与实际用途一致代码")
-//    private String zfghsfyzCode;
-//    /**实际用途编码*/
-//    @Excel(name = "实际用途编码", width = 15)
-//    @ApiModelProperty(value = "实际用途编码")
-//    private String sjytCode;
-//    /**实际用途是否符合划拨用地目录字典编码*/
-//    @Excel(name = "实际用途是否符合划拨用地目录字典编码", width = 15)
-//    @ApiModelProperty(value = "实际用途是否符合划拨用地目录字典编码")
-//    private String sjytsffhCode;
-//    /**是否需要缴纳土地使用税代码*/
-//    @Excel(name = "是否需要缴纳土地使用税代码", width = 15)
-//    @ApiModelProperty(value = "是否需要缴纳土地使用税代码")
-//    private String sfxyjntdsysCode;
-//    /**土地使用现状编码*/
-//    @Excel(name = "土地使用现状编码", width = 15)
-//    @ApiModelProperty(value = "土地使用现状编码")
-//    private String tdsyxzCode;
-//    /**正常使用现状代码*/
-//    @Excel(name = "正常使用现状代码", width = 15)
-//    @ApiModelProperty(value = "正常使用现状代码")
-//    private String zcsyxzCode;
-//    /**地上建筑物产权人是否与权证登记人使用人名称是否一致字典*/
-//    @Excel(name = "地上建筑物产权人是否与权证登记人使用人名称是否一致字典", width = 15)
-//    @ApiModelProperty(value = "地上建筑物产权人是否与权证登记人使用人名称是否一致字典")
-//    private String dsjzwsfyzCode;
-//    /**是否存在产权纠纷*/
-//    @Excel(name = "是否存在产权纠纷", width = 15)
-//    @ApiModelProperty(value = "是否存在产权纠纷")
-//    private String sfczjfCode;
-//    /**总建筑面积(㎡)*/
-//    @Excel(name = "总建筑面积(㎡)", width = 15)
-//    @ApiModelProperty(value = "总建筑面积(㎡)")
-//    private java.lang.Double zjzmj;
+    @Excel(name = "地块价值", width = 15)
+    @ApiModelProperty(value = "地块价值" )
+    //保留2位小数
+    private Double worth;
+    public Double getWorth() {
+
+        if (this.worth == null) {
+            return null;
+        }
+        BigDecimal bd = new BigDecimal(Double.toString(worth));
+        bd = bd.setScale(2, RoundingMode.HALF_UP);
+        return bd.doubleValue();
+    }
+
+    public void setWorth(Double worth) {
+        this.worth = worth;
+    }
+
 }

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

@@ -30,4 +30,6 @@ public interface IQcSsgqzysytdqkGzvService extends IService<QcSsgqzysytdqkGzv> {
     void insertDkxx(HashMap<String, Object> map);
 
     ResultCount queryResultCount(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper);
+
+    ResultCount queryResultCountMoney(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper);
 }

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

@@ -64,6 +64,21 @@ public class QcSsgqzysytdqkGzvServiceImpl extends ServiceImpl<QcSsgqzysytdqkGzvM
         return null;
     }
 
+    @Override
+    public ResultCount queryResultCountMoney(QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper) {
+        List<QcSsgqzysytdqkGzv> qcSsgqzysytdqkGzvs = qcSsgqzysytdqkGzvMapper.selectList(queryWrapper);
+        if (!qcSsgqzysytdqkGzvs.isEmpty()) {
+            ResultCount resultCount = new ResultCount();
+            resultCount.setCountDk(qcSsgqzysytdqkGzvs.size());
+            resultCount.setAreaDk(qcSsgqzysytdqkGzvs.stream()
+                    .filter(qc -> qc.getWorth() != null) // 过滤掉 null 值
+                    .mapToDouble(QcSsgqzysytdqkGzv::getWorth)
+                    .sum()/10000);
+            return resultCount;
+        }
+        return null;
+    }
+
 
     @Override
     public List<Map<String, Double>> sumList(List<QcSsgqzysytdqkGzv> list) {

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/entity/SsDkjz.java

@@ -71,4 +71,8 @@ public class SsDkjz implements Serializable {
     private String jgqj;
     @ApiModelProperty(value = "价值范围")
     private String jzfw;
+
+    @Excel(name = "合计", width = 15)
+    @ApiModelProperty(value = "最低价格")
+    private java.lang.Double hz;
 }

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qcsb/mapper/xml/SsDkjzMapper.xml

@@ -16,19 +16,29 @@
         <result column="zjg" property="zjg"/>
     </resultMap>
     <select id="queryList" resultType="org.jeecg.modules.zrzyqc.qcsb.entity.SsDkjz">
-        SELECT dkbh,
-               dlbm,
-               dlmc,
-               xjxzqhmc,
-               ROUND(COALESCE(pjjg, 0)::numeric,4) AS pjjg,
-               ROUND(COALESCE(zgjg, 0)::numeric,4) AS zgjg,
-               ROUND(COALESCE(zdjg, 0)::numeric,4) AS zdjg,
-               ROUND(COALESCE(SUM(mj*0.0015), 0)::numeric,4) AS mj,
-               ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(pjjg, 0))::numeric,4) AS zjg,
-               zdjg|| '~'|| zgjg as jgqj,
-               ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(zdjg, 0))::numeric,4) || '~'|| ROUND((COALESCE(SUM(mj*0.0015), 0) * COALESCE(zgjg, 0))::numeric,4) as jzfw
-        FROM ss_dkjz
-        WHERE dkbh =#{dkbh}
-        GROUP BY dkbh, dlbm, dlmc, xjxzqhdm, xjxzqhmc, pjjg, zgjg, zdjg
+        SELECT
+            dkbh,
+            dlbm,
+            dlmc,
+            xjxzqhmc,
+            ROUND(COALESCE(pjjg, 0)::numeric, 4) AS pjjg,
+            ROUND(COALESCE(zgjg, 0)::numeric, 4) AS zgjg,
+            ROUND(COALESCE(zdjg, 0)::numeric, 4) AS zdjg,
+            ROUND(COALESCE(SUM(mj), 0)::numeric, 4) AS mj,
+            ROUND((COALESCE(SUM(mj), 0) * COALESCE(pjjg, 0))::numeric, 4) AS zjg,
+            zdjg || '~' || zgjg AS jgqj,
+            CASE
+                WHEN zgjg IS NULL OR zgjg = 0 THEN
+                    ROUND((COALESCE(SUM(mj), 0) * COALESCE(pjjg, 0))::numeric, 4)::text
+                ELSE
+                        ROUND((COALESCE(SUM(mj), 0) * COALESCE(zdjg, 0))::numeric, 4) || '~' || ROUND((COALESCE(SUM(mj), 0) * COALESCE(zgjg, 0))::numeric, 4)
+                END AS jzfw,
+            ROUND(COALESCE(SUM(pjjg * mj), 0)::numeric, 4)  AS hz
+        FROM
+            ss_dkjz
+        WHERE
+            dkbh = #{dkbh}
+        GROUP BY
+            dkbh, dlbm, dlmc, xjxzqhdm, xjxzqhmc, pjjg, zgjg, zdjg
     </select>
 </mapper>