From c17a0d27b6a2e9e0ebda4ee584b6b2fdf4e323ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 05 十一月 2025 12:46:14 +0800
Subject: [PATCH] 数采调整

---
 cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java          |   11 ++-
 cnas-device/src/main/java/com/ruoyi/device/constant/DCResistanceMqttConstants.java             |   29 +++++++++
 ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java                               |   21 +++++-
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java   |    6 ++
 cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java                                |    4 
 cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java                          |   20 +++---
 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java         |    4 +
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java             |    6 +-
 inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java      |    9 +++
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java                 |    4 
 ruoyi-admin-ztns/src/main/resources/application-ztns.yml                                       |    2 
 cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java                             |    3 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java |    4 +
 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java            |    2 
 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java       |   39 +++++++------
 15 files changed, 118 insertions(+), 46 deletions(-)

diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
index 161ea61..e0de03f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -193,7 +194,8 @@
                 return map;
         }
         standardMethodLists.addAll(standardMethodMapper.selectStandardMethodListsByNull(str));
-        map.put("standardMethodList", standardMethodLists);
+        List<StandardMethodList> collect = standardMethodLists.stream().distinct().collect(Collectors.toList());
+        map.put("standardMethodList", collect);
         return map;
     }
 
diff --git a/cnas-device/src/main/java/com/ruoyi/device/constant/DCResistanceMqttConstants.java b/cnas-device/src/main/java/com/ruoyi/device/constant/DCResistanceMqttConstants.java
index cca34ae..0a495aa 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/constant/DCResistanceMqttConstants.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/constant/DCResistanceMqttConstants.java
@@ -5,10 +5,39 @@
  */
 public class DCResistanceMqttConstants {
 
+    /**
+     * SN鍙�
+     */
     public final static String  NSDQCS_DQCS_SN = "NSDQCS.DQCS.SN";
 
+    /**
+     * 鐢甸樆鍊�
+     */
     public final static String  NSDQCS_DQCS_DZZ = "NSDQCS.DQCS.DZZ";
 
+    /**
+     * 64
+     */
     public final static String  NSDQCS_DQCS_64 = "NSDQCS.DQCS.64";
 
+    /**
+     * 闀垮害
+     */
+    public final static String  NSDQCS_DQCS_CD = "NSDQCS.DQCS.CD";
+
+    /**
+     * 鍙嶅悜鐢甸樆鍊�
+     */
+    public final static String  NSDQCS_DQCS_FXDZZ = "NSDQCS.DQCS.FXDZZ";
+
+    /**
+     * 姝e悜鐢甸樆鍊�
+     */
+    public final static String  NSDQCS_DQCS_ZXDZZ = "NSDQCS.DQCS.ZXDZZ";
+
+    /**
+     * 娓╁害
+     */
+    public final static String  NSDQCS_DQCS_WD = "NSDQCS.DQCS.WD";
+
 }
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
index f47e0a3..1b7d540 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mqtt/MQCallback.java
@@ -71,11 +71,11 @@
             String parse = new String(message.getPayload());
             switch (topic){
                 case "/ztt/v3/2455220/publish":
-                    //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋�
+                    //鑰愪笣锛氱洿娴佺數闃绘暟鎹В鏋怤S-ER02001
                     mqCallback.collectBridgeService.dcResistanceDataAnalysis(parse);
                     break;
                 case "/ztt/v3/2455221/publish":
-                    //鑰愪笣锛氫几闀跨巼鏁版嵁瑙f瀽
+                    //鑰愪笣锛氫几闀跨巼鏁版嵁瑙f瀽NS-FM05003
                     mqCallback.collectBridgeService.elongationDataAnalysis(parse);
                     break;
             }
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
index 2012af6..8d65fc2 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/CollectBridge.java
@@ -39,9 +39,10 @@
     @ApiModelProperty("鏈�鍚庝竴娆¢噰闆嗘椂闂�")
     private LocalDateTime lastCollectDate;
 
