diff --git a/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java b/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java index cb6ecf6194..7bdca6a0f9 100644 --- a/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java +++ b/epmet-auth/src/main/java/com/epmet/constant/AuthHttpUrlConstant.java @@ -9,16 +9,16 @@ public interface AuthHttpUrlConstant { /** * 注册url */ - String REGISTER_URL = "http://198.18.132.1:10264/api/third/pacustomer/register"; + String REGISTER_URL = "http://10.1.198.11:10259/api/third/pacustomer/register"; /** * 获取客户信息url */ - String CUSTOMER_MSG_URL = "http://198.18.132.1:10264/api/third/customermp/getcustomermsg/"; + String CUSTOMER_MSG_URL = "http://10.1.198.11:10259/api/third/customermp/getcustomermsg/"; /** * 登录url */ - String RESI_AND_WORK_LOGIN_URL = "http://198.18.132.1:10264/api/third/customermp/resiandworklogin"; + String RESI_AND_WORK_LOGIN_URL = "http://10.1.198.11:10259/api/third/customermp/resiandworklogin"; } diff --git a/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java b/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java index f2e80a088d..ad122413fb 100644 --- a/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java +++ b/epmet-auth/src/main/java/com/epmet/constant/ThirdApiConstant.java @@ -9,22 +9,22 @@ public interface ThirdApiConstant { /** * 根据openId新增或更新用户信息 */ - String THIRD_PAUSER_SAVEUSER = "http://198.18.132.1:10264/api/third/pauser/saveuser"; + String THIRD_PAUSER_SAVEUSER = "http://10.1.198.11:10259/api/third/pauser/saveuser"; /** * 根据手机号查询公众号用户基本信息，校验用户是否存在 */ - String THIRD_PAUSER_CHECKPAUSER = "http://198.18.132.1:10264/api/third/pauser/checkpauser"; + String THIRD_PAUSER_CHECKPAUSER = "http://10.1.198.11:10259/api/third/pauser/checkpauser"; /** * 用户登陆，新增访问记录数据 */ - String THIRD_PAUSERVISITED_SAVEUSERVISITED = "http://198.18.132.1:10264/api/third/pauservisited/saveuservisited"; + String THIRD_PAUSERVISITED_SAVEUSERVISITED = "http://10.1.198.11:10259/api/third/pauservisited/saveuservisited"; /** * 根据客户Id查询各项注册信息 */ - String THIRD_PACUSTOMER_GETCUSTOMERAGENCYUSER = "http://198.18.132.1:10264/api/third/pacustomer/getcustomeragencyuser/"; + String THIRD_PACUSTOMER_GETCUSTOMERAGENCYUSER = "http://10.1.198.11:10259/api/third/pacustomer/getcustomeragencyuser/"; /** * 修改客户数据状态为已完成初始化 */ - String THIRD_PACUSTOMER_UPDATECUSTOMER = "http://198.18.132.1:10264/api/third/pacustomer/updatecustomer/"; + String THIRD_PACUSTOMER_UPDATECUSTOMER = "http://10.1.198.11:10259/api/third/pacustomer/updatecustomer/"; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index 8be83b4bcc..246902a248 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -578,7 +578,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { } govAccessToken = (String) authorizerRefreshToken.get(WxmpMessageConstant.AUTHORIZER_ACCESS_TOKEN); } else { - String url = "http://198.18.132.1:10264/api/third/pacustomer/tokenlist"; + String url = "http://10.1.198.11:10259/api/third/pacustomer/tokenlist"; JSONObject postData = new JSONObject(); postData.put("customerId", customerId); String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(postData)).getData(); @@ -611,7 +611,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { @Override public List templateList(GetTemplateListFormDTO formDTO) { GetTemplateListFormDTO dto = ConvertUtils.sourceToTarget(formDTO, GetTemplateListFormDTO.class); - String url = "http://198.18.132.1:10264/api/third/personaltemplate/templatelist"; + String url = "http://10.1.198.11:10259/api/third/personaltemplate/templatelist"; //String url = "http://localhost:8080/api/third/personaltemplate/templatelist"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(dto)).getData(); logger.info("ThirdLoginServiceImpl.getUserWeChat：httpclient->url:" + url + "，结果->" + data); @@ -646,7 +646,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { */ @Override public List templateListV2(TemplateListV2FormDTO formDTO) { - String url = "http://198.18.132.1:10264/api/third/personaltemplate/templatelistv2"; + String url = "http://10.1.198.11:10259/api/third/personaltemplate/templatelistv2"; // String url = "http://localhost:8110/third/personaltemplate/templatelistv2"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData(); logger.info("ThirdLoginServiceImpl.templatelistv2：httpclient->url:" + url + "，结果->" + data); @@ -676,7 +676,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { * @author sun */ public List customerTemplateList(CustomerTemplateListFormDTO formDTO) { - String url = "http://198.18.132.1:10264/api/third/personaltemplate/customertemplatelist"; + String url = "http://10.1.198.11:10259/api/third/personaltemplate/customertemplatelist"; String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData(); logger.info("ThirdLoginServiceImpl.customerTemplateList：httpclient->url:" + url + "，结果->" + data); JSONObject toResult = JSON.parseObject(data); @@ -899,7 +899,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { * @author sun */ private PaCustomerDTO thirdCustomer(String customerId) { - String url = "http://198.18.132.1:10264/api/third/pacustomer/" + customerId; + String url = "http://10.1.198.11:10259/api/third/pacustomer/" + customerId; Result data = HttpClientManager.getInstance().sendGet(url, null); logger.info("WxmpMessageServiceImpl.thirdCustomer：httpclient->url:" + url + "，结果->" + data); if (!data.success()) { diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java index 380af2210f..1fcb9c5040 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/utils/ThirdUtils.java @@ -28,7 +28,7 @@ public class ThirdUtils { EnvEnum envEnum = EnvEnum.getCurrentEnv(); AccessTokenDTO accessToken = new AccessTokenDTO(); - String url = "http://198.18.132.1:10264/api/third/pacustomer/tokenlist"; + String url = "http://10.1.198.11:10259/api/third/pacustomer/tokenlist"; JSONObject postData = new JSONObject(); postData.put("customerId", customerId); String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(postData)).getData(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index 5197d1eb91..c0d09eb278 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java @@ -28,7 +28,7 @@ public interface WxMaCodeConstant { /** * 反参授权回调url */ - String API_RETURN_REDIRECT_URL = "http://198.18.132.1:10264/api/third/redirectauthcode/%s/%s"; + String API_RETURN_REDIRECT_URL = "http://10.1.198.11:10259/api/third/redirectauthcode/%s/%s"; /** * 前端地址 【授权之后的跳转的地址】 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 027199df87..cbf1ce8528 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -195,7 +195,17 @@ public class IcBuildingServiceImpl extends BaseServiceImpl getBuildingDetail(String buildingId) { - return new Result().ok(baseDao.getBuildingDetail(buildingId)); + IcBulidingDetailDTO ibdd = baseDao.getBuildingDetail(buildingId); + if(ibdd==null){ + return new Result().ok(ibdd); + } + if((StringUtils.isNotBlank(ibdd.getLongitude()) && StringUtils.isBlank(ibdd.getLatitude()))){// 经纬度不为空 + return new Result().ok(ibdd); + } + // 设置默认为日照的坐标点，而不是海洋上的默认点 + ibdd.setLongitude("119.526909"); + ibdd.setLatitude("35.416431"); + return new Result().ok(ibdd); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index b465fb99f2..c062760768 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -999,6 +999,11 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl().ok(result); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d4065a4be0..dd867b19cd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3461,7 +3461,8 @@ public class ProjectServiceImpl extends BaseServiceImpl { if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){ - cate.setCount(count.getAndSet(count.get() + NumConstant.ONE)); + count.getAndSet(count.get() + NumConstant.ONE); + cate.setCount(count.get()); } }); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index 546c52b88f..72196bb250 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -83,8 +83,8 @@ from ic_event e e.DEL_FLAG = '0' - and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m') - and e.HAPPEN_TIME date_format(#{queryEndTime}, '%Y-%m') + and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m-%d') + and e.HAPPEN_TIME date_format(#{queryEndTime}, '%Y-%m-%d') and e.GRID_ID =#{orgId} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 9f0c54fc08..882b7e6cc5 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -451,7 +451,7 @@ public class CustomerServiceImpl extends BaseServiceImplurl:" + url + "，结果->" + data); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java index 63a79d62ce..45c6ad491f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java @@ -275,7 +275,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl NumConstant.ZERO) { resiDomains = resiDomains.stream().distinct().collect(Collectors.toList()); WebviewDomainFormDTO domainFormDTO = new WebviewDomainFormDTO(); diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java index fedacb2527..27a9fc90b5 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/constant/GuideHttpUrlConstant.java @@ -6,6 +6,6 @@ package com.epmet.constant; */ public interface GuideHttpUrlConstant { - String CUSTOMER_MSG_URL = "http://198.18.132.1:10264/api/third/customermp/getcustomermsg/"; + String CUSTOMER_MSG_URL = "http://10.1.198.11:10259/api/third/customermp/getcustomermsg/"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 5ba30efd34..2b7199c11f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3633,8 +3633,8 @@ public class IcResiUserServiceImpl extends BaseServiceImplurl:http://198.18.132.1:10264/api/third/customermp/getcustomermsg/ ，结果->" + data); + String data = HttpClientManager.getInstance().sendPostByJSON("http://10.1.198.11:10259/api/third/customermp/getcustomermsg/" + appId, JSON.toJSONString(jsonObject)).getData(); + logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:http://10.1.198.11:10259/api/third/customermp/getcustomermsg/ ，结果->" + data); JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); if (null != toResult.get("code")) {