Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

server-api/src/main/java/com/makeit/api/external/filter/SignAuthFilter.java

@@ -30,7 +30,7 @@ public class SignAuthFilter implements Filter {
 		HttpServletRequest request = (HttpServletRequest) req;
 		HttpServletResponse response = (HttpServletResponse) res;
 		try {
-			String sign = request.getHeader("sign");
+			String sign = request.getHeader("token");
 			if (StringUtils.isEmpty(sign)) {
 				response.sendError(403, "Forbidden");
 				return;

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

@@ -48,6 +48,13 @@ public class PlatAlarmRecordController {
         return ApiResponseUtils.success();
     }
 
+    @ApiOperation("未读条数")
+    @PostMapping("unreadCount")
+    public ApiResponseEntity<Integer> unreadCount(@RequestBody PlatAlarmRecordQueryDTO dto) {
+        Integer count =  platAlarmRecordService.unreadCount(dto);
+        return ApiResponseUtils.success(count);
+    }
+
 //    @Autowired
 //    private MailMsgSender mailMsgSender;
 //    @Autowired

server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

@@ -43,5 +43,12 @@ public class PlatAlarmRecordChildrenController {
         platAlarmRecordService.read(dto.getId());
         return ApiResponseUtils.success();
     }
+
+    @ApiOperation("未读条数")
+    @PostMapping("unreadCount")
+    public ApiResponseEntity<Integer> unreadCount(@RequestBody PlatAlarmRecordQueryDTO dto) {
+        Integer count =  platAlarmRecordService.unreadCount(dto);
+        return ApiResponseUtils.success(count);
+    }
 }
 

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

@@ -63,6 +63,8 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
      */
     private String noticeStatus;
 
+    private String readFlag;
+
 
 
 }

server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderReportDTO.java

@@ -40,4 +40,5 @@ public class PlatElderReportDTO extends PlatElderIdDTO {
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 
+    private String tenantId;
 }

server-service/src/main/java/com/makeit/mapper/platform/space/PlatBedMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.makeit.dto.platform.space.PlatBedPanoramaDTO;
 import com.makeit.dto.platform.space.PlatBedQueryDTO;
 import com.makeit.dto.platform.workstation.WorkStationQueryDTO;
-import com.makeit.dto.saas.SaasOperationLogDTO;
 import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.vo.platform.space.PlatBedPanoramaVO;
 import com.makeit.vo.platform.space.PlatBedVo;

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

@@ -63,4 +63,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
     void dealAlarm(BaseIdDTO dto);
 
     void read(String id);
+
+    Integer unreadCount(PlatAlarmRecordQueryDTO dto);
 }

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

@@ -151,6 +151,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                     }
                 })
                 .eq(StringUtils.isNotBlank(param.getNoticeStatus()),PlatAlarmRecord::getNoticeStatus,param.getNoticeStatus())
+                .eq(StringUtils.isNotBlank(param.getReadFlag()),PlatAlarmRecord::getReadFlag,param.getReadFlag())
                 .orderByDesc(BaseEntity::getCreateDate)
                 ;
     }
@@ -509,4 +510,23 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 .set(PlatAlarmRecord::getReadFlag, CommonEnum.YES.getValue());
         update(recordLambdaUpdateWrapper);
     }
+
+    @Override
+    public Integer unreadCount(PlatAlarmRecordQueryDTO dto) {
+        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
+        log.info("子女端账号："+platElderChildrenInfo.toString());
+        if (platElderChildrenInfo == null) {
+            return 0;
+        }
+        String elderId = platElderChildrenInfo.getElderId();
+        if(StringUtils.isBlank(elderId)){
+            return 0;
+        }
+        String[] split = elderId.split(",");
+        dto.setElderIdList(Arrays.asList(split));
+        dto.setNoticeStatus(CommonEnum.YES.getValue());
+        dto.setReadFlag(CommonEnum.NO.getValue());
+        LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(dto);
+        return Math.toIntExact(count(lambdaQueryWrapper));
+    }
 }

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java

@@ -2,6 +2,7 @@ package com.makeit.service.platform.elder.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.*;
@@ -412,7 +413,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 //            }
         });
 
