1.新增查看明细经纬度

2.短信邮件修改计算后的值

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/consumer/MqttCallbackHandler.java

@@ -152,6 +152,7 @@ public class MqttCallbackHandler extends AbstractHandler {
                     if ("2".equals(map.get("flag"))) {
                         Long level = Long.valueOf(map.get("level"));
                         Long thresholdId = Long.valueOf(map.get("thresholdId"));
+                        String offset = map.get("offset");
                         //阈值表以及明细表存储
                         String url = dictByDictCode.get(itemName) == null ? null : dictByDictCode.get(itemName).getUrl();
                         String itemValueAndUnit = StringUtils.isBlank(url) ? itemValue : (itemValue + url);
@@ -184,7 +185,8 @@ public class MqttCallbackHandler extends AbstractHandler {
                             templateParam.put("time", time);
                             templateParam.put("level", level.toString());
                             templateParam.put("name", device.getName());
-                            templateParam.put("value", itemValue);
+//                            templateParam.put("value", itemValue);
+                            templateParam.put("value", offset);
                             commonService.pushSmsMessage(pushToPhone
                                     , smsTemplateConfig.getDataAlarm().getSmsCode()
                                     , smsTemplateConfig.getDataAlarm().getSignName()
@@ -213,7 +215,8 @@ public class MqttCallbackHandler extends AbstractHandler {
                             templateParam.put("name", device.getName());
                             templateParam.put("time", time);
                             templateParam.put("project", vo == null ? null : vo.getProjectName());
-                            templateParam.put("value", itemValue);
+//                            templateParam.put("value", itemValue);
+                            templateParam.put("value", offset);
                             commonService.pushEmailMessage(emailAddress
                                     , templateParam);
                         }
@@ -313,7 +316,8 @@ public class MqttCallbackHandler extends AbstractHandler {
                             templateParam.put("time", time);
                             templateParam.put("level", level.toString());
                             templateParam.put("name", device.getName());
-                            templateParam.put("value", itemValueAndUnit);
+//                            templateParam.put("value", itemValueAndUnit);
+                            templateParam.put("value", String.valueOf(offset));
                             commonService.pushSmsMessage(pushToPhone
                                     , smsTemplateConfig.getDataAlarm().getSmsCode()
                                     , smsTemplateConfig.getDataAlarm().getSignName()
@@ -342,7 +346,8 @@ public class MqttCallbackHandler extends AbstractHandler {
                             templateParam.put("name", device.getName());
                             templateParam.put("time", time);
                             templateParam.put("project", vo == null ? null : vo.getProjectName());
-                            templateParam.put("value", itemValueAndUnit);
+//                            templateParam.put("value", itemValueAndUnit);
+                            templateParam.put("value", String.valueOf(offset));
                             commonService.pushEmailMessage(emailAddress
                                     , templateParam);
                         }
@@ -443,8 +448,10 @@ public class MqttCallbackHandler extends AbstractHandler {
         if (checkItemName.contains(itemName)) {
             BigDecimal offset = commonService.computeOffset(itemValue, itemName, deviceRelation);
             map = newAlarmCompute(offset, kwsThresholds);
+            map.put("offset",String.valueOf(offset));
         } else {
             map = newAlarmCompute(new BigDecimal(itemValue), kwsThresholds);
+            map.put("offset",itemValue);
         }
 //        map = oldAlarmCompute(checkItemName, itemName, itemValue, deviceRelation, kwsThresholds);
         return map;

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/ThresholdLogDetailVO.java

@@ -36,6 +36,19 @@ public class ThresholdLogDetailVO implements Serializable {
      */
     private String alarmDetailId;
 
+    /**
+     * 逻辑经度（测点布设的值）
+     */
+    private String logicLng;
+    /**
+     * 逻辑纬度（测点布设的值）
+     */
+    private String logicLat;
+    /**
+     * 逻辑海拔（测点布设的值）
+     */
+    private String logicAlt;
+
     /**
      * 告警等级
      */

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -513,6 +513,9 @@ public class KwsAlarmService {
                 KwsProjectArea area = projectAreaMapper.selectOne(new LambdaQueryWrapper<KwsProjectArea>().eq(KwsProjectArea::getProjectId, project.getProjectId()));
                 vo.setFence(area == null ? null : area.getFence());
             }
+            vo.setLogicAlt(device.getLogicAlt());
+            vo.setLogicLat(device.getLogicAlt());
+            vo.setLogicLng(device.getLogicLng());
             vo.setAlarmDetailId(id);
             vo.setDeviceId(deviceId.toString());
             vo.setItemName(itemName);