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

db/inti-elder.sql

@@ -391,6 +391,9 @@ ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep_analysis`
     ADD COLUMN `action_count` int(4) COMMENT '体动次数' AFTER `happen_date`,
 ADD COLUMN `turned_count` int(4) COMMENT '翻身次数' AFTER `action_count`;
 
+ALTER TABLE `dev_iot_yanglao_platform`.`plat_elder_sleep`
+    ADD COLUMN `elder_sleep_type` int(4) COMMENT '睡眠类型 1 睡眠 2 小憩' AFTER `happen_date`;
+
 CREATE TABLE `plat_elder_breathe_day_stat`
 (
     `id`                 varchar(64) NOT NULL COMMENT 'id',

server-common/src/main/java/com/makeit/common/vo/ExcelErrorVo.java

@@ -58,11 +58,15 @@ public class ExcelErrorVo implements Serializable {
         }
     }
 
-    public static void exists(Map<String, String> emailMap,String value, List<ExcelErrorVo> errorVoList, int i, String title){
+    public static void exists(Map<String, String> emailMap,String key, List<ExcelErrorVo> errorVoList, int i, String title){
+        if (StringUtils.isBlank(key)){
+            return;
+        }
+        String value = emailMap.get(key);
         if(StringUtils.isNotBlank(value)){
             errorVoList.add(new ExcelErrorVo(i,title,"数据重复"));
         }else {
-            emailMap.put(value,"system");
+            emailMap.put(key,"system");
         }
     }
 }

server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderSleep.java

@@ -36,6 +36,8 @@ public class PlatElderSleep extends BaseBusEntity {
     @ApiModelProperty(value = "起床时间")
     private LocalDateTime endSleep;
 
+    @ApiModelProperty(value = "睡眠类型 1 睡眠 2 小憩")
+    private Integer elderSleepType;
     @ApiModelProperty(value = "当前日期 yyyy-mm-dd")
     private String happenDate;
 

server-service/src/main/java/com/makeit/enums/report/ElderSleepType.java

+package com.makeit.enums.report;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum ElderSleepType {
+
+    SLEEP(1,"睡眠"),
+    REST(2,"小憩");
+
+    private int code;
+    private String value;
+}

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.makeit.service.platform.auth.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -43,7 +44,6 @@ import com.makeit.module.admin.vo.plat.PlatButtonVO;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import com.makeit.module.admin.vo.plat.PlatUserLoginVO;
 import com.makeit.module.admin.vo.plat.PlatUserRoleMenuRedisVO;
-import com.makeit.module.system.service.SysDictionaryCategoryService;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.platform.auth.PlatRoleMenuService;
 import com.makeit.service.platform.auth.PlatRoleOrgService;
@@ -123,8 +123,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
     @Autowired
     private PlatOrgService platOrgService;
 
-    @Autowired
-    private SysDictionaryCategoryService sysDictionaryCategoryService;
+    private DefaultIdentifierGenerator defaultIdentifierGenerator = new DefaultIdentifierGenerator();
 
     private static final Logger logger = LoggerFactory.getLogger(PlatUserServiceImpl.class);
 
@@ -1074,6 +1073,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
      * @param excelFile
      */
     @Override
+    @Transactional
     public ExcelImportVo importExcel(MultipartFile excelFile) throws Exception {
         List<PlatUserImportDTO> platUserImportDTOS = ExcelUtil.importExcel(null, 3, excelFile, PlatUserImportDTO.class);
 
@@ -1090,7 +1090,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         userLambdaQueryWrapper.select(PlatUser::getMobile, PlatUser::getEmail, BaseEntity::getId);
         List<PlatUser> userList = this.list(userLambdaQueryWrapper);
         Map<String, String> mobileMap = userList.stream().collect(Collectors.toMap(PlatUser::getMobile, BaseEntity::getId, (a, b) -> a));
-        Map<String, String> emailMap = userList.stream().collect(Collectors.toMap(PlatUser::getEmail, BaseEntity::getId, (a, b) -> a));
+        Map<String, String> emailMap = userList.stream().filter(vo->StringUtils.isNotBlank(vo.getEmail())).collect(Collectors.toMap(PlatUser::getEmail, BaseEntity::getId, (a, b) -> a));
 
         return ExcelValidatorUtil.validateMain(3, platUserImportDTOS, list -> {
             List<ExcelErrorVo> errorVoList = new ArrayList<>();
@@ -1104,11 +1104,12 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                 PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(dto.getOrgName())).orElse(new PlatOrg());
                 ExcelErrorVo.notExists(platOrg.getId(), errorVoList, start + i, "*所属组织");
                 ExcelErrorVo.notExists(roleNameMap.get(dto.getRoleName()), errorVoList, start + i, "*角色");
-                ExcelErrorVo.exists(mobileMap, mobileMap.get(dto.getMobile()), errorVoList, start + i, "手机号*");
-                ExcelErrorVo.exists(emailMap, emailMap.get(dto.getEmail()), errorVoList, start + i, "邮箱");
+                ExcelErrorVo.exists(mobileMap, dto.getMobile(), errorVoList, start + i, "手机号*");
+                ExcelErrorVo.exists(emailMap, dto.getEmail(), errorVoList, start + i, "邮箱");
             }
             if (errorVoList.isEmpty()) {
                 List<PlatUser> platUsers = new ArrayList<>();
+                List<PlatUserRole> platUserRoles = new ArrayList<>();
                 platUserImportDTOS.forEach(vo -> {
                     PlatUser platUser = BeanDtoVoUtils.convert(vo, PlatUser.class);
                     vo.setPassword(PasswordUtils.encryptPassword(vo.getPassword()));
@@ -1119,10 +1120,17 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
                     PlatOrg platOrg = Optional.ofNullable(orgNameMap.get(vo.getOrgName())).orElse(new PlatOrg());
                     platUser.setOrgId(platOrg.getId());
                     platUser.setOrgPath(platOrg.getPath() + "," + platOrg.getId());
+                    platUser.setId(String.valueOf(defaultIdentifierGenerator.nextId(platUser)));
                     platUsers.add(platUser);
+                    PlatUserRole platUserRole = new PlatUserRole();
+                    platUserRole.setUserId(platUser.getId());
+                    String roleId = roleNameMap.get(vo.getRoleName());
+                    platUserRole.setRoleId(roleId);
+                    platUserRoles.add(platUserRole);
                 });
-
                 saveBatch(platUsers);
+                platUserRoleService.saveBatch(platUserRoles);
+
             }
             return errorVoList;
         });

server-service/src/main/java/com/makeit/task/IotSyncTask.java

@@ -16,7 +16,6 @@ import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.saas.PlatTenantService;
 import com.makeit.utils.DeviceCacheUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -67,13 +66,11 @@ public class IotSyncTask {
             }
             //查询iot设备
             List<DeviceInstanceEntity> iotDeviceList = iotOrgService.getOrgDevice(iotOrgId);
-            if (CollectionUtils.isEmpty(iotDeviceList)) {
-                continue;
-            }
             //查询平台设备
             Set<String> iotDeviceIdSet = iotDeviceList.stream().map(DeviceInstanceEntity::getId).collect(Collectors.toSet());
             LambdaQueryWrapper<PlatDevice> deviceLambdaQueryWrapper = new LambdaQueryWrapper<PlatDevice>().eq(BaseBusEntity::getTenantId, platTenant.getId())
                     .in(PlatDevice::getOriDeviceId, iotDeviceIdSet);
+            iotDeviceIdSet.add("-1");
             //删除设备
             LambdaQueryWrapper<PlatDevice> removeQw = new LambdaQueryWrapper<PlatDevice>().notIn(PlatDevice::getOriDeviceId, iotDeviceIdSet)
                     .eq(BaseBusEntity::getTenantId, platTenant.getId());