Merge branch 'server-165' of uskycloud/usky-modules into master

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/domain/BaseAlarmNoticeResult.java

@@ -75,5 +75,10 @@ public class BaseAlarmNoticeResult implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 接收人电话
+     */
+    private String receiverPhone;
+
 
 }

service-alarm/service-alarm-biz/src/main/java/com/usky/alarm/service/impl/BaseAlarmServiceImpl.java

@@ -115,7 +115,8 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                     .eq(SysUser::getDelFlag,0);
                             SysUser sysUser = sysUserMapper.selectOne(lambdaQuery4);
                             BaseAlarmNoticeResult baseAlarmNoticeResult = new BaseAlarmNoticeResult();
-                            baseAlarmNoticeResult.setReceiver(sysUser.getPhonenumber());
+                            baseAlarmNoticeResult.setReceiver(sysUser.getNickName());
+                            baseAlarmNoticeResult.setReceiverPhone(sysUser.getPhonenumber());
                             baseAlarmNoticeResult.setAlarmId(alarmId);
                             baseAlarmNoticeResult.setNoticeTime(LocalDateTime.now());
                             baseAlarmNoticeResult.setNoticeContent(records.get(0).getProductName()+","+baseAlarmType.getTypeName()+","+baseAlarm.getAlarmTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +

service-alarm/service-alarm-biz/src/main/resources/mapper/alarm/BaseAlarmNoticeResultMapper.xml

@@ -14,6 +14,7 @@
         <result column="is_read" property="isRead" />
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
+        <result column="receiver_phone" property="receiverPhone" />
     </resultMap>
 
 </mapper>

service-backend/service-backend-biz/src/main/java/com/usky/backend/mapper/DataRealTimeMapper.java

@@ -48,6 +48,15 @@ public interface DataRealTimeMapper extends CrudMapper<DataRealTime> {
                                                         @Param("deviceIdList") List<String> deviceIdList,
                                                         @Param("attributeNameList") List<String> attributeNameList);
 
+
+    List<DataHistoryAvergerVO> QueryTotalOptHistoryAvrgData(@Param("leftLen") Integer leftLen,
+                                                        @Param("tableName") String tableName,
+                                                        @Param("startTime") String startTime,
+                                                        @Param("endTime") String endTime,
+                                                        @Param("productCode") String productCode,
+                                                        @Param("deviceIdList") List<String> deviceIdList,
+                                                        @Param("attributeNameList") List<String> attributeNameList);
+
     List<DataHistoryAvergerVO> QueryTotalHistoryAvrgData(@Param("leftLen") Integer leftLen,
                                                         @Param("tableName") String tableName,
                                                         @Param("startTime") String startTime,

service-backend/service-backend-biz/src/main/java/com/usky/backend/service/impl/DataQueryServiceImpl.java

@@ -165,7 +165,12 @@ public class DataQueryServiceImpl implements DataQueryService {
         if(requestVO.getGroupType().equals("Each")){
             list1 = dataRealTimeMapper.QueryEachHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getDeviceIds(),requestVO.getAttributeNames());
         }else if(requestVO.getGroupType().equals("Total")){
-            list1 = dataRealTimeMapper.QueryTotalHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getAttributeNames());
+            if(CollectionUtils.isNotEmpty(requestVO.getDeviceIds())){
+                list1 = dataRealTimeMapper.QueryTotalOptHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getDeviceIds(),requestVO.getAttributeNames());
+            }else{
+                list1 = dataRealTimeMapper.QueryTotalHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getAttributeNames());
+            }
+
         }
         if(CollectionUtils.isNotEmpty(list1)){
             List<String> dateList = new ArrayList<>();
@@ -262,7 +267,11 @@ public class DataQueryServiceImpl implements DataQueryService {
         if(requestVO.getGroupType().equals("Each")){
             list1 = dataRealTimeMapper.QueryEachHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getDeviceIds(),requestVO.getAttributeNames());
         }else if(requestVO.getGroupType().equals("Total")){
-            list1 = dataRealTimeMapper.QueryTotalHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getAttributeNames());
+            if(CollectionUtils.isNotEmpty(requestVO.getDeviceIds())){
+                list1 = dataRealTimeMapper.QueryTotalOptHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getDeviceIds(),requestVO.getAttributeNames());
+            }else{
+                list1 = dataRealTimeMapper.QueryTotalHistoryAvrgData(leftLen,tableName,requestVO.getStartTime(),requestVO.getEndTime(),requestVO.getProductCode(),requestVO.getAttributeNames());
+            }
         }
         if(CollectionUtils.isNotEmpty(list1)){
             List<String> dateList = new ArrayList<>();

service-backend/service-backend-biz/src/main/resources/mapper/backend/DataRealTimeMapper.xml

@@ -95,6 +95,25 @@
         </if>) a
         GROUP BY a.data_date,a.device_id,a.attribute_name;
     </select>
