|
@@ -8,6 +8,7 @@ import com.cdf.common.ResultCode;
|
|
import com.cdf.entity.HotRelation;
|
|
import com.cdf.entity.HotRelation;
|
|
import com.cdf.entity.NumRegion;
|
|
import com.cdf.entity.NumRegion;
|
|
import com.cdf.entity.ProductHk;
|
|
import com.cdf.entity.ProductHk;
|
|
|
|
+import com.cdf.entity.ProductSource;
|
|
import com.cdf.exception.BusinessException;
|
|
import com.cdf.exception.BusinessException;
|
|
import com.cdf.httpClient.client.CdfClient;
|
|
import com.cdf.httpClient.client.CdfClient;
|
|
import com.cdf.httpClient.client.FdkkClient;
|
|
import com.cdf.httpClient.client.FdkkClient;
|
|
@@ -20,6 +21,7 @@ import com.cdf.httpClient.response.cdf.*;
|
|
import com.cdf.service.IFdkkUserService;
|
|
import com.cdf.service.IFdkkUserService;
|
|
import com.cdf.service.IHotRelationService;
|
|
import com.cdf.service.IHotRelationService;
|
|
import com.cdf.service.IProductHkService;
|
|
import com.cdf.service.IProductHkService;
|
|
|
|
+import com.cdf.service.IProductSourceService;
|
|
import com.cdf.util.*;
|
|
import com.cdf.util.*;
|
|
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
|
import com.google.zxing.client.j2se.MatrixToImageWriter;
|
|
import com.google.zxing.common.BitMatrix;
|
|
import com.google.zxing.common.BitMatrix;
|
|
@@ -37,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@Slf4j
|
|
@Slf4j
|
|
@@ -69,6 +72,8 @@ public class FdkkSceneEditService {
|
|
IProductHkService productHkService;
|
|
IProductHkService productHkService;
|
|
@Autowired
|
|
@Autowired
|
|
IFdkkUserService fdkkUserService;
|
|
IFdkkUserService fdkkUserService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IProductSourceService productSourceService;
|
|
|
|
|
|
|
|
|
|
public JSONObject getAuth(String num, String token) {
|
|
public JSONObject getAuth(String num, String token) {
|
|
@@ -269,6 +274,7 @@ public class FdkkSceneEditService {
|
|
|
|
|
|
List<String> sidsList = new ArrayList<>();
|
|
List<String> sidsList = new ArrayList<>();
|
|
HashMap<String,HotRelation> hotRelationMap = new HashMap<>();
|
|
HashMap<String,HotRelation> hotRelationMap = new HashMap<>();
|
|
|
|
+ HashMap<Integer,ProductSource> productSourceMap = new HashMap<>();
|
|
for (Object obj : tags) {
|
|
for (Object obj : tags) {
|
|
JSONObject tag = (JSONObject) obj;
|
|
JSONObject tag = (JSONObject) obj;
|
|
String sid = tag.getString("sid");
|
|
String sid = tag.getString("sid");
|
|
@@ -278,6 +284,12 @@ public class FdkkSceneEditService {
|
|
for (HotRelation hotRelation : hotRelations) {
|
|
for (HotRelation hotRelation : hotRelations) {
|
|
hotRelationMap.put(hotRelation.getHotId(),hotRelation);
|
|
hotRelationMap.put(hotRelation.getHotId(),hotRelation);
|
|
}
|
|
}
|
|
|
|
+ Set<Integer> productIds = hotRelations.stream().map(HotRelation::getProductSourceId).collect(Collectors.toSet());
|
|
|
|
+ List<ProductSource> productSources = productSourceService.listByIds(productIds);
|
|
|
|
+ for (ProductSource productSource : productSources) {
|
|
|
|
+ productSourceMap.put(productSource.getId(),productSource);
|
|
|
|
+ }
|
|
|
|
+
|
|
for (Object obj : tags) {
|
|
for (Object obj : tags) {
|
|
JSONObject tag = (JSONObject) obj;
|
|
JSONObject tag = (JSONObject) obj;
|
|
String sid = tag.getString("sid");
|
|
String sid = tag.getString("sid");
|
|
@@ -302,6 +314,9 @@ public class FdkkSceneEditService {
|
|
if(jsonArray == null || jsonArray.size() <=0){
|
|
if(jsonArray == null || jsonArray.size() <=0){
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ if(hotRelation.getProductSourceId() != null){
|
|
|
|
+ tag.put("productSource",productSourceMap.get(hotRelation.getProductSourceId()));
|
|
|
|
+ }
|
|
resultMap.put(sid,jsonArray);
|
|
resultMap.put(sid,jsonArray);
|
|
requestArray.addAll(jsonArray);
|
|
requestArray.addAll(jsonArray);
|
|
}
|
|
}
|