Merge branch 'dev' into local-slave

# Conflicts:
#	nb-admin/pom.xml
#	nb-admin/src/main/resources/application-dev.yml
#	nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

nb-admin/src/main/resources/application.yml

@@ -41,7 +41,7 @@ sa-token:
   # token有效期，单位s 默认30天, -1代表永不过期
   timeout: 2592000
   # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒 一天
-  activity-timeout: 86400
+  activity-timeout: -1
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)

nb-service/web-service/src/main/java/com/nb/web/service/bus/service/LocalBusDeviceService.java

@@ -129,16 +129,14 @@ public class LocalBusDeviceService extends BaseService<BusDeviceMapper, BusDevic
      */
     @Transactional(rollbackFor = Exception.class)
     public boolean removeIotById(String id){
-        //首先判断id是否存在
-        BusDeviceEntity device = this.getById(id);
-        if(ObjectUtil.isNotNull(device)){
-            if (aliyunIotSdk.deleteDevice(device.getDeviceId())) {
-                return this.removeById(id);
-            }else {
-                return false;
-            }
-        }
-        return true;
+        return this.removeById(id);
+//        //首先判断id是否存在
+//        BusDeviceEntity device = this.getById(id);
+//        if(ObjectUtil.isNotNull(device)){
+////            aliyunIotSdk.deleteDevice(device.getDeviceId());
+//            return this.removeById(id);
+//        }
+//        return true;
     }
 
     /**

nb-service/web-service/src/main/java/com/nb/web/service/bus/stats/analyse/PcaStatsAnalyse.java

@@ -128,10 +128,12 @@ public class PcaStatsAnalyse implements CommonHistoryStats {
             for (CombineResult combineResult : combineResults) {
                 Integer validCount = Optional.ofNullable(combineResult.getPcaValidCount()).orElse(0);
                 Integer invalidCount =Optional.ofNullable( combineResult.getPcaInvalidCount()).orElse(0);
-                CombineResult lastCombineResult = Optional.ofNullable(combineMap.get(combineResult.getId())).orElse(new CombineResult());
-
-                pcaValidTotalCount=pcaValidTotalCount+validCount-Optional.ofNullable(lastCombineResult.getPcaValidCount()).orElse(0);
-                pcaInvalidTotalCount=pcaInvalidTotalCount+invalidCount-Optional.ofNullable(lastCombineResult.getPcaInvalidCount()).orElse(0);
+//                CombineResult lastCombineResult = Optional.ofNullable(combineMap.get(combineResult.getId())).orElse(new CombineResult());
+//
+                pcaValidTotalCount=pcaValidTotalCount+validCount;
+//                        -Optional.ofNullable(lastCombineResult.getPcaValidCount()).orElse(0);
+                pcaInvalidTotalCount=pcaInvalidTotalCount+invalidCount;
+//                        -Optional.ofNullable(lastCombineResult.getPcaInvalidCount()).orElse(0);
 
                 combineMap.put(combineResult.getId(),combineResult);
             }

nb-service/web-service/src/main/java/com/nb/web/service/system/service/impl/SysUserServiceImpl.java

@@ -84,7 +84,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         queryWrapper.eq(SysUser::getStatus, StatusEnum.YES.getValue());
         queryWrapper.and(StrUtil.isNotBlank(req.getDeptId()), wrapper -> wrapper.eq(SysUser::getDeptId, req.getDeptId())
                 .or(!CollectionUtils.isEmpty(sysDeptIdList), wrapper2 -> wrapper2.in(SysUser::getDeptId, sysDeptIdList)));
-        queryWrapper.orderByAsc(SysUser::getCreateTime);
+        queryWrapper.orderByAsc(SysUser::getSort);
         IPage<SysUser> page = this.page(reqPage, queryWrapper);
         page.getRecords().forEach(item -> {
             // 设置部门名称