更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/TestController.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.controller.org;
 
+import com.github.microservice.core.util.bytes.BytesUtil;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.server.core.service.TestService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -10,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Collections;
+
 @Slf4j
 @RestController
 @RequestMapping("test")
@@ -25,8 +29,28 @@ public class TestController {
 
 //        openAPIRegisterService.initRegisterPAIS();
 
+        try{
+            byte[] bins = BytesUtil.longToBin(Long.parseLong("2152525002"), 4);
+            var ret = reverse(bins);
+            String str = BytesUtil.binToHex(ret);
+            log.info("str; {}", str.toUpperCase());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return this.testService.text();
     }
 
+    public static byte[] reverse(byte[] bin) {
+        var items = new ArrayList<Byte>();
+        for (var b : bin) {
+            items.add(b);
+        }
+        Collections.reverse(items);
+        byte[] ret = new byte[items.size()];
+        for (int i = 0; i < items.size(); i++) {
+            ret[i] = items.get(i);
+        }
+        return ret;
+    }
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/CardInfoDao.java

@@ -28,7 +28,7 @@ public interface CardInfoDao extends MongoDao<CardInfo>, CardInfoDaoExtend {
 
     List<CardInfo> findByUserIdAndProjectOid(String userId, String projectOid);
 
-    List<CardInfo> findByProjectOidAndUserIdInAndCardState(String projectOid, List<String> userIds, CardState state);
+    List<CardInfo> findByProjectOidAndUserIdInAndCardStateOrderByUpdateTimeDesc(String projectOid, List<String> userIds, CardState state);
 
     void deleteByUserIdAndOid(String userId, String oid);
 }

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

@@ -156,8 +156,11 @@ public class DeviceUseRecordService extends SuperService {
 
     public DeviceUseRecord init(String mqttDataId) {
         DeviceUseRecord entity = deviceUseRecordDao.init(mqttDataId, TokenUtil.create());
-        entity.setCreateTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
-        return entity;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            entity.setCreateTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
+            return entity;
+        }
+        return null;
     }
 
     /**

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

@@ -84,7 +84,7 @@ public class CardInfoPoolService extends SuperService {
         if (ObjectUtils.isEmpty(organization)) {
             return ResultContent.buildFail(String.format("机构不存在：%s", param.getOid()));
         }
-
+        param.setCode(param.getCode().toUpperCase());
         OidAboutInfo oidAboutInfo = organizationManagerService.getOidAboutInfo(oid);
         String projectOid = oidAboutInfo.getProjectOid();
         // 项目唯一
@@ -238,7 +238,7 @@ public class CardInfoPoolService extends SuperService {
                         failDetails.add(String.format("第%d行卡号不能为空", startRow));
                         continue;
                     }
-                    code = code.trim();
+                    code = code.trim().toUpperCase();
                     if (codeMap.containsKey(code)) {
                         failDetails.add(String.format("第%d行卡号%s已存在", startRow, code));
                         continue;

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

@@ -734,7 +734,7 @@ public class CardInfoServiceImpl extends SuperService implements CardInfoService
 
     public List<CardInfo> getProjectCards(String projectOid, List<String> userIds) {
         if (StringUtils.isNotEmpty(projectOid) && ObjectUtils.isNotEmpty(userIds)) {
-            return cardInfoDao.findByProjectOidAndUserIdInAndCardState(projectOid, userIds, CardState.Enable);
+            return cardInfoDao.findByProjectOidAndUserIdInAndCardStateOrderByUpdateTimeDesc(projectOid, userIds, CardState.Enable);
         }
         return Lists.newArrayList();
     }