验收终版250312

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/commonQueryConfig/controller/CommonQueryConfigController.java

@@ -73,7 +73,7 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
     @Autowired
     private ITopicsConfigService topicsConfigService;
 
-
+    //TODO
     @GetMapping(value = "/queryListByUser")
     public Result<?> queryListByUser(@RequestParam("username") String username, @RequestParam("topicId") String topicId) {
         List<JSONObject> queryList = new ArrayList<>();
@@ -351,10 +351,13 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                                  @RequestParam(name = "returntree") Boolean returntree,
                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) throws SQLException {
+        queryList=queryList.toLowerCase();
         QueryResult queryResult = new QueryResult();
         if (returntree) {
+            //树形
             queryResult = doCommonQuery2(queryType, queryInfo, pageNo, pageSize);
         } else {
+            //普通
             queryResult = doCommonQuery(queryType, queryList, queryInfo, pageNo, pageSize);
         }
         return Result.OK(queryResult);
@@ -508,7 +511,7 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
 
             List<Map<String, Object>> queryList = new ArrayList<>();        //存储查询到的所有数据列表
             List<Map<String, Object>> queryList_curPage = new ArrayList<>();       //存储查询到的当前页数据列表，然后在组装返回数据
-
+            System.out.println(queryType + " | " + reltablename);
             if (queryType.equals(reltablename)) {
                 queryList = commonQueryConfigService.commonQuery(queryParams);
             } else {
@@ -521,18 +524,19 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                     queryParams.put("otherfield", otherfield);
                     queryList = commonQueryConfigService.commonQuery3(queryParams);
                 } else {
+                    //todo
                     queryList = commonQueryConfigService.commonQuery2(queryParams);
-                    total =commonQueryConfigService.count(queryParams);
+                    log.info(queryList.toString());
+                    total = commonQueryConfigService.count(queryParams);
                 }
             }
             //循环queryList看是否查询到数据
             if (queryList.size() > 0) {
-                //queryList_curPage = getListpaging(queryList, pageNo, pageSize);
+
                 for (int i = 0; i < queryList.size(); i++) {
                     QueryRecord queryRecord = new QueryRecord();
                     Map<String, Object> queryItem = queryList.get(i);
                     queryRecord.setId(queryItem.get("objectid").toString());
-                    System.out.println("44444444444444444"+queryItem);
                     if (queryItem.get(query) == null) {
                         continue;
                     }
@@ -549,17 +553,6 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
                     if (queryItem.get("dk") != null) {
                         queryRecord.setOtherInfo(queryItem.get("dk").toString());
                     }
-
-                  /*  if (queryItem.get(otherfield) != null) {
-                        otherInfo = queryItem.get(otherfield).toString();
-                        queryRecord.setOtherInfo(otherInfo);
-                    } else {
-                        queryRecord.setOtherInfo(queryItem.get("DK").toString());
-                    }*/
-//                    if ("true".equals(returnArea)) {
-//                        double shapeArea = Double.parseDouble(queryItem.get("SHAPEAREA").toString());
-//                        otherInfo += " — " + String.format("%.2f", shapeArea) + "㎡";
-//                    }
                     queryRecord.setLayerName(queryType);
                     JSONObject attribute = new JSONObject();
 
@@ -662,5 +655,4 @@ public class CommonQueryConfigController extends JeecgController<CommonQueryConf
     }
 
 
-
 }

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

@@ -2,47 +2,74 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.commonQueryConfig.mapper.CommonQueryConfigMapper">
     <select id="commonQuery" parameterType="hashmap" resultType="hashmap">
-        select t.*, t.shape.GET_WKT() as wkt,SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(t.shape,4490),0.05) as shapeArea
+        select t.*, t.shape.GET_WKT() as wkt, SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(t.shape, 4490), 0.05) as shapeArea
         from ${tablename} t
         where ${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')
     </select>
     <select id="commonQuery2" parameterType="hashmap" resultType="hashmap">
-        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
+        select a.* from (select a.OBJECTID,b.id,b.dkbh,b.dk,b.${queryfield}, 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}
+        left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
         where b.${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')
-       ) a
+        ) a
+        ORDER BY A.OBJECTID
         <if test="pageno!=null and pagesize!=null">
-            limit ${pagesize * pageno} offset ${pagesize * (pageno-1)}
+            limit ${pagesize} offset ${pagesize * (pageno-1)}
         </if>
-
     </select>