+    <select id="QueryTotalOptHistoryAvrgData" resultType="com.usky.backend.domain.DataHistoryAvergerVO">
+        SELECT a.data_date as dataDate,'所选房间' as deviceId,a.attribute_name as attributeName ,avg(a.attribute_data) as avrg
+        FROM (SELECT product_code,attribute_name,attribute_data,LEFT(data_time,#{leftLen}) AS data_date FROM ${tableName} WHERE data_time  BETWEEN  #{startTime} AND  #{endTime} AND product_code = #{productCode}
+        AND device_id != 'weather0001'
+        <if test="deviceIdList != null and deviceIdList.size() > 0">
+            AND device_id in
+            <foreach item="item" collection="deviceIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="attributeNameList != null and attributeNameList.size() > 0">
+            AND attribute_name in
+            <foreach item="item" collection="attributeNameList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        and attribute_data != 0) a
+        GROUP BY a.data_date,a.attribute_name;
+    </select>
     <select id="QueryTotalHistoryAvrgData" resultType="com.usky.backend.domain.DataHistoryAvergerVO">
         SELECT a.data_date as dataDate,'所有房间' as deviceId,a.attribute_name as attributeName ,avg(a.attribute_data) as avrg
         FROM (SELECT product_code,attribute_name,attribute_data,LEFT(data_time,#{leftLen}) AS data_date FROM ${tableName} WHERE data_time  BETWEEN  #{startTime} AND  #{endTime} AND product_code = #{productCode}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseAlarmMapper.java

@@ -29,5 +29,6 @@ public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
     List<BaseAlarm> getDeviceAlarmList(@Param("devList") List<String> devList);
 
     List<Map<String,Object>> getAlarmStatisticDay(@Param("startTime") String startTime,
-                                                  @Param("endTime") String endTime);
+                                                  @Param("endTime") String endTime,
+                                                  @Param("tenantId") Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -229,6 +229,9 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                         .eq(DmpDeviceInfo::getTenantId,SecurityUtils.getTenantId())
                         .eq(DmpDeviceInfo::getDeleteFlag,0);
                 List<DmpDeviceInfo> deviceInfo = dmpDeviceInfoService.list(queryWrapper1);
+                LambdaQueryWrapper<BaseFacilityDevice> lambdaQuery1 = Wrappers.lambdaQuery();
+                lambdaQuery1.in(BaseFacilityDevice::getDeviceId,devList);
+                List<BaseFacilityDevice> records1 = baseFacilityDeviceService.list(lambdaQuery1);
                 if(CollectionUtils.isNotEmpty(deviceInfo)){
                     for(int i=0;i<records.size();i++){
                         for(int j=0;j<deviceInfo.size();j++){
@@ -238,7 +241,12 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                                 break;
                             }
                         }
-
+                        for(int k=0;k<records1.size();k++){
+                            if(records.get(i).getDeviceId().equals(records1.get(k).getDeviceId())){
+                                records.get(i).setFacilityId(records1.get(k).getFacilityId());
+                                break;
+                            }
+                        }
                     }
                 }
             }
@@ -758,7 +766,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
     }
     @Override
     public List<Map<String,Object>> alarmStatisticDay(String startTime,String endTime) {
-        List<Map<String,Object>> list = baseMapper.getAlarmStatisticDay(startTime,endTime);
+        List<Map<String,Object>> list = baseMapper.getAlarmStatisticDay(startTime,endTime,SecurityUtils.getTenantId());
         return list;
     }
 }

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -111,7 +111,7 @@
             FROM
                 `base_alarm`
             WHERE
-                base_alarm.alarm_time >= #{startTime}
+                base_alarm.alarm_time >= #{startTime} AND base_alarm.tenant_id = #{tenantId}
             GROUP BY
                 DATE DESC
             ) _tmpAllTable