skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/utils/SpringContextUtil.java
New file @@ -0,0 +1,38 @@ package cn.gistack.common.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; /** * spring context 工具类 * @author zhongrj */ @Component public class SpringContextUtil implements ApplicationContextAware { private static ApplicationContext applicationContext; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { SpringContextUtil.applicationContext = applicationContext; } public static Object getBean(String name) { return applicationContext.getBean(name); } public static <T> T getBean(Class<T> requiredType) { return applicationContext.getBean(requiredType); } /** * 获取当前运行环境,即spring.profiles.active的值 */ public static String getActiveProfile() { return applicationContext.getEnvironment().getActiveProfiles()[0]; } } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiUrlConstant.java
@@ -7,25 +7,34 @@ */ public class ZtApiUrlConstant { /** * 请求头url 前缀(dev) */ public static final String url_prefix_dev = "http://10.10.2.192"; /** * 请求头url 前缀(prod) */ public static final String url_prefix_prod = "http://10.42.6.192"; /** * 水位数据缺失 */ public static final String res_z_null_api = "http://10.42.6.192/services/1234567890ABCDEFGHIJKLMN/res/z_null"; public static final String res_z_null_api = "/services/1234567890ABCDEFGHIJKLMN/res/z_null"; /** * 水位数据异常 */ public static final String res_z_not_normal_api = "http://10.42.6.192/services/1234567890ABCDEFGHIJKLMN/res/z_not_normal"; public static final String res_z_not_normal_api = "/services/1234567890ABCDEFGHIJKLMN/res/z_not_normal"; /** * 水位超低于死水位 */ public static final String res_diff_dead_z_api = "http://10.42.6.192/services/1234567890ABCDEFGHIJKLMN/res/diff_dead_z"; public static final String res_diff_dead_z_api = "/services/1234567890ABCDEFGHIJKLMN/res/diff_dead_z"; /** * 水位初次超汛限告警 */ public static final String over_z_res_api = "http://10.10.2.192/services/1234567890ABCDEFGHIJKLMN/over_z_res"; public static final String over_z_res_api = "/services/1234567890ABCDEFGHIJKLMN/over_z_res"; } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -4,8 +4,9 @@ import cn.gistack.alerts.alarmRule.entity.AlarmRule; import cn.gistack.alerts.alarmRule.service.AlarmRecordService; import cn.gistack.alerts.alarmRule.service.AlarmRuleService; import cn.gistack.alerts.notice.constant.ZtConfigConstant; import cn.gistack.alerts.sms.service.ISmsTemplateService; import cn.gistack.sm.intelligentCall.constant.ZtConstant; import cn.gistack.common.utils.SpringContextUtil; import cn.gistack.alerts.notice.constant.PtInfoConstant; import cn.gistack.alerts.notice.constant.ZtApiDataColumnConstant; import cn.gistack.alerts.notice.constant.ZtApiUrlConstant; @@ -30,6 +31,7 @@ import org.springframework.web.client.RestTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; /** * 通知策略 @@ -335,7 +337,9 @@ } } // 调用短信服务 smsService.sendSignMsg(smsRequestTemplate); Map<String,Object> map = smsService.sendSignMsg(smsRequestTemplate); // 返回 return "本次-水位初次超汛限告警短信成功通知数量:" + map.get("smsRecord"); } // 返回 return "水位超低于死水位"; @@ -417,7 +421,9 @@ } } // 调用短信服务 smsService.sendSignMsg(smsRequestTemplate); Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate); // 返回 return "本次-水位初次超汛限告警短信成功通知数量:" + map.get("smsRecord"); } // 返回 return "水位初次超汛限告警"; @@ -575,9 +581,17 @@ * @return */ private JSONArray getZtData(String params, String url) { // 获取环境 String activeProfile = SpringContextUtil.getActiveProfile(); if (activeProfile.equals("dev")){ url = ZtApiUrlConstant.url_prefix_dev + url; } if (activeProfile.equals("prod")){ url = ZtApiUrlConstant.url_prefix_prod + url; } //设置请求头 HttpHeaders headers = new HttpHeaders(); headers.add(ZtConstant.header_key, ZtConstant.header_value); headers.add(ZtConfigConstant.header_key, ZtConfigConstant.header_value); //封装请求头 HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers); try { @@ -588,9 +602,8 @@ formEntity, String.class); JSONObject jsonObject = JSON.parseObject(responseEntity.getBody()); JSONArray jsonArray = JSONArray.parseArray(jsonObject.get("data").toString()); // 返回 return jsonArray; return JSONArray.parseArray(jsonObject.get("data").toString()); } catch (Exception e) { e.printStackTrace(); } skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
@@ -29,7 +29,7 @@ * @param smsRequestTemplate * @return */ Object sendSignMsg(SmsRequestTemplate smsRequestTemplate); Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate); /** * 保存短信发送结果 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -74,7 +74,7 @@ * @return */ @Override public Object sendSignMsg(SmsRequestTemplate smsRequestTemplate) { public Map<String, Object> sendSignMsg(SmsRequestTemplate smsRequestTemplate) { // 取出数据 SMSSendRequest request = new SMSSendRequest(); SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate(); @@ -131,8 +131,7 @@ smsRecordList.add(smsRecord); } Map<String, Object> map = new HashMap<>(2); map.put("smsRecord",smsRecordList); map.put("smsResult",smsResult); map.put("smsRecord",smsRecordList.size()); // 返回 return map; }