server/services/src/main/java/com/doumee/core/dingding/DingDingNotice.java
@@ -62,7 +62,6 @@ } /** * 钉钉通知 - 站点通信异常上报 * @param ddUrl * @throws Exception */ public static void siteNoLink(List<Sites> siteList,String token,String robotCode,String chatToken) throws Exception{ server/services/src/main/java/com/doumee/core/utils/PositionUtil.java
@@ -1,6 +1,7 @@ package com.doumee.core.utils; import com.alibaba.fastjson.JSONObject; import com.doumee.dao.business.web.request.LocaltionDTO; import java.awt.geom.GeneralPath; @@ -12,7 +13,30 @@ * 计算距离 */ public class PositionUtil { public static String getTxMapAddrByLatAndLng(Double lat,Double lng,String host,String mapkey){ try { if(lat == null || lng ==null){ return null; } String url =host +"/ws/geocoder/v1/?key="+mapkey+"&location="+lat+","+lng; String res = HttpsUtil.get(url,false); JSONObject jsonObject = JSONObject.parseObject(res ); String r = null; if(jsonObject.getJSONObject("result")!=null){ if(jsonObject.getJSONObject("result").getJSONObject("formatted_addresses")!=null){ r =jsonObject.getJSONObject("result").getJSONObject("formatted_addresses").getString("formatted_addresses"); } if(r!=null && !r.equals("")){ r =jsonObject.getJSONObject("result").getString("address"); } } return r; }catch (Exception e){ e.printStackTrace(); } return null; } /** * 判断坐标点是否在多边形区域内 * server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
@@ -70,16 +70,16 @@ @ApiModelProperty("停止服务结束") private String leaseNoticeUrl = ""; @ApiModelProperty("电车临时停车限制 0停车点内停车 1运营区域内停车") private String pauseBikeType; private String pauseBikeType=""; @ApiModelProperty("动车临停自动关锁时长(分钟)") private String pauseAutoCloseTime; private String pauseAutoCloseTime=""; @ApiModelProperty("低电压预警值(伏)") private String lowBikeVoltage; private String lowBikeVoltage=""; @ApiModelProperty("满电电压(伏)") private String fullBikeVoltage; private String fullBikeVoltage=""; @ApiModelProperty("运营区域经纬度集合") private String parkLatLngList; private String parkLatLngList=""; /** * 对象驼峰属性转下划线 server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -29,6 +29,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ConcurrentReferenceHashMap; @@ -50,6 +51,10 @@ @Service public class Jtt808Service { @Value("${tencent.map.remoteHost:}") private String mapHost; @Value("${tencent.map.appKey:}") private String mapKey; @Autowired private MessageManager messageManager; @Autowired