Merge remote-tracking branch 'origin/dev' into dev

server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordWechatController.java

@@ -12,6 +12,7 @@ import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.enums.report.PlatformTypeEnum;
 import com.makeit.enums.report.PlatformTypeEnum;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.utils.user.common.CommonUserUtil;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +37,8 @@ public class PlatAlarmRecordWechatController {
     @AuthIgnore
     @AuthIgnore
     public ApiResponseEntity<Map<String,Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public ApiResponseEntity<Map<String,Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
         //小程序告警记录只看到发给自己的告警
         //小程序告警记录只看到发给自己的告警
-        String userId = "1700085146788667394";
+        String userId = CommonUserUtil.getUserId();
+        // String userId = "1700085146788667394";
         PlatAlarmRecordQueryDTO data = dto.getData();
         PlatAlarmRecordQueryDTO data = dto.getData();
         data.setNotifyUser(userId);
         data.setNotifyUser(userId);
 
 

server-service/src/main/java/com/makeit/mapper/platform/alarm/PlatAlarmConfigMapper.java

@@ -3,6 +3,7 @@ package com.makeit.mapper.platform.alarm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.makeit.dto.platform.alarm.PlatHealthConfigDTO;
 import com.makeit.dto.platform.alarm.PlatHealthConfigDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
 import com.makeit.entity.platform.alarm.PlatAlarmConfig;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -21,4 +22,6 @@ public interface PlatAlarmConfigMapper extends BaseMapper<PlatAlarmConfig> {
      * @return
      * @return
      */
      */
     List<PlatHealthConfigDTO> getHealthConfigList();
     List<PlatHealthConfigDTO> getHealthConfigList();
+
+    List<PlatAlarmConfig> listOffBed(@Param("orgDeviceId") String orgDeviceId);
 }
 }

server-service/src/main/java/com/makeit/service/platform/alarm/PlatAlarmConfigService.java

@@ -42,4 +42,6 @@ public interface PlatAlarmConfigService extends IService<PlatAlarmConfig> {
     List<PlatHealthConfigDTO> getHealthConfigList();
     List<PlatHealthConfigDTO> getHealthConfigList();
 
 
     void initData();
     void initData();
+
+    List<PlatAlarmConfig> listOfBed(String orgId);
 }
 }

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java

@@ -16,6 +16,7 @@ import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.id.IdConst;
 import com.makeit.enums.id.IdConst;
 import com.makeit.exception.BusinessException;
 import com.makeit.exception.BusinessException;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.global.aspect.tenant.TenantIdUtil;
 import com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper;
 import com.makeit.mapper.platform.alarm.PlatAlarmConfigMapper;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
 import com.makeit.service.platform.alarm.PlatAlarmConfigService;
@@ -57,6 +58,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
     private AlarmConfigCacheUtil alarmConfigUtil;
     private AlarmConfigCacheUtil alarmConfigUtil;
     @Resource
     @Resource
     private PlatOrgService platOrgService;
     private PlatOrgService platOrgService;
+    @Resource
+    private PlatAlarmConfigMapper configMapper;
 
 
     @Override
     @Override
     public List<PlatAlarmConfigListVO> list(PlatAlarmConfigQueryDTO dto) {
     public List<PlatAlarmConfigListVO> list(PlatAlarmConfigQueryDTO dto) {
@@ -256,4 +259,10 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
             saveBatch(saveList);
             saveBatch(saveList);
         }
         }
     }
     }
+
+    @Override
+    @TenantIdIgnore
+    public List<PlatAlarmConfig> listOfBed(String orgDeviceId) {
+        return configMapper.listOffBed(orgDeviceId);
+    }
 }
 }

server-service/src/main/resources/mappers/PlatAlarmConfigMapper.xml

@@ -21,4 +21,13 @@
                 and pehi.respiratory_exception_time != '' and pehi.respiratory_rate != '')
                 and pehi.respiratory_exception_time != '' and pehi.respiratory_rate != '')
             )
             )
     </select>
     </select>
+
+
+    <select id="listOffBed" resultType="com.makeit.entity.platform.alarm.PlatAlarmConfig">
+        select *
+        from plat_alarm_config
+        where org_id in (
+            select org_id from plat_device where id = #{orgDeviceId} and del_flag = 0)
+          and alarm_type = 5 and tenant_id != 0
+    </select>
 </mapper>
 </mapper>

server-service/src/main/resources/mappers/PlatDeviceMapper.xml

@@ -62,7 +62,6 @@
 
 
     <select id="getDeviceIdsBySpaceIdAndElder" resultType="com.makeit.vo.platform.device.PlatDeviceListVO">
     <select id="getDeviceIdsBySpaceIdAndElder" resultType="com.makeit.vo.platform.device.PlatDeviceListVO">
         select
         select
-        distinct
         pd.*,
         pd.*,
         ps.parent_path as spaceParentPath,
         ps.parent_path as spaceParentPath,
         ps.name as spaceName,
         ps.name as spaceName,
@@ -118,6 +117,7 @@
 
 
             </if>
             </if>
         </where>
         </where>
+        GROUP BY pd.ori_device_id
         order by pd.update_date desc,pd.id desc
         order by pd.update_date desc,pd.id desc
     </select>
     </select>