配电图相关接口5

fiveep-model/src/main/java/com/bizmatics/model/vo/HookupComponentBasicsVo.java

@@ -0,0 +1,135 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2022-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class HookupComponentBasicsVo implements Serializable {
+
+    /**
+     * 类别
+     */
+    private Integer sort;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内部类型
+     */
+    private String type;
+
+    /**
+     * 类型名称
+     */
+    @TableField("typeName")
+    private String typeName;
+
+    /**
+     * 元器件颜色
+     */
+    @TableField("svgColor")
+    private String svgColor;
+
+    /**
+     * 元器件X坐标
+     */
+    @TableField("svgPositionX")
+    private Integer svgPositionX;
+
+    /**
+     * 元器件Y坐标
+     */
+    @TableField("svgPositionY")
+    private Integer svgPositionY;
+
+    /**
+     * 大小
+     */
+    private Integer size;
+
+    /**
+     * 高度
+     */
+    private Integer height;
+
+    /**
+     * 宽度
+     */
+    private Integer width;
+
+    /**
+     * 字体大小
+     */
+    @TableField("fontSize")
+    private Integer fontSize;
+
+    /**
+     * 元器件描述
+     */
+    @TableField("svgText")
+    private String svgText;
+
+    /**
+     * 角度
+     */
+    private Integer angle;
+
+    /**
+     * 表行数
+     */
+    @TableField("tableRowCount")
+    private Integer tableRowCount;
+
+    /**
+     * 表列数
+     */
+    @TableField("tableColCount")
+    private Integer tableColCount;
+
+    /**
+     * 表数据
+     */
+    private Object tableData;
+
+    private Object elementBool;
+
+    /**
+     * 所属站点ID
+     */
+    private Integer siteId;
+
+    /**
+     * 所属设备ID
+     */
+    private Integer deviceId;
+
+    /**
+     * 主表id
+     */
+    private Integer hookupId;
+
+    /**
+     * 所属变量ID
+     */
+    private Integer variableId;
+}

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

@@ -1,6 +1,5 @@
 package com.bizmatics.model.vo;
 
-import com.bizmatics.model.HookupComponentBasics;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,7 +53,7 @@ public class HookupOneVo implements Serializable {
     /**
      * 所属站点ID
      */
-    private HookupComponentBasics array;
+    private HookupComponentBasicsVo array;
 
 
 }

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

@@ -6,6 +6,7 @@ import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.*;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.HookupComponentBasicsVo;
 import com.bizmatics.model.vo.HookupComponentCompleteOneVo;
 import com.bizmatics.model.vo.HookupComponentCompleteVo;
 import com.bizmatics.model.vo.HookupOneVo;
@@ -73,6 +74,7 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
         }
         List<HookupComponentBasics> hookupComponentBasicsList = hookupComponentBasicsService.list(queryWrapperOne);
         List<HookupOneVo> hookupOneVoList = new ArrayList<HookupOneVo>();
+//        List<HookupComponentBasicsVo> hookupComponentBasicsVoList = new ArrayList<HookupComponentBasicsVo>();
         if (hookupList.size() > 0) {
             for (int i = 0; i < hookupList.size(); i++) {
                 HookupOneVo hookupOneVo = new HookupOneVo();
@@ -83,8 +85,33 @@ public class HookupServiceImpl extends AbstractCrudService<HookupMapper, Hookup>
                 hookupOneVo.setPriviewImg(hookupList.get(i).getPriviewImg());
                 for (int j = 0; j < hookupComponentBasicsList.size(); j++) {
                     if (hookupList.get(i).getId() == hookupComponentBasicsList.get(j).getHookupId()) {
-                        hookupOneVo.setArray(hookupComponentBasicsList.get(j));
+                        HookupComponentBasicsVo hookupComponentBasicsVo = new HookupComponentBasicsVo();
+                        hookupComponentBasicsVo.setSort(hookupComponentBasicsList.get(i).getSort());
+                        hookupComponentBasicsVo.setTitle(hookupComponentBasicsList.get(i).getTitle());
+                        hookupComponentBasicsVo.setType(hookupComponentBasicsList.get(i).getInnerType());
+                        hookupComponentBasicsVo.setTypeName(hookupComponentBasicsList.get(i).getTypeName());
+                        hookupComponentBasicsVo.setSvgColor(hookupComponentBasicsList.get(i).getSvgColor());
+                        hookupComponentBasicsVo.setSvgPositionX(hookupComponentBasicsList.get(i).getSvgPositionX());
+                        hookupComponentBasicsVo.setSvgPositionY(hookupComponentBasicsList.get(i).getSvgPositionY());
+                        hookupComponentBasicsVo.setSize(hookupComponentBasicsList.get(i).getSize());
+                        hookupComponentBasicsVo.setHeight(hookupComponentBasicsList.get(i).getHeight());
+                        hookupComponentBasicsVo.setWidth(hookupComponentBasicsList.get(i).getWidth());
+                        hookupComponentBasicsVo.setFontSize(hookupComponentBasicsList.get(i).getFontSize());
+                        hookupComponentBasicsVo.setSvgText(hookupComponentBasicsList.get(i).getSvgText());
+                        hookupComponentBasicsVo.setAngle(hookupComponentBasicsList.get(i).getAngle());
+                        hookupComponentBasicsVo.setTableRowCount(hookupComponentBasicsList.get(i).getTableRowCount());
+                        hookupComponentBasicsVo.setTableColCount(hookupComponentBasicsList.get(i).getTableColCount());
+                        hookupComponentBasicsVo.setTableData(hookupComponentBasicsList.get(i).getTableData());
+                        if (hookupComponentBasicsList.get(i).getElementBool().equals("")) {
+                            hookupComponentBasicsVo.setElementBool("");
+                        } else {
+                            hookupComponentBasicsVo.setElementBool(hookupComponentBasicsList.get(i).getElementBool().split(","));
+                        }
+
+                        hookupOneVo.setArray(hookupComponentBasicsVo);
                     }
+
+
                 }
                 hookupOneVoList.add(hookupOneVo);
             }