-    <select id="count" parameterType="hashmap" resultType="int">
-        select count(1) from (select a.OBJECTID,b.*, st_astext(a.geom) as wkt
-        from ${tablename} a
-        left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
-        where b.${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')) a
 
+<!--    &#45;&#45;         select count(1) from (-->
+<!--    &#45;&#45;             select 	  A.OBJECTID,-->
+<!--    &#45;&#45;                         b.ID,-->
+<!--    &#45;&#45;                         b.dkbh,-->
+<!--    &#45;&#45;                         b.dk,-->
+<!--    &#45;&#45;                         st_astext ( ST_GeometryN ( geom, generate_series ( 1, ST_NumGeometries ( geom ) ) ) ) AS wkt-->
+<!--    &#45;&#45;             from ${tablename} a-->
+<!--    &#45;&#45;         left join ${reltablename} b on a.${fromfldname} = b.${tofldname}-->
+<!--    &#45;&#45;         where b.${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')) a-->
+
+    <select id="count" parameterType="hashmap" resultType="int">
+        SELECT COUNT(1)
+        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 }), '%')
+             ) A
     </select>
 
     <select id="commonQuery3" parameterType="hashmap" resultType="hashmap">
-        select a.OBJECTID,a.${otherfield},b.${queryfield}, b.*, a.shape.GET_WKT() as wkt,SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(a.shape,4490),0.05) as shapeArea
+        select a.OBJECTID,
+               a.${otherfield},
+               b.${queryfield},
+               b.*,
+               a.shape.GET_WKT()                                        as wkt,
+               SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(a.shape, 4490), 0.05) as shapeArea
         from ${tablename} a
                  left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
         where b.${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')
     </select>
     <select id="commonQuery4" parameterType="hashmap" resultType="hashmap">
-        select distinct(${fromfldname}),t.${queryfield}
+        select distinct(${fromfldname}), t.${queryfield}
         from ${tablename} t
         where ${queryfield} like CONCAT(CONCAT('%', #{queryinfo}), '%')
     </select>
-<!--    <select id="commonQuery5" parameterType="hashmap" resultType="hashmap">-->
-<!--        select t.${otherfield},t.shape.GET_WKT(),SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(t.shape,4527),0.05) as shapeArea-->
-<!--        from ${tablename} t-->
-<!--        where ${queryfield} = #{queryinfo}-->
-<!--    </select>-->
+    <!--    <select id="commonQuery5" parameterType="hashmap" resultType="hashmap">-->
+    <!--        select t.${otherfield},t.shape.GET_WKT(),SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(t.shape,4527),0.05) as shapeArea-->
+    <!--        from ${tablename} t-->
+    <!--        where ${queryfield} = #{queryinfo}-->
+    <!--    </select>-->
     <select id="commonQuery5" parameterType="hashmap" resultType="hashmap">
-        select a.OBJECTID,a.${otherfield}, b.*, a.shape.GET_WKT() as wkt,SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(a.shape,4490),0.05) as shapeArea
+        select a.OBJECTID,
+               a.${otherfield},
+               b.*,
+               a.shape.GET_WKT()                                        as wkt,
+               SDO_GEOM.SDO_AREA(SDO_CS.TRANSFORM(a.shape, 4490), 0.05) as shapeArea
         from ${tablename} a
                  left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
         where a.${fromfldname} = #{fromfldvalue}
@@ -53,7 +80,7 @@
         where a.OBJECTID = ${objectid}
     </select>
     <select id="identifyQuery2" parameterType="hashmap" resultType="hashmap">
-        select a.OBJECTID,b.*, a.shape.GET_WKT() as wkt
+        select a.OBJECTID, b.*, a.shape.GET_WKT() as wkt
         from ${tablename} a
                  left join ${reltablename} b on a.${fromfldname} = b.${tofldname}
         where a.OBJECTID = ${objectid}

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

@@ -230,7 +230,7 @@ public class QcSsgqzysytdqkGzvController extends JeecgController<QcSsgqzysytdqkG
 		QueryWrapper<QcSsgqzysytdqkGzv> queryWrapper = QueryGenerator.initQueryWrapper(qcSsgqzysytdqk, req.getParameterMap());
 		queryWrapper.likeRight("sys_org_code", "A04");
 		//未上报
-		queryWrapper.gt("sfsb", 0);
+//		queryWrapper.gt("sfsb", 0);
 		if (year!=null){
 			queryWrapper.apply("TO_CHAR(create_time, 'YYYY') LIKE {0}", year + "%");
 		}

jeecg-boot-module-zrzyqc/src/main/java/org/jeecg/modules/zrzyqc/qyxx/controller/QcQyxxController.java

@@ -1130,7 +1130,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         Map<String, Object> resultMap = new HashMap<>();
         int sum = 0;
         queryWrapper.select("count(zslx) as \"value\",ZSLX as \"name\"");
-        queryWrapper.gt("SFSB", 1);
+        //queryWrapper.gt("SFSB", 1);
         queryWrapper.groupBy("zslx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A03");
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
@@ -1198,7 +1198,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
         queryWrapper.select("count(wjlx) as \"value\",wjlx as \"name\"");
         queryWrapper.groupBy("wjlx");
         queryWrapper.likeRight("SYS_ORG_CODE", "A04");
-        queryWrapper.eq("SFSB", 3);
+//        queryWrapper.eq("SFSB", 3);
         List<HashMap<String, Object>> list = qcSsgqzysytdqkGzvService.listMaps(queryWrapper);
         int sum = 0;
         return getResult2(sum, list);