-    public CollectBridge(String entrustCode, BigDecimal collectValue, LocalDateTime firstCollectDate, LocalDateTime lastCollectDate) {
+    public CollectBridge(String entrustCode, BigDecimal collectValue, Double collectTemperature, LocalDateTime firstCollectDate, LocalDateTime lastCollectDate) {
         this.entrustCode = entrustCode;
         this.collectValue = collectValue;
+        this.collectTemperature = collectTemperature;
         this.firstCollectDate = firstCollectDate;
         this.lastCollectDate = lastCollectDate;
     }
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
index 96663aa..14b64fe 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/CollectBridgeServiceImpl.java
@@ -118,17 +118,22 @@
         if(CollectionUtil.isNotEmpty(dataMap) && Objects.nonNull(dataMap.get("data"))){
             List<DeviceMqttVO> dataList = JSONArray.parseObject(dataMap.get("data").toString(), new TypeReference<List<DeviceMqttVO>>(){}.getType());
             //杩囨护鍑哄寘鍚疄闄呯數闃诲�肩殑瀵硅薄
-            // 澶勭悊 NSDQCS.DQCS.DZZ 鏁版嵁
             String entrustCode = getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_SN);
-            BigDecimal value = new BigDecimal(getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_DZZ));
+            BigDecimal zxdzzValue = new BigDecimal(getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_ZXDZZ));
+            BigDecimal fxdzzValue = new BigDecimal(getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_FXDZZ));
+//            BigDecimal testLength = new BigDecimal(getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_CD));
+            Double tempValue = new BigDecimal(getValueByDataStream(dataList,DCResistanceMqttConstants.NSDQCS_DQCS_WD)).setScale(2, RoundingMode.HALF_UP).doubleValue();
+            //璁$畻骞冲潎鐢甸樆鍊�
+            BigDecimal value = zxdzzValue.abs().add(fxdzzValue.abs()).divide(BigDecimal.valueOf(2L), RoundingMode.HALF_UP);
             Long count = collectBridgeMapper.selectCount(Wrappers.<CollectBridge>lambdaQuery().eq(CollectBridge::getEntrustCode, entrustCode));
             if(count>0L){
                 collectBridgeMapper.update(null,Wrappers.<CollectBridge>lambdaUpdate()
                         .set(CollectBridge::getCollectValue,value)
+                        .set(CollectBridge::getCollectTemperature,tempValue)
                         .set(CollectBridge::getLastCollectDate,LocalDateTime.now())
                         .eq(CollectBridge::getEntrustCode,entrustCode));
             }else{
-                collectBridgeMapper.insert(new CollectBridge(entrustCode,value,LocalDateTime.now(),LocalDateTime.now()));
+                collectBridgeMapper.insert(new CollectBridge(entrustCode,value,tempValue,LocalDateTime.now(),LocalDateTime.now()));
             }
         }
     }
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
index 44cba26..eb50362 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +13,7 @@
 import com.ruoyi.device.pojo.Device;
 import com.ruoyi.device.service.DataConfigService;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -91,8 +91,8 @@
         List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery()
                         .eq(DataConfig::getDeviceId,dataConfig.getDeviceId())
                         .eq(DataConfig::getInspectionItem,dataConfig.getInspectionItem())
-                        .eq(DataConfig::getInspectionItemClass,dataConfig.getInspectionItemClass())
-                        .eq(DataConfig::getInspectionItemSubclass,dataConfig.getInspectionItemSubclass())
+                        .eq(StringUtils.isNotBlank(dataConfig.getInspectionItemClass()),DataConfig::getInspectionItemClass,dataConfig.getInspectionItemClass())
+                        .eq(StringUtils.isNotBlank(dataConfig.getInspectionItemSubclass()),DataConfig::getInspectionItemSubclass,dataConfig.getInspectionItemSubclass())
                         .eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
         return Result.success(list);
     }
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index 6e9bc72..94fa69d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -313,11 +313,11 @@
                         throw new ErrorException("鐩存祦鐢甸樆鏁伴噰寮傚父锛氭病鏈夋壘鍒板鎵樼紪鍙蜂负銆�"+entrustCode+"銆戠殑鏁版嵁");
                     }
                     list.add(0,1);//娴嬭瘯闀垮害锛岄粯璁�1
