From 010ef2a907e66efd4702443c06cdd18f8a7ffa5b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2024 14:08:53 +0800
Subject: [PATCH] IP归属地查询接口集成
---
src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java b/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
index 2c4bc6c..131d67d 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/CategoryAreaService.java
@@ -1,7 +1,6 @@
package com.yeshi.buwan.service.imp;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Resource;
@@ -16,10 +15,9 @@
import com.yeshi.buwan.dao.CategoryContryDao;
import com.yeshi.buwan.domain.CategoryContry;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.VideoInfo;
import com.yeshi.buwan.domain.VideoResource;
-import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.StringUtil;
@Service
@@ -28,22 +26,6 @@
private ClassService classService;
@Resource
private CategoryContryDao categoryContryDao;
-
- public CategoryContryDao getCategoryContryDao() {
- return categoryContryDao;
- }
-
- public void setCategoryContryDao(CategoryContryDao categoryContryDao) {
- this.categoryContryDao = categoryContryDao;
- }
-
- public ClassService getClassService() {
- return classService;
- }
-
- public void setClassService(ClassService classService) {
- this.classService = classService;
- }
@Cacheable(value = "classCache", key = "'categoryContryList'+'-'+#cid")
public List<CategoryContry> categoryContryList(String cid) {
@@ -149,7 +131,9 @@
private boolean isContainsResource(List<Long> resourceList, List<VideoResource> relist) {
List<Long> targetList = new ArrayList<>();
for (VideoResource vr : relist)
- targetList.add(Long.parseLong(vr.getId()));
+ if(!StringUtil.isNullOrEmpty(vr.getId())) {
+ targetList.add(Long.parseLong(vr.getId()));
+ }
targetList.retainAll(resourceList);
return targetList.size() > 0;
}
--
Gitblit v1.8.0