Ver código fonte

查询信息点时,统一返回默认集团编码

linhuili 3 anos atrás
pai
commit
85d4e411cf

+ 3 - 0
src/main/java/com/persagy/proxy/adm/controller/AdmLocationPointController.java

@@ -169,6 +169,9 @@ public class AdmLocationPointController {
             return;
         }
         List<AdmLocationPoint> points = (List<AdmLocationPoint>) admResponse.getContent();
+        if(CollUtil.isEmpty(points)){
+            return;
+        }
         for (AdmLocationPoint point : points) {
             ArrayList<AdmPointImage> imageList = point.getImageList();
             if(CollUtil.isEmpty(imageList)){

+ 5 - 0
src/main/java/com/persagy/proxy/adm/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -26,6 +26,7 @@ import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,6 +48,9 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
     @Autowired
     private DmpDicClient dicClient;
 
+    @Value("${middleware.group.code}")
+    private String groupCode;
+
     /**
      * 查询DMP字典数据
      * @param context
@@ -191,6 +195,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
             admVO.setSecondName(admVO.getSecondTag());
             admVO.setMultiple(admVO.getIsMultiple());
             admVO.setRegion(admVO.getIsRegion());
+            admVO.setGroupCode(groupCode);
 
             //path路径处理
             if(StringUtils.isEmpty(admVO.getFirstName()) || AdmDictConstant.FIRST_BASE_TAG.equals(admVO.getFirstName())