Browse Source

配电图相关接口开发调整2

jichaobo 3 years ago
parent
commit
1b2ea46326

+ 1 - 1
fiveep-model/src/main/java/com/bizmatics/model/vo/HookupOneVo.java

@@ -59,7 +59,7 @@ public class HookupOneVo implements Serializable {
 
     private String createType;
 
-    private Object echartsOption;
+    private String echartsOption;
 
     private String svgLineSelectval;
 

+ 6 - 6
fiveep-service/src/main/java/com/bizmatics/service/impl/HookupServiceImpl.java

@@ -90,12 +90,12 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupOne.setCreateType(hookupList.get(i).getCreateType());
                 hookupOne.setPriviewImg(hookupList.get(i).getPriviewImg());
                 hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption());
-                if ("".equals(hookupList.get(i).getEchartsOption())||hookupList.get(i).getEchartsOption()==null) {
-                    hookupOne.setEchartsOption("");
-                } else {
-                    hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption().split(","));
-                }
-
+//                if ("".equals(hookupList.get(i).getEchartsOption())||hookupList.get(i).getEchartsOption()==null) {
+//                    hookupOne.setEchartsOption("");
+//                } else {
+//                    hookupOne.setEchartsOption(JSONArray.parseObject(hookupList.get(i).getEchartsOption()));
+//                }
+                hookupOne.setEchartsOption(hookupList.get(i).getEchartsOption());
                 hookupOne.setElementBool(hookupList.get(i).getElementBool());
                 hookupOne.setSvgLineSelectval(hookupList.get(i).getSvgLineSelectval());
                 hookupListlist.add(hookupOne);