-
+        lambdaQueryWrapper.eq(StringUtils.isNotBlank(platElderIdDTO.getTenantId()), BaseBusEntity::getTenantId,platElderIdDTO.getTenantId());
         lambdaQueryWrapper.orderByAsc(PlatElderBreatheDayStat::getDay);
 
         List<PlatElderBreatheDayStat> breatheDayStatList = platElderBreatheDayStatService.list(lambdaQueryWrapper);

server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java

@@ -178,10 +178,18 @@ public class WorkStationServiceImpl implements WorkStationService {
             }
             List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
             dto.setOrgIds(orgIds);
+        }else {
+            List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
+                    .eq(PlatOrg::getId, dto.getOrgIds()));
+            List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.INSTITUTION.getValue().equals(t.getType()))
+                    .map(PlatOrg::getId).collect(Collectors.toList());
+            if(orgIds.isEmpty()){
+                return new PageVO<>();
+            }
+            dto.setOrgIds(orgIds);
         }
 
         if (dto.getSpaceIds().isEmpty()) {
-
             spaces = platSpaceService.list(new QueryWrapper<PlatSpace>().lambda()
                     .in(PlatSpace::getOrgId, dto.getOrgIds()));
             if (spaces.isEmpty()) {
@@ -475,6 +483,15 @@ public class WorkStationServiceImpl implements WorkStationService {
             }
             List<String> orgIds = orgs.stream().map(PlatOrg::getId).collect(Collectors.toList());
             dto.setOrgIds(orgIds);
+        }else {
+            List<PlatOrg> orgs = platOrgService.list(new QueryWrapper<PlatOrg>().lambda()
+                    .eq(PlatOrg::getId, dto.getOrgIds()));
+            List<String> orgIds = orgs.stream().filter(t->PlatOrgEnum.OrgTypeEnum.HOME.getValue().equals(t.getType()))
+                    .map(PlatOrg::getId).collect(Collectors.toList());
+            if(orgIds.isEmpty()){
+                return new PageVO<>();
+            }
+            dto.setOrgIds(orgIds);
         }
 
         if (dto.getSpaceIds().isEmpty()) {

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

@@ -3,24 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.makeit.mapper.platform.space.PlatBedMapper">
-    <resultMap id="BaseResultMap" type="com.makeit.entity.platform.space.PlatBed">
-        <id property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="tenantId" column="tenant_id" jdbcType="VARCHAR"/>
-        <result property="name" column="name" jdbcType="VARCHAR"/>
-        <result property="roomId" column="room_id" jdbcType="VARCHAR"/>
-        <result property="spaceId" column="space_id" jdbcType="VARCHAR"/>
-        <result property="status" column="status" jdbcType="VARCHAR"/>
-        <result property="sort" column="sort" jdbcType="VARCHAR"/>
-        <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
-        <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
-        <result property="update_by" column="update_by" jdbcType="VARCHAR"/>
-        <result property="sort" column="sort" jdbcType="VARCHAR"/>
-        <result property="delFlag" column="del_flag" jdbcType="CHAR"/>
-    </resultMap>
 
     <select id="selectBySpaceIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
-        SELECT pb.id,pb.`status`,pb.name as bedName ,pm.`name` as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
-        FROM `plat_bed` pb
+        SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
+        FROM plat_bed pb
         LEFT JOIN plat_room pm on pb.room_id = pm.id
         LEFT JOIN plat_elder pe on pe.bed_id = pb.id
         <where>
@@ -35,8 +21,8 @@
     </select>
 
     <select id="selectByRoomIdAndStatus" resultType="com.makeit.vo.platform.space.PlatBedPanoramaVO">
-        SELECT pb.id,pb.`status`,pb.name as bedName ,pm.`name` as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
-        FROM `plat_bed` pb
+        SELECT pb.id,pb.status,pb.name as bedName ,pm.name as roomName,pm.space_path as spacePath,pe.name as elderName,pe.id as elderId,pm.id as roomId
+        FROM plat_bed pb
         LEFT JOIN plat_room pm on pb.room_id = pm.id
         LEFT JOIN plat_elder pe on pe.bed_id = pb.id and pe.del_flag = 0
         <where>