企业竞赛单项

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/StoreRankController.java

@@ -7,9 +7,11 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.web.qo.PageQo;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.StoreWidgetDTO;
+import com.gic.enterprise.api.dto.data.DataIndexExplainDTO;
 import com.gic.enterprise.api.dto.rank.StoreRankAreaDTO;
 import com.gic.enterprise.api.dto.rank.StoreRankIndexDTO;
 import com.gic.enterprise.api.service.StoreWidgetService;
+import com.gic.enterprise.api.service.data.DataIndexApiService;
 import com.gic.enterprise.api.service.rank.StoreRankApiService;
 import com.gic.enterprise.service.CustomSettingApiService;
 import com.gic.haoban.manage.web.vo.rank.IndexVO;
@@ -39,6 +41,8 @@ public class StoreRankController {
     private CustomSettingApiService customSettingApiService;
     @Autowired
     private StoreWidgetService storeWidgetService;
+    @Autowired
+    private DataIndexApiService dataIndexApiService;
 
     public static final String RANK_INDEX_DB_NAME = "tab_store_pk_index_dict";
     public static final String ORDER_FIELD = "custom_order_field_name";
@@ -58,13 +62,25 @@ public class StoreRankController {
         Page<JSONObject> page = customSettingApiService.page(RANK_INDEX_DB_NAME, queryMap, 1, 100).getResult();
         List<JSONObject> list = page.getResult();
         List<IndexVO> indexList = JSON.parseArray(JSON.toJSONString(list), IndexVO.class);
+        List<DataIndexExplainDTO> dictIndex = dataIndexApiService.listDataIndexExplain();
+        Map<String, DataIndexExplainDTO> map = dictIndex.stream().collect(Collectors.toMap(e -> e.getIndexCode(), e -> e));
+        for (IndexVO vo : indexList) {
+            DataIndexExplainDTO dto = map.get(vo.getIndexCode());
+            if (dto != null) {
+                vo.setIndexExample(dto.getIndexExample());
+                vo.setIndexName(dto.getIndexName());
+                vo.setApiColName(dto.getApiColName());
+                vo.setIndexExplain(dto.getIndexExplain());
+                vo.setIndexRemark(dto.getIndexRemark());
+            }
+        }
 
         List<StoreRankIndexDTO> enterpriseIndexList = storeRankApiService.listStoreRankIndex(enterpriseId);
         if (CollectionUtils.isEmpty(enterpriseIndexList)) {
             return RestResponse.successResult(Collections.emptyList());
         }
-        Set<String> map = indexList.stream().map(e -> e.getIndexCode()).collect(Collectors.toSet());
-        indexList = indexList.stream().filter(e -> map.contains(e.getIndexCode())).collect(Collectors.toList());
+        Set<String> set = indexList.stream().map(e -> e.getIndexCode()).collect(Collectors.toSet());
+        indexList = indexList.stream().filter(e -> set.contains(e.getIndexCode())).collect(Collectors.toList());
         return RestResponse.successResult(indexList);
     }