代码结构调整

src/main/java/com/gic/plug/web/controller/ScreeningController.java

@@ -110,6 +110,13 @@ public class ScreeningController {
     public RestResponse getScreeningData(String widgetChainId) {
         List<EsScreeningChainDetailDTO> list = this.esScreeningInitService
                 .queryEsScreeningByParentChainId(widgetChainId);
+        list = list.stream().peek(item -> {
+            if (StringUtils.isNotBlank(item.getWidget().getWidgetValues())) {
+                List<WidgetValuesOldVO> oldVOS = JSONObject.parseArray(item.getWidget().getWidgetValues(), WidgetValuesOldVO.class);
+                List<WidgetValuesNewVO> newVOList = oldVOS.stream().map(data -> new WidgetValuesNewVO(data.getKey(), data.getValue(), data.getName())).collect(Collectors.toList());
+                item.getWidget().setWidgetValues(JSON.toJSONString(newVOList));
+            }
+        }).collect(Collectors.toList());
         return RestResponse.success(list);
     }
 
@@ -117,6 +124,11 @@ public class ScreeningController {
     @ResponseBody
     public RestResponse getScreeningChainDetail(String parentChainId, String widgetFieldKey) {
         EsScreeningChainDetailDTO dto = this.esScreeningInitService.findChainDetail(parentChainId, widgetFieldKey);
+        if (StringUtils.isNotBlank(dto.getWidget().getWidgetValues())) {
+            List<WidgetValuesOldVO> oldVOS = JSONObject.parseArray(dto.getWidget().getWidgetValues(), WidgetValuesOldVO.class);
+            List<WidgetValuesNewVO> newVOList = oldVOS.stream().map(data -> new WidgetValuesNewVO(data.getKey(), data.getValue(), data.getName())).collect(Collectors.toList());
+            dto.getWidget().setWidgetValues(JSON.toJSONString(newVOList));
+        }
         return RestResponse.success(dto);
     }
 
@@ -125,6 +137,11 @@ public class ScreeningController {
     @ResponseBody
     public Object getScreeningWidgetDetail(String widgetChainId) {
         EsScreeningChainDetailDTO dto = this.esScreeningInitService.findChainDetail(widgetChainId);
+        if (StringUtils.isNotBlank(dto.getWidget().getWidgetValues())) {
+            List<WidgetValuesOldVO> oldVOS = JSONObject.parseArray(dto.getWidget().getWidgetValues(), WidgetValuesOldVO.class);
+            List<WidgetValuesNewVO> newVOList = oldVOS.stream().map(data -> new WidgetValuesNewVO(data.getKey(), data.getValue(), data.getName())).collect(Collectors.toList());
+            dto.getWidget().setWidgetValues(JSON.toJSONString(newVOList));
+        }
         return RestResponse.success(dto);
     }
 }