更新！ 取消GateWay信息

FullCardClient/src/main/java/com/zhongshu/card/client/utils/DateUtils.java

@@ -52,6 +52,10 @@ public class DateUtils {
 
     public final static String patternyyyyMMCn = "yyyy年MM月";
 
+    public final static String patternyyyyMMddHHmmKey = "yyyy-MM-dd-HH-mm";
+
+    public final static String patternyyyyMMddHHKey = "yyyy-MM-dd-HH";
+
     public static Long timeToLong(String time) {
         return timeToLong(time, FORMAT_LONG);
     }
@@ -832,9 +836,10 @@ public class DateUtils {
 
     /**
      * 得到半年前的时间
+     *
      * @return
      */
-    public static Long getSixMonthsAgo () {
+    public static Long getSixMonthsAgo() {
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.MONTH, -6);
         Date sixMonthsAgo = calendar.getTime();

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.device.DeviceAboutInfo;
+import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.DeviceType;
@@ -78,6 +79,9 @@ public class DeviceInfo extends SuperMain {
     @Schema(description = "设备型号")
     private DeviceSpecType specType;
 
+    @Schema(description = "设备品类")
+    private DeviceCategory deviceCategory;
+
     @Schema(description = "网关号")
     private String gateWayId;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceSyncFromIotService.java

@@ -17,7 +17,6 @@ import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.CommonUtil;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/OrgUserFaceService.java

@@ -397,7 +397,7 @@ public class OrgUserFaceService extends SuperService {
         if (ObjectUtils.isNotEmpty(entity)) {
             model = new OrgUserFaceModel();
             BeanUtils.copyProperties(entity, model);
-            model.setUserAccount(userAccountService.toSimpleModel(entity.getUserAccount()));
+            model.setUserAccount(userAccountService.toSimpleDesenModel(entity.getUserAccount()));
             model.setOrganizationUser(organizationUserServiceImpl.toModel(entity.getOrganizationUser()));
         }
         return model;