Merge branch 'dev' into sky_v2

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/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>