-                    list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());//todo:娓╁害锛屾殏鏃舵湭閲囬泦鍒板��
+                    list.add(1,Objects.isNull(collectBridge.getCollectTemperature())?0.0:collectBridge.getCollectTemperature());
                     list.add(2,collectBridge.getCollectValue());//瀹為檯鐢甸樆鍊�
                 }else {
                     // 浠� Redis 涓幏鍙栧垪琛ㄦ暟鎹�
-                    List<?> objectList = RedisUtil.lGet(refery, 0, -1);
+                    Set<Object> objectList = RedisUtil.getZSetRange(refery, 0, -1);
                     list.addAll(objectList);
                 }
                 numberOfDataEntries.getAndIncrement();
diff --git a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
index 751b778..ebe5dd4 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/utils/DataAcquisition.java
@@ -277,7 +277,7 @@
         // 浠� JSON 鏁版嵁涓彁鍙� data 鏁扮粍
         JSONArray dataList = JSONArray.parseArray(jsonObject.get("data").toString());
         dataConfig.forEach((k, v) -> {
-            AtomicInteger numberOfDataEntries = new AtomicInteger();
+            AtomicInteger numberOfDataEntries = new AtomicInteger(0);
             List<Object> list = new ArrayList<>();
             for (int config = 0; config < v.size(); config++) {
 //                String refery = v.get(config).getRefery();
@@ -295,15 +295,15 @@
             List<Object> result = new ArrayList<>();
             for (int i = 0; i < numberOfDataEntries.get(); i++) {
                 String aggregate = "";
-                for (int j = 0; j < v.size(); j++) {
-                    int index;
-                    if (j == 0) {
-                        index = i;
-                    } else {
-                        index = numberOfDataEntries.get() + i;
-                    }
-                    aggregate += list.get(index).toString() + ",";
-                }
+//                for (int j = 0; j < v.size(); j++) {
+//                    int index;
+//                    if (j == 0) {
+//                        index = i;
+//                    } else {
+//                        index = numberOfDataEntries.get() + i;
+//                    }
+//                }
+                aggregate += list.get(i).toString() + ",";
                 int lastIndex = aggregate.lastIndexOf(",");
                 String substring = aggregate.substring(0, lastIndex);
                 result.add(substring);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
index c62878c..0bbd552 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/RawMaterialOrderController.java
@@ -358,4 +358,13 @@
         return Result.success(rawMaterialOrderService.confirmSplitOrder(orderSplitDTO));
     }
 
+    /**
+     * 鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺
+     */
+    @ApiOperation(value = "鏍规嵁ifsId鏌ヨ涓嬪崟鏁伴噺")
+    @GetMapping("/getOrderCountByIfsId/{ifsId}")
+    public Result getOrderCountByIfsId(@PathVariable("ifsId") Long ifsId){
+        return Result.success(rawMaterialOrderService.getOrderCountByIfsId(ifsId));
+    }
+
 }
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
index c8d88f0..7ed340b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java
@@ -155,4 +155,6 @@
     Result importSplitOrderData(MultipartFile file,Long ifsId, HttpServletRequest request);
 
     boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO);
+
+    Long getOrderCountByIfsId(Long ifsId);
 }
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java
index 75839b8..89fb4c2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/IfsPartPropsRecordServiceImpl.java
@@ -7,6 +7,7 @@
 import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
 import com.ruoyi.basic.pojo.IfsInventoryQuantity;
 import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.enums.OrderType;
 import com.ruoyi.common.utils.api.IfsApiUtils;
 import com.ruoyi.inspect.dto.IfsPartPropsRecordDTO;
 import com.ruoyi.inspect.mapper.IfsSplitOrderRecordMapper;
@@ -15,6 +16,7 @@
 import com.ruoyi.inspect.service.IfsPartPropsRecordService;
 import com.ruoyi.inspect.mapper.IfsPartPropsRecordMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -81,7 +83,7 @@
             throw new RuntimeException("鏈壘鍒板搴旂殑IFS璁㈠崟淇℃伅");
         }
         //鍒ゆ柇鏄惁鏄媶鍒嗚鍗�
