占压地块面积转换修改

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

@@ -77,23 +77,18 @@ public class GeoAnalysisController extends JeecgController<GeoAnalysis, IGeoAnly
     @ApiOperation(value = " 通过获取坐标串进行分析", notes = " 通过获取坐标串进行分析")
     @GetMapping(value = "/DrawMap")
     public Result<?> DrawMapByzb( DrawMapDto drawMapDto) throws JsonProcessingException {
-        ObjectMapper mapper = new ObjectMapper();
+        //ObjectMapper mapper = new ObjectMapper();
         HashMap<String,Object> wk=new HashMap<>();
         List<Object> rings=new ArrayList<>();
         rings.add(drawMapDto.getGeoJson());
-//        GeometryVo geometryVo=new GeometryVo();
         wk.put("wkid",4490);
-//        geometryVo.setRings(rings);
-//        geometryVo.setSpatialReference(wk);
-//        String JsongeometryVo = mapper.writeValueAsString(geometryVo);
-//        System.out.println(drawMapDto.getGeoJson());
-//        System.out.println("111111111111"+JsongeometryVo);
         String jsonString = "{\"rings\":[" + drawMapDto.getGeoJson() + "],\"spatialReference\":{\"wkid\":4490}}";
-        System.out.println(jsonString);
+        //System.out.println(jsonString);
         Geometry geometry = GeometryEngine.jsonToGeometry(jsonString).getGeometry();
         String drawWkt = GeometryEngine.geometryToWkt(geometry, WktExportFlags.wktExportPolygon);
         String[] split = drawMapDto.getAtableename().split(",");
         ArrayList<ZYFXPZB> yj_kszlq = new ArrayList<>();
+        //省属地块,省直地块参数(atableename: sz_dkxx,ss_dkxx)
         if (drawMapDto.getAtableename().contains(",")) {
             for (String s : split) {
                 ZYFXPZB zyfxpzb = geoAnalysisService.SelectByTbs(drawMapDto.getTable(), s);
@@ -185,7 +180,6 @@ public class GeoAnalysisController extends JeecgController<GeoAnalysis, IGeoAnly
         ArrayList<String> arr = new ArrayList<>();
         ArrayList<DetailsResult> arrayList = new ArrayList<>();
         ArrayList<CommonQueryConfig> list = geoAnalysisService.SelectByTable(table);
-
         for (CommonQueryConfig commonQueryConfig : list) {
             String fldalias = commonQueryConfig.getFldalias();
             String unit = commonQueryConfig.getUnit();

jeecg-boot-module-gis/src/main/java/org/jeecg/modules/geoAnalysis/mapper/xml/GeoAnalysisMapper.xml

@@ -19,7 +19,7 @@
                  select objectid,
                         st_intersection(a.geom, st_geomfromtext(#{shape}, 4490))                    info,
                         st_area(st_intersection(a.geom,
-                                                st_geomfromtext(#{shape}, 4490)), false) * 0.001 AS AREA,
+                                                st_geomfromtext(#{shape}, 4490)), false) * 0.0001 AS AREA,
                         ${DLMC}
                  from ${table} a
                  where ST_Intersects(a.geom, st_geomfromtext(
@@ -42,7 +42,7 @@
             #{item}
         </foreach>
         ),4527),ST_SetSRID(b.geom,4527))
-        )), false) * 0.001 AS AREA,
+        )), false) * 0.0001 AS AREA,
         ${DLMC}
         from ${table} a
         where ST_Intersects(a.geom, (select b.geom from ss_dkxx b where

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

@@ -281,8 +281,7 @@ cas:
 #Mybatis输出sql日志
 logging:
   level:
-    org.jeecg.modules.system.mapper: info
-    com.baomidou.mybatisplus: DEBUG
+    org.jeecg.modules.system.mapper: debug
 #swagger
 knife4j:
   #开启增强配置

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

@@ -115,9 +115,7 @@ public class QcQyxxController extends JeecgController<QcQyxx, IQcQyxxService> {
                                                 HttpServletRequest req) {
         QueryWrapper<QcQyxx> queryWrapper = QueryGenerator.initQueryWrapper(qcQyxx, req.getParameterMap());
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//		 if(sysUser.getUsername().equals("gzw")) {
         queryWrapper.likeRight("org_code", "A03");
-//		 }
         Page<QcQyxx> page = new Page<QcQyxx>(pageNo, pageSize);
         IPage<QcQyxx> pageList = qcQyxxService.page(page, queryWrapper);
         return Result.OK(pageList);