diff --git a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java index 8438490a2bc3a25e8aa8fb2f96159ed951801a31..4553fa3567f16cc11d6e8790e7002e69295cdcf6 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/CityGeomController.java @@ -10,13 +10,18 @@ package com.cetc32.dh.controller.rest; import com.cetc32.dh.common.response.ResponseData; import com.cetc32.dh.common.response.ResponseResult; import com.cetc32.dh.entity.CityGeom; +import com.cetc32.dh.entity.DataMenu; import com.cetc32.dh.service.CityGeomService; +import com.cetc32.dh.service.DataAreaService; +import com.cetc32.dh.service.DataMenuService; import com.cetc32.webutil.common.annotations.LoginSkipped; import io.swagger.annotations.ApiOperation; +import org.omg.Messaging.SYNC_WITH_TRANSPORT; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; @RestController @@ -25,6 +30,10 @@ import java.util.Map; public class CityGeomController { @Autowired CityGeomService cityGeomService; + @Autowired + DataAreaService dataAreaService; + @Autowired + DataMenuService dataMenuService; @LoginSkipped @@ -107,9 +116,53 @@ public class CityGeomController { return ResponseResult.success(result); } + /** + * @Deprecated + * 返回指定区域的文件数量(以目录编号和目录结果map返回) + * 返回数据结果 + * "obj": [ + * { + * "count": "1", + * "menuid": "13" + * }, + * { + * "count": "8", + * "menuid": "147" + * } + */ + @GetMapping("/countRegionFileNum") + public ResponseResult countRegionFileNum(String areaName,String flag) { + System.out.println(flag); + List areaCodes = new ArrayList<>(); + List MidNames = new ArrayList<>(); + List tmpCodes =new ArrayList<>(); + DataMenu dataMenu = null; + List> result =new ArrayList<>(); + if(flag.equals("市")||flag.equals("省")) { + areaCodes = cityGeomService.queryAreaCodeByCity(areaName); + areaCodes.addAll(cityGeomService.queryAreaCodeByProvince(areaName)); + } + if(flag.equals("国")){ + MidNames = cityGeomService.queryCityNameByProvince(areaName); + for (String midName:MidNames) { + tmpCodes =cityGeomService.queryAreaCodeByProvince(midName); + tmpCodes.addAll(cityGeomService.queryAreaCodeByCity(midName)); + if(tmpCodes!=null&&tmpCodes.size()!=0){ + areaCodes.addAll(tmpCodes); + } + } + } + if(areaCodes.size()==0){ + return ResponseResult.error("未找到相关区域信息和文件信息，请传入正确参数！"); + }else{ + result=dataAreaService.countByAreaCodes(areaCodes); + for (Map map:result) { + dataMenu = dataMenuService.queryById((long)map.get("menuid")); + map.put("menuname",dataMenu.getMenuName()); + } + return ResponseResult.success(result); + } - - - + } } diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java b/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java index ffafe83f3432d95af16a710b964689f75097645a..398072fc518cf443ba637ca66b1ddcb78d023d7c 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataCommonController.java @@ -295,4 +295,6 @@ public class DataCommonController { } + + } diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java index f542df30e3cb98dc90029d3da313f0764fa3ad4b..71c56e8e072300e9b993ba890fa4aaf7c0145e28 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java @@ -492,6 +492,8 @@ public class DataFileController { + + /** * 目录/文件提交上传 * diff --git a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java index 61e7d7896d42fc9eff8464dfa4027c9c90de12d3..ee39fbf6fe68aa2bb8f6c7cffa28000b2e907dab 100644 --- a/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/CityGeomMapper.java @@ -20,7 +20,7 @@ public interface CityGeomMapper extends Mapper { public Integer deleteByCityCode(@Param("cityCode")String cityCode); public List selectCityTree(@Param("proCode")String proCode) ; - public String selectCityInCodes( List areaCodes); + public String selectCityInCodes( List areaCodes); List selectCodesInArea(List cities); @@ -28,6 +28,12 @@ public interface CityGeomMapper extends Mapper { public CityGeom queryByName(String name); + public List queryAreaCodeByCity(@Param("areaName")String areaName); + + public List queryAreaCodeByProvince(@Param("areaName")String areaName); + + public List queryCityNameByProvince(@Param("areaName") String areaName); + public List selectCityInPolygon(@Param("polygon")String polygon); /** diff --git a/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java index 4bfa80221b9f5cd592f685bb706d77fa707639cb..6fe7e17daeb2111d5f4e64126c200445e6be421d 100644 --- a/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java +++ b/src/main/java/com/cetc32/dh/mybatis/DataAreaMapper.java @@ -11,9 +11,11 @@ import com.cetc32.dh.entity.DataArea; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.HashMap; import java.util.List; @Repository public interface DataAreaMapper { public Integer insertArea(List areaList); public Integer deleteAreaByDataId(@Param("dataId")Long dataId); + public List> countByAreaCodes(List areaCodes); } diff --git a/src/main/java/com/cetc32/dh/service/CityGeomService.java b/src/main/java/com/cetc32/dh/service/CityGeomService.java index a5b9ae389f34b631f1e27ade233a03fe857f6622..8670bd01cab8450305fa1b136540f8185360aeb5 100644 --- a/src/main/java/com/cetc32/dh/service/CityGeomService.java +++ b/src/main/java/com/cetc32/dh/service/CityGeomService.java @@ -11,6 +11,7 @@ import com.cetc32.dh.common.bean.TreeData; import com.cetc32.dh.entity.CityGeom; import com.cetc32.dh.entity.DataFile; import com.cetc32.dh.entity.DataPlp; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -41,4 +42,9 @@ public interface CityGeomService { public Boolean judgePointContain(String point, String polygon); + public List queryAreaCodeByCity(String areaName); + + public List queryAreaCodeByProvince(String areaName); + + public List queryCityNameByProvince(String areaName); } diff --git a/src/main/java/com/cetc32/dh/service/DataAreaService.java b/src/main/java/com/cetc32/dh/service/DataAreaService.java index 9feb01ef2cb700c6ff23bd586e80f691bd86dfb1..374727b9f64d465b3be4fa244af992e8b5b2bbf7 100644 --- a/src/main/java/com/cetc32/dh/service/DataAreaService.java +++ b/src/main/java/com/cetc32/dh/service/DataAreaService.java @@ -9,10 +9,12 @@ package com.cetc32.dh.service; import com.cetc32.dh.entity.DataArea; +import java.util.HashMap; import java.util.List; public interface DataAreaService { Integer insertArea(List areaList); Integer deleteAreaByDataId(Long dataId); Integer updateArea(Long dataId,List list); + List > countByAreaCodes(List areaCode); } diff --git a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java index 7436e7bd38e41dd4cede0d58473ab44568723187..a9b467f3e8cdde6d8c0d4dcb47d19d9046d5ff83 100644 --- a/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/CityGeomServiceImpl.java @@ -11,6 +11,7 @@ import com.cetc32.dh.service.DataFileService; import com.cetc32.dh.service.DataPlpService; import com.cetc32.dh.service.ProvinceGeomService; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -228,4 +229,19 @@ public class CityGeomServiceImpl implements CityGeomService { // pointss ="POLYGON((98.31768 46.16992,127.59814 45.80590,108.78794 34.13706,93.2099 35.04692,98.31768 46.16992,98.31768 46.16992))"; return cityGeomMapper.judgePointContain(point, polygon); } + + @Override + public List queryAreaCodeByCity(String areaName){ + return cityGeomMapper.queryAreaCodeByCity(areaName); + } + + @Override + public List queryAreaCodeByProvince(String areaName){ + return cityGeomMapper.queryAreaCodeByProvince(areaName); + } + + public List queryCityNameByProvince(String areaName){ + return cityGeomMapper.queryCityNameByProvince(areaName); + } + } diff --git a/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java index c89f77e81d1e66fe0cb84200ef0cacee5491368e..f16aac6b01e2920f14fb9ba6fced911f62fb9bae 100644 --- a/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/DataAreaServiceImpl.java @@ -13,6 +13,7 @@ import com.cetc32.dh.service.DataAreaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; @Service @@ -39,4 +40,8 @@ public class DataAreaServiceImpl implements DataAreaService { return 0; return dataAreaMapper.insertArea(list); } + @Override + public List> countByAreaCodes(List areaCode){ + return dataAreaMapper.countByAreaCodes(areaCode); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 0e583a30ed4f8688f1f35f1307e9d3ba4f16b1f6..3f8452a82687f1d69099b4785fc3acf36d5f89c0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8082 server.connectionTimeout: 18000000 @@ -26,34 +26,36 @@ spring: name: dhManager datasource: url: jdbc:postgresql://192.168.1.60:5432/dhmanage + #url: jdbc:postgresql://180.184.65.203:5432/dhmanage username: postgres password: 123456 + #password: Zdk@824. driver-class-name: org.postgresql.Driver -# datasource: -# url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 -# username: root -# password: 123 -# initial-size: 1 -# min-idle: 1 -# max-active: 20 -# test-on-borrow: true -# driver-class-name: com.mysql.cj.jdbc.Driver -# type: com.zaxxer.hikari.HikariDataSource + # datasource: + # url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8 + # username: root + # password: 123 + # initial-size: 1 + # min-idle: 1 + # max-active: 20 + # test-on-borrow: true + # driver-class-name: com.mysql.cj.jdbc.Driver + # type: com.zaxxer.hikari.HikariDataSource servlet: multipart: - max-file-size: 2GB - max-request-size: 2GB + max-file-size: 5GB + max-request-size: 5GB -#设置静态资源路径，多个以逗号分隔 + #设置静态资源路径，多个以逗号分隔 resources: static-locations: classpath:static/,file:static/ mybatis: - mapper-locations: classpath:mapper/*.xml - type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 - configuration: - map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 + mapper-locations: classpath:mapper/*.xml + type-aliases-package: com.cetc32.dh.entity.* #对应实体类的包名 + configuration: + map-underscore-to-camel-case: true #配置驼峰命名转换 在进行sql查询和初始化实体时mybatis会为我们自动转化 generator: targetProject: src/main/java @@ -65,10 +67,8 @@ logging: level: com.cetc32.dh.mybatis: debug -basicPath: /root/ -storePath: /root/导航 -upLoadPath: ${basicPath}upLoad - +storePath: /root/ +upLoadPath: ${storePath}upLoad rootPath: /root/daohang/data myPath: ${rootPath}myPath @@ -76,16 +76,20 @@ writePath: ${rootPath}/product flowPath: ${rootPath}/flowpath/ upDatePath: ${rootPath}/updatePath/ downPath: ${rootPath}/downPath -eip: http://192.168.1.42:8080/ +eip: http://192.168.1.60:8080/ gainMenuId: 10 sso: - authcenter: http://192.168.1.42:8087 + authcenter: http://192.168.1.60:8081 + #authcenter: http://180.184.65.203:8087 verifyUrl: ${sso.authcenter}/rest/auth/verify?token= passportUrl: ${sso.authcenter}/?ReturnUrl= defaultLoginRequiredEnable: true permission: S002^*数据管理@/**;数据员@/rest/**; #permission: S001^*业务管理@/**;普通用户@/rest/**; - sysurl : http://192.168.1.42:${server.port} + sysurl : http://192.168.1.60:${server.port} sysname : 数据管理系统 registerUrl : ${sso.authcenter}/rest/api/sys/sync + syscode: S002 offlineDataMenuId : 151 +plpUrl: /plpData +traceUrl: /traceData diff --git a/src/main/resources/mapper/CityGeomMapper.xml b/src/main/resources/mapper/CityGeomMapper.xml index 0596ac8227bc1d0fa9464ee181d85e6e629287b8..1398d048851a180a6b6efbcaab2a1c1a3f51893c 100644 --- a/src/main/resources/mapper/CityGeomMapper.xml +++ b/src/main/resources/mapper/CityGeomMapper.xml @@ -76,4 +76,15 @@ select * from city_geom where ST_Contains( ST_GeomFromText (polygon_text,4326), ST_GeomFromText (#{polygon},4326)) order by city_code desc; + + + + + diff --git a/src/main/resources/mapper/DataAreaMapper.xml b/src/main/resources/mapper/DataAreaMapper.xml index 0d19d5698dfc03698faae113aa2d07c746ce8a97..7d2d713be0547c2d977d0da61553dde4fee94d4b 100644 --- a/src/main/resources/mapper/DataAreaMapper.xml +++ b/src/main/resources/mapper/DataAreaMapper.xml @@ -17,4 +17,20 @@ delete from data_area where dataid =#{dataId} + + + + + + +