新增 获取墒情站预警配置功能

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotWarnindicatorServiceImpl.java

@@ -16,16 +16,12 @@ import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceCommonService;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotWarndataitemMapper;
 import com.yunfeiyun.agmp.iotm.web.mapper.IotWarnindicatorMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotWarnindicatorService;
-import io.jsonwebtoken.lang.Collections;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -169,7 +165,12 @@ public class IotWarnindicatorServiceImpl implements IIotWarnindicatorService {
     }
 
     private boolean isFactorDevice(String devTypeBid) {
-        if(Collections.contains(Arrays.asList(QxzTypeUtil.getAllQxzTypes()).iterator(),devTypeBid)){
+        List<String> devTypeList = new ArrayList<>();
+        devTypeList.addAll(Arrays.asList(QxzTypeUtil.getAllQxzTypes()));
+        devTypeList.addAll(Arrays.asList(QxzTypeUtil.getAllSqzTypes()));
+
+        Set<String> devTypeSet = new HashSet<>(devTypeList);
+        if(devTypeSet.contains(devTypeBid)){
             return true;
         }
         return false;