diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index f91dbbb4a..7f722bc80 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -446,6 +446,14 @@ public class SysDeptController { return new Result(); } + /** + * 获取坐标所处网格 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/9/6 14:44 + */ @PostMapping("gis/getGridByCoordinate") public Result getGridByCoordinate(@RequestBody GisFormDTO formDTO) { return new Result().ok(sysDeptService.getCoordinate(formDTO)); @@ -463,4 +471,18 @@ public class SysDeptController { public Result> getOptions(@RequestBody GisGridFormDTO dto) { return new Result>().ok(gisService.listGridOption(dto)); } + + /** + * 更新北上诉办公司信息 + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2022/9/4 17:29 + */ + @GetMapping("company/list") + public Result getCompanyList() { + sysDeptService.getCompanyList(); + return new Result(); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java index a6c23766b..befceb997 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/GisService.java @@ -114,4 +114,5 @@ public interface GisService extends BaseService { * @date 2022/9/5 10:08 */ List listGridOption(GisGridFormDTO dto); + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 414b284f2..a6aaeed25 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -367,4 +367,15 @@ public interface SysDeptService extends BaseService { * @date 2022/9/5 15:35 */ GisGridDTO getCoordinate(GisFormDTO formDTO); + + /** + * 获取公司信息 + * + * @param + * @return void + * @author zhy + * @date 2022/9/6 14:46 + */ + void getCompanyList(); + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index e881cb2ef..e16819c41 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -1446,6 +1446,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl urlParams = new HashMap<>(); + String resultStr = httpUtil.getCompanyStr(urlParams); + System.out.println(resultStr); + } + /** * @return java.lang.String * @describe: 访问外部接口获取部门(社区)地区编码 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java index 5d9d9f0d4..6c483a5ab 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/utils/HttpUtil.java @@ -32,7 +32,7 @@ public class HttpUtil { /** * gis地图获取 */ - private final String GET_GIS_COORDINATE_URL = "http://120.221.72.15:6081/arcgis/rest/services/sbwgh/xzqh/MapServer/2/query"; + private final String GET_GIS_COORDINATE_URL = "http://120.221.72.83:9090/arcgis/rest/services/sbwgh/xzqh/MapServer/2/query"; /** * 公司信息获取 diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index ed1f6f4ef..66154aa34 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit ed1f6f4ef632059e42f23759eb09be038f806b13 +Subproject commit 66154aa34097995cc8411ae3ede7179ba3c1d182 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index bae073708..01fc9f817 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java @@ -27,7 +27,9 @@ public enum ItemGridPlatformHandleStatusEnum { HANDLE_PZ(70, "批转"), HANDLE_TD(75, "退单"), HANDLE_BJ(80, "办结"), - HANDLE_BH(1065, "驳回"); + HANDLE_BH(1065, "驳回"), + HANDLE_CX(1066, "撤消办理"); +