-        if(ifsInventoryQuantity.getIsSplitOrder().equals(1)){
+        if(ifsInventoryQuantity.getIsSplitOrder().equals(1)&& StringUtils.equals(ifsInventoryQuantity.getOrderType(), OrderType.RAW.getValue())){
             //鏌ヨ鎷嗗垎璁板綍
             IfsSplitOrderRecord splitRecord = ifsSplitOrderRecordMapper.selectOne(Wrappers.<IfsSplitOrderRecord>lambdaQuery()
                     .eq(IfsSplitOrderRecord::getOrderNo, ifsInventoryQuantity.getOrderNo())
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index ad8f72d..e7df59d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -1970,26 +1970,29 @@
 
         //璁剧疆鏍峰紡
         TableStyle tableStyle = new TableStyle();
-        for (int i = 1; i <= max; i++) {
-            // 鏍规嵁鍑忓帇閭g粨鏋滀釜鏁颁慨鏀归暱搴�
-            switch (i) {
-                case 1:
-                    tableStyle.setColWidths(new int[]{650, 2900, 850, 2300, 2100, 1200});
-                    break;
-                case 2:
-                    tableStyle.setColWidths(new int[]{650, 2700, 850, 2200, 1200, 1200, 1200});
-                    break;
-                case 3:
-                    tableStyle.setColWidths(new int[]{650, 2700, 850, 1600, 1000, 1000, 1000, 1200});
-                    break;
-                case 4:
-                    tableStyle.setColWidths(new int[]{650, 2400, 850, 1500, 850, 850, 850, 850, 1200});
-                    break;
-                case 5:
-                    tableStyle.setColWidths(new int[]{650, 2200, 850, 1350, 750, 750, 750, 750, 750, 1200});
-                    break;
+        if(max<=5){
+            for (int i = 1; i <= max; i++) {
+                // 鏍规嵁妫�楠岀粨鏋滀釜鏁颁慨鏀归暱搴�
+                switch (i) {
+                    case 1:
+                        tableStyle.setColWidths(new int[]{650, 2900, 850, 2300, 2100, 1200});
+                        break;
+                    case 2:
+                        tableStyle.setColWidths(new int[]{650, 2700, 850, 2200, 1200, 1200, 1200});
+                        break;
+                    case 3:
+                        tableStyle.setColWidths(new int[]{650, 2700, 850, 1600, 1000, 1000, 1000, 1200});
+                        break;
+                    case 4:
+                        tableStyle.setColWidths(new int[]{650, 2400, 850, 1500, 850, 850, 850, 850, 1200});
+                        break;
+                    case 5:
+                        tableStyle.setColWidths(new int[]{650, 2200, 850, 1350, 750, 750, 750, 750, 750, 1200});
+                        break;
+                }
             }
         }
+
         tableStyle.setWidth("10000");
         tableStyle.setAlign(TableRowAlign.CENTER);
         BorderStyle borderStyle = new BorderStyle();
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 176775d..9cff08f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -958,6 +958,12 @@
         return false;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+    public Long getOrderCountByIfsId(Long ifsId) {
+        return insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getIfsInventoryId,ifsId).ne(InsOrder::getState,-1));
+    }
+
     /**
      * 娣诲姞宸ユ椂
      * @param insOrder
diff --git a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
index 1e856e3..2f44f7a 100644
--- a/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
+++ b/ruoyi-admin-ztns/src/main/resources/application-ztns.yml
@@ -131,7 +131,7 @@
 # oa娴佺▼
 oa:
   oaHost: http://192.168.0.49:8000/oa_workflowrequest.asmx?wsdl
-  prodIp: http://192.168.21.53:7012/lims
+  prodIp: http://192.168.21.53:7002/lims
   unqualifiedProcessId: 715114
 
 # 浼佷笟寰俊鎺ㄩ��
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
index fd82b06..069773e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtil.java
@@ -12,10 +12,7 @@
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Component
@@ -677,5 +674,21 @@
         }
     }
 
+    /**
+     * 鑾峰彇zset鍏冪礌锛屾寜鎺掑悕
+     * @param key   閿�
+     * @param start 寮�濮嬬储寮�
+     * @param end   缁撴潫绱㈠紩
+     * @return
+     */
+    public static Set<Object> getZSetRange(String key,long start,long end){
+        try {
+            return redisTemplate.opsForZSet().range(key,start,end);
+        }catch(Exception e){
+            e.printStackTrace();
+            return new HashSet<Object>();
+        }
+    }
+
 }
 

--
Gitblit v1.9.3