slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsAlarmMapper.java

@@ -60,7 +60,7 @@ public interface KwsAlarmMapper extends BaseMapper<KwsAlarm> {
 
     int selectDetailCount();
 
-    List<KwsAlarm> selectListByQuery(@Param("query") AlarmLogThresholdQuery query, @Param("mountainId") String mountainId);
+    List<KwsAlarm> selectListByQuery(@Param("query") AlarmLogThresholdQuery query, @Param("mountainId") String mountainId, @Param("companyId") String companyId);
 
     List<KwsAlarm> selectExportListByQuery(@Param("query") AlarmLogThresholdExport query, @Param("mountainId") String mountainId, @Param("idsList") List<Long> idsList);
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/dos/mysql/KwsDeviceReference.java

@@ -102,6 +102,12 @@ public class KwsDeviceReference implements Serializable {
     @TableField(exist = false)
     private String  unitNe;
 
+    /**
+     * itemName
+     */
+    @TableField(exist = false)
+    private String  itemName;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -106,6 +106,7 @@ public class BackTrackService {
                 if (re.getItem().equals(value.getValue())) {
                     re.setUnit(value.getUrl());
                     re.setUnitNe(value.getRemark());
+                    re.setItemName(value.getLabel());
                 }
             }
         }
@@ -421,6 +422,7 @@ public class BackTrackService {
                 if (re.getItem().equals(value.getValue())) {
                     re.setUnit(value.getUrl());
                     re.setUnitNe(value.getRemark());
+                    re.setItemName(value.getLabel());
                 }
             }
         }

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

@@ -177,6 +177,8 @@ public class CommonService {
                     .eq(KwsDeviceReference::getType, NumberConstant.ONE)
                     .eq(KwsDeviceReference::getDelFlag, NumberConstant.ZERO)
                     .eq(KwsDeviceReference::getItem, DictItemEnum.LATITUDE_Y.getValue())
+                    .last("limit 1")
+                    .orderByDesc(KwsDeviceReference::getCreateTime)
             );
             if (deviceReference != null) {
                 angleInRadians = deviceReference.getCurrentValue().doubleValue();

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

@@ -756,12 +756,26 @@ public class DeviceService {
             put("type", "1");
         }});
 
+        Map<String, SystemDict> unit = commonService.getDictList(null, new HashMap<>() {{
+            put("code", DictEnum.INTEGRATION_UNIT.getCodeType());
+            put("type", "1");
+        }});
+
+        //获取集成要素信息
+        List<DeviceIntegrationVo> intergData = new ArrayList<>();
+        intergData = deviceIntegrationMapper.selectListParamsAndInterNameByDeviceId(deviceId);
         for (Object object : array) {
             JSONObject obj = (JSONObject) object;
             if(modelPart.containsKey(obj.get("item"))){
-                logDesc += modelPart.get(obj.get("item")).getLabel()+ ":" +obj.get("value")+",";
+                logDesc += modelPart.get(obj.get("item")).getLabel()+ ":" +obj.get("value")+modelPart.get(obj.get("item")).getUrl()+",";
             }else{
-                logDesc += obj.get("item")+ ":" +obj.get("value")+",";
+                for(DeviceIntegrationVo vo : intergData){
+                    if(obj.get("item").equals(vo.getIntegrationName())){
+
+                        logDesc += obj.get("item")+ ":" +obj.get("value")+unit.get(vo.getUnit()).getDescription()+",";
+                    }
+                }
+
             }
 
 

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

@@ -124,8 +124,13 @@ public class KwsAlarmService {
         HeaderData headerData = commonService.getHeaderData(request);
         PageHelper.startPage(query.getPage(), query.getPageSize());
         LambdaQueryWrapper<KwsAlarm> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(headerData.getMountainId()), KwsAlarm::getMountainId, headerData.getMountainId())
-                .eq(KwsAlarm::getStatus, query.getStatus())
+        if (StringUtils.isNotBlank(headerData.getMountainId())){
+            wrapper.eq(StringUtils.isNotBlank(headerData.getMountainId()), KwsAlarm::getMountainId, headerData.getMountainId());
+        }
+        if (StringUtils.isNotBlank(headerData.getCompanyId())){
+            wrapper.eq(StringUtils.isNotBlank(headerData.getCompanyId()), KwsAlarm::getCompanyId, headerData.getCompanyId());
+        }
+        wrapper.eq(KwsAlarm::getStatus, query.getStatus())
                 .gt(KwsAlarm::getTriggerTimes, 0)
         ;
         if (StringUtils.isNotBlank(query.getProjectId())) {
@@ -141,7 +146,7 @@ public class KwsAlarmService {
             wrapper.like(KwsAlarm::getDeviceId, query.getDeviceId());
         }
         wrapper.orderByDesc(KwsAlarm::getCreateTime);
-        List<KwsAlarm> list = alarmMapper.selectListByQuery(query, headerData.getMountainId());
+        List<KwsAlarm> list = alarmMapper.selectListByQuery(query, headerData.getMountainId(), headerData.getCompanyId());
 //        List<KwsAlarm> list = alarmMapper.selectList(wrapper);
         List<KwsAlarmVO> alarmVOS = new ArrayList<>();
         PageInfo<KwsAlarm> info = new PageInfo<KwsAlarm>(list);

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsAlarmMapper.xml

@@ -404,6 +404,8 @@
             and trigger_times > 0
             <if test="mountainId != null and mountainId != ''">
                 and mountain_id = #{mountainId}
+            </if><if test="companyId != null and companyId != ''">
+                and company_id = #{companyId}
             </if>
             <if test="query.projectId != null and query.projectId != ''">
                 and project_id = #{query.projectId}

slope-modules/slope-detection/src/main/resources/template/Email.html

@@ -22,7 +22,7 @@
 					</div>
 				</div>
 				<div class="content-c">
-					<div class="content-c-title">正文</div>
+<!--					<div class="content-c-title">正文</div>-->
 					<div class="text-box-title">尊敬的开物云ECO用户</div>
 					<div class="text-p">
                         <!--&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->在北京时间的<b>{time}</b>，监控到了
@@ -37,7 +37,7 @@
 					</div>
                     <div class="text-p2">
 <!--						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
-                        {createTime}
+                        <b>{createTime}</b>
 					</div>
 				</div>
 			</div>
@@ -119,9 +119,9 @@
                 text-indent: 20em;
                <!--color: red;-->
 			}
-            .text-p b{
-				color: red;
-			}
+            /*.text-p b{*/
+			/*	color: red;*/
+			/*}*/
 		</style>
 	</body>
 </html>