1.日照政务云小程序地址的修改

2.修复了事件分布分析处数量不对的bug
3.将小区、楼栋的地图的显示地址默认改为了日照，而不再是海洋中心点

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";
 
 }

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/";
 
 }

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<GetTemplateListResultDTO> 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<TemplateListV2ResultDTO> 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<CustomerTemplateListResultDTO> 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<String> data = HttpClientManager.getInstance().sendGet(url, null);
         logger.info("WxmpMessageServiceImpl.thirdCustomer：httpclient->url:" + url + "，结果->" + data);
         if (!data.success()) {

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();

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";
 
     /**
      * 前端地址 【授权之后的跳转的地址】

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<IcBuildingDao, IcBuil
 
     @Override
     public Result<IcBulidingDetailDTO> getBuildingDetail(String buildingId) {
-        return new Result<IcBulidingDetailDTO>().ok(baseDao.getBuildingDetail(buildingId));
+        IcBulidingDetailDTO ibdd = baseDao.getBuildingDetail(buildingId);
+        if(ibdd==null){
+            return new Result<IcBulidingDetailDTO>().ok(ibdd);
+        }
+        if((StringUtils.isNotBlank(ibdd.getLongitude()) && StringUtils.isBlank(ibdd.getLatitude()))){// 经纬度不为空
+            return new Result<IcBulidingDetailDTO>().ok(ibdd);
+        }
+        // 设置默认为日照的坐标点，而不是海洋上的默认点
+        ibdd.setLongitude("119.526909");
+        ibdd.setLatitude("35.416431");
+        return new Result<IcBulidingDetailDTO>().ok(ibdd);
     }
 
     /**

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<IcNeighborHoodDao
                 result.setViliageTypeName("自然村");
             }
         }
+        if(StringUtils.isEmpty(result.getLongitude()) || StringUtils.isEmpty(result.getLatitude())){
+            // 设置默认为日照的坐标点，而不是海洋上的默认点
+            result.setLongitude("119.526909");
+            result.setLatitude("35.416431");
+        }
         return new Result<IcNeighborHoodDetailDTO>().ok(result);
     }
 

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<ProjectDao, ProjectEntit
 						if (cate.getCategoryCode().equals(k)){
 							v.forEach(l -> {
 								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());
 								}
 							});
 						}

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -83,8 +83,8 @@
             from ic_event e
             <where>
                 e.DEL_FLAG = '0'
-                and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m')
+                and e.HAPPEN_TIME >= date_format(#{queryStartTime}, '%Y-%m-%d')
-                and e.HAPPEN_TIME <![CDATA[ <= ]]> date_format(#{queryEndTime}, '%Y-%m')
+                and e.HAPPEN_TIME <![CDATA[ <= ]]> date_format(#{queryEndTime}, '%Y-%m-%d')
                 <if test="orgType == 'grid'">
                     and e.GRID_ID =#{orgId}
                 </if>

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@@ -451,7 +451,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     @Transactional(rollbackFor = Exception.class)
     public void init(CustomerInitFormDTO formDTO) {
         //1.调用epmet-third服务，根据客户Id查询第三方服务中的客户、组织、管理员等信息
-        String url = "http://198.18.132.1:10264/api/third/pacustomer/getcustomeragencyuser/" + formDTO.getCustomerId();
+        String url = "http://10.1.198.11:10259/api/third/pacustomer/getcustomeragencyuser/" + formDTO.getCustomerId();
         String data = HttpClientManager.getInstance().sendPostByJSON(url, null).getData();
         JSONObject toResult = JSON.parseObject(data);
         Result thirdResult = ConvertUtils.mapToEntity(toResult, Result.class);
@@ -549,7 +549,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         }*/
 
         //6.更新第三方数据库中客户数据状态为已初始化
-        String customerUrl = "http://198.18.132.1:10264/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();
+        String customerUrl = "http://10.1.198.11:10259/api/third/pacustomer/updatecustomer/" + formDTO.getCustomerId();
         String data1 = HttpClientManager.getInstance().sendPostByJSON(customerUrl, null).getData();
         JSONObject json = JSON.parseObject(data1);
         Result customerResult = ConvertUtils.mapToEntity(json, Result.class);
@@ -559,7 +559,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
 
         //7.为微信小程序客户设置服务器域名，业务域名
         if (ThirdConstant.MINI.equals(paCustomer.getType())) {
-            String domainUrl = "http://198.18.132.1:10264/api/third/code/setdomain/" + formDTO.getCustomerId();
+            String domainUrl = "http://10.1.198.11:10259/api/third/code/setdomain/" + formDTO.getCustomerId();
             String domainData = HttpClientManager.getInstance().sendPostByJSON(domainUrl, null).getData();
             JSONObject domainObject = JSON.parseObject(domainData);
             Result domainResult = ConvertUtils.mapToEntity(domainObject, Result.class);

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerStartPageServiceImpl.java

@@ -221,7 +221,7 @@ public class CustomerStartPageServiceImpl extends BaseServiceImpl<CustomerStartP
      * @author sun
      */
     public PaCustomerDTO getCustomerInfo(String appId) {
-        String url = "http://198.18.132.1:10264/api/third/customermp/getcustomermsg/";
+        String url = "http://10.1.198.11:10259/api/third/customermp/getcustomermsg/";
         JSONObject jsonObject = new JSONObject();
         String data = HttpClientManager.getInstance().sendPostByJSON(url + appId, JSON.toJSONString(jsonObject)).getData();
         logger.info("CustomerStartPageServiceImpl.getCustomerInfo：httpclient->url:" + url + "，结果->" + data);

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<FunctionCusto
             }
         }
 
-        String domainUrl = "http://198.18.132.1:10264/api/third/setting/setwebviewdomain";
+        String domainUrl = "http://10.1.198.11:10259/api/third/setting/setwebviewdomain";
         if(resiDomains.size() > NumConstant.ZERO) {
             resiDomains = resiDomains.stream().distinct().collect(Collectors.toList());
             WebviewDomainFormDTO domainFormDTO = new WebviewDomainFormDTO();

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/";
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -3633,8 +3633,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     public PaCustomerDTO getCustomerInfo(String appId) {
         JSONObject jsonObject = new JSONObject();
-        String data = HttpClientManager.getInstance().sendPostByJSON("http://198.18.132.1:10264/api/third/customermp/getcustomermsg/" + appId, JSON.toJSONString(jsonObject)).getData();
+        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://198.18.132.1:10264/api/third/customermp/getcustomermsg/ ，结果->" + data);
+        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")) {