cq

master/src/main/java/com/ruoyi/project/aspen/controller/TDashboarddataController.java

@@ -0,0 +1,103 @@
+package com.ruoyi.project.aspen.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.aspen.domain.TDashboarddata;
+import com.ruoyi.project.aspen.service.ITDashboarddataService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * dashboard抓取数据Controller
+ *
+ * @author ruoyi
+ * @date 2022-01-06
+ */
+@RestController
+@RequestMapping("/aspen/dashboarddata")
+public class TDashboarddataController extends BaseController
+{
+    @Autowired
+    private ITDashboarddataService tDashboarddataService;
+
+    /**
+     * 查询dashboard抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDashboarddata tDashboarddata)
+    {
+        startPage();
+        List<TDashboarddata> list = tDashboarddataService.selectTDashboarddataList(tDashboarddata);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出dashboard抓取数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:export')")
+    @Log(title = "dashboard抓取数据", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDashboarddata tDashboarddata)
+    {
+        List<TDashboarddata> list = tDashboarddataService.selectTDashboarddataList(tDashboarddata);
+        ExcelUtil<TDashboarddata> util = new ExcelUtil<TDashboarddata>(TDashboarddata.class);
+        return util.exportExcel(list, "dashboarddata");
+    }
+
+    /**
+     * 获取dashboard抓取数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tDashboarddataService.selectTDashboarddataById(id));
+    }
+
+    /**
+     * 新增dashboard抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:add')")
+    @Log(title = "dashboard抓取数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDashboarddata tDashboarddata)
+    {
+        return toAjax(tDashboarddataService.insertTDashboarddata(tDashboarddata));
+    }
+
+    /**
+     * 修改dashboard抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:edit')")
+    @Log(title = "dashboard抓取数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDashboarddata tDashboarddata)
+    {
+        return toAjax(tDashboarddataService.updateTDashboarddata(tDashboarddata));
+    }
+
+    /**
+     * 删除dashboard抓取数据
+     */
+    @PreAuthorize("@ss.hasPermi('aspen:dashboarddata:remove')")
+    @Log(title = "dashboard抓取数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tDashboarddataService.deleteTDashboarddataByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboarddata.java

@@ -0,0 +1,404 @@
+package com.ruoyi.project.aspen.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * dashboard抓取数据对象 t_dashboarddata
+ *
+ * @author ruoyi
+ * @date 2022-01-06
+ */
+public class TDashboarddata extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 唯一标识ID */
+    private Long id;
+
+    /** 删除状态 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 抓取时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "抓取时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private String updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 物料平衡表产品乙烯 */
+    @Excel(name = "物料平衡表产品乙烯")
+    private String energyYixi;
+
+    /** 物料平衡表产品丙烯 */
+    @Excel(name = "物料平衡表产品丙烯")
+    private String energyBingxi;
+
+    /** 物料平衡表产品氢气 */
+    @Excel(name = "物料平衡表产品氢气")
+    private String energyQingqi;
+
+    /** 物料平衡表产品甲烷 */
+    @Excel(name = "物料平衡表产品甲烷")
+    private String energyJiawan;
+
+    /** 物料平衡表产品C4 */
+    @Excel(name = "物料平衡表产品C4")
+    private String energyCsi;
+
+    /** 物料平衡表产品benzene */
+    @Excel(name = "物料平衡表产品benzene")
+    private String energyBenzene;
+
+    /** 物料平衡表产品toluene */
+    @Excel(name = "物料平衡表产品toluene")
+    private String energyToluene;
+
+    /** 物料平衡表产品xylene */
+    @Excel(name = "物料平衡表产品xylene")
+    private String energyXylene;
+
+    /** 物料平衡表产品C6 */
+    @Excel(name = "物料平衡表产品C6")
+    private String energyTanliu;
+
+    /** 物料平衡表产品wash oil */
+    @Excel(name = "物料平衡表产品wash oil")
+    private String energyWashoil;
+
+    /** 物料平衡表产品C5 */
+    @Excel(name = "物料平衡表产品C5")
+    private String energyTanwu;
+
+    /** 物料平衡表产品IMA */
+    @Excel(name = "物料平衡表产品IMA")
+    private String energyIma;
+
+    /** 物料平衡表产品C9 */
+    @Excel(name = "物料平衡表产品C9")
+    private String energyCjiu;
+
+    /** 物料平衡表产品RPG */
+    @Excel(name = "物料平衡表产品RPG")
+    private String energyRpg;
+
+    /** 物料平衡表进料NAP */
+    @Excel(name = "物料平衡表进料NAP")
+    private String energyfeedNap;
+
+    /** 物料平衡表进料乙烷 */
+    @Excel(name = "物料平衡表进料乙烷")
+    private String energyfeedYiwan;
+
+    /** 物料平衡表进料C5 */
+    @Excel(name = "物料平衡表进料C5")
+    private String energyfeedTanwu;
+
+    /** 物料平衡表进料C6 */
+    @Excel(name = "物料平衡表进料C6")
+    private String energyfeedTanliu;
+
+    /** 物料平衡表进料LPG */
+    @Excel(name = "物料平衡表进料LPG")
+    private String energyfeedLpg;
+
+    /** 物料平衡表产品offgas */
+    @Excel(name = "物料平衡表产品offgas")
+    private String energyOffgas;
+
+    /** 物料平衡表产品LPG */
+    @Excel(name = "物料平衡表产品LPG")
+    private String energyLpg;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setEnergyYixi(String energyYixi)
+    {
+        this.energyYixi = energyYixi;
+    }
+
+    public String getEnergyYixi()
+    {
+        return energyYixi;
+    }
+    public void setEnergyBingxi(String energyBingxi)
+    {
+        this.energyBingxi = energyBingxi;
+    }
+
+    public String getEnergyBingxi()
+    {
+        return energyBingxi;
+    }
+    public void setEnergyQingqi(String energyQingqi)
+    {
+        this.energyQingqi = energyQingqi;
+    }
+
+    public String getEnergyQingqi()
+    {
+        return energyQingqi;
+    }
+    public void setEnergyJiawan(String energyJiawan)
+    {
+        this.energyJiawan = energyJiawan;
+    }
+
+    public String getEnergyJiawan()
+    {
+        return energyJiawan;
+    }
+    public void setEnergyCsi(String energyCsi)
+    {
+        this.energyCsi = energyCsi;
+    }
+
+    public String getEnergyCsi()
+    {
+        return energyCsi;
+    }
+    public void setEnergyBenzene(String energyBenzene)
+    {
+        this.energyBenzene = energyBenzene;
+    }
+
+    public String getEnergyBenzene()
+    {
+        return energyBenzene;
+    }
+    public void setEnergyToluene(String energyToluene)
+    {
+        this.energyToluene = energyToluene;
+    }
+
+    public String getEnergyToluene()
+    {
+        return energyToluene;
+    }
+    public void setEnergyXylene(String energyXylene)
+    {
+        this.energyXylene = energyXylene;
+    }
+
+    public String getEnergyXylene()
+    {
+        return energyXylene;
+    }
+    public void setEnergyTanliu(String energyTanliu)
+    {
+        this.energyTanliu = energyTanliu;
+    }
+
+    public String getEnergyTanliu()
+    {
+        return energyTanliu;
+    }
+    public void setEnergyWashoil(String energyWashoil)
+    {
+        this.energyWashoil = energyWashoil;
+    }
+
+    public String getEnergyWashoil()
+    {
+        return energyWashoil;
+    }
+    public void setEnergyTanwu(String energyTanwu)
+    {
+        this.energyTanwu = energyTanwu;
+    }
+
+    public String getEnergyTanwu()
+    {
+        return energyTanwu;
+    }
+    public void setEnergyIma(String energyIma)
+    {
+        this.energyIma = energyIma;
+    }
+
+    public String getEnergyIma()
+    {
+        return energyIma;
+    }
+    public void setEnergyCjiu(String energyCjiu)
+    {
+        this.energyCjiu = energyCjiu;
+    }
+
+    public String getEnergyCjiu()
+    {
+        return energyCjiu;
+    }
+    public void setEnergyRpg(String energyRpg)
+    {
+        this.energyRpg = energyRpg;
+    }
+
+    public String getEnergyRpg()
+    {
+        return energyRpg;
+    }
+    public void setEnergyfeedNap(String energyfeedNap)
+    {
+        this.energyfeedNap = energyfeedNap;
+    }
+
+    public String getEnergyfeedNap()
+    {
+        return energyfeedNap;
+    }
+    public void setEnergyfeedYiwan(String energyfeedYiwan)
+    {
+        this.energyfeedYiwan = energyfeedYiwan;
+    }
+
+    public String getEnergyfeedYiwan()
+    {
+        return energyfeedYiwan;
+    }
+    public void setEnergyfeedTanwu(String energyfeedTanwu)
+    {
+        this.energyfeedTanwu = energyfeedTanwu;
+    }
+
+    public String getEnergyfeedTanwu()
+    {
+        return energyfeedTanwu;
+    }
+    public void setEnergyfeedTanliu(String energyfeedTanliu)
+    {
+        this.energyfeedTanliu = energyfeedTanliu;
+    }
+
+    public String getEnergyfeedTanliu()
+    {
+        return energyfeedTanliu;
+    }
+    public void setEnergyfeedLpg(String energyfeedLpg)
+    {
+        this.energyfeedLpg = energyfeedLpg;
+    }
+
+    public String getEnergyfeedLpg()
+    {
+        return energyfeedLpg;
+    }
+    public void setEnergyOffgas(String energyOffgas)
+    {
+        this.energyOffgas = energyOffgas;
+    }
+
+    public String getEnergyOffgas()
+    {
+        return energyOffgas;
+    }
+    public void setEnergyLpg(String energyLpg)
+    {
+        this.energyLpg = energyLpg;
+    }
+
+    public String getEnergyLpg()
+    {
+        return energyLpg;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("energyYixi", getEnergyYixi())
+            .append("energyBingxi", getEnergyBingxi())
+            .append("energyQingqi", getEnergyQingqi())
+            .append("energyJiawan", getEnergyJiawan())
+            .append("energyCsi", getEnergyCsi())
+            .append("energyBenzene", getEnergyBenzene())
+            .append("energyToluene", getEnergyToluene())
+            .append("energyXylene", getEnergyXylene())
+            .append("energyTanliu", getEnergyTanliu())
+            .append("energyWashoil", getEnergyWashoil())
+            .append("energyTanwu", getEnergyTanwu())
+            .append("energyIma", getEnergyIma())
+            .append("energyCjiu", getEnergyCjiu())
+            .append("energyRpg", getEnergyRpg())
+            .append("energyfeedNap", getEnergyfeedNap())
+            .append("energyfeedYiwan", getEnergyfeedYiwan())
+            .append("energyfeedTanwu", getEnergyfeedTanwu())
+            .append("energyfeedTanliu", getEnergyfeedTanliu())
+            .append("energyfeedLpg", getEnergyfeedLpg())
+            .append("energyOffgas", getEnergyOffgas())
+            .append("energyLpg", getEnergyLpg())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/aspen/mapper/TDashboarddataMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.aspen.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.aspen.domain.TDashboarddata;
+
+/**
+ * dashboard抓取数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-06
+ */
+public interface TDashboarddataMapper 
+{
+    /**
+     * 查询dashboard抓取数据
+     * 
+     * @param id dashboard抓取数据ID
+     * @return dashboard抓取数据
+     */
+    public TDashboarddata selectTDashboarddataById(Long id);
+
+    /**
+     * 查询dashboard抓取数据列表
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TDashboarddata> selectTDashboarddataList(TDashboarddata tDashboarddata);
+
+    /**
+     * 新增dashboard抓取数据
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    public int insertTDashboarddata(TDashboarddata tDashboarddata);
+
+    /**
+     * 修改dashboard抓取数据
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    public int updateTDashboarddata(TDashboarddata tDashboarddata);
+
+    /**
+     * 删除dashboard抓取数据
+     * 
+     * @param id dashboard抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddataById(Long id);
+
+    /**
+     * 批量删除dashboard抓取数据
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddataByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/aspen/service/ITDashboarddataService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.aspen.service;
+
+import java.util.List;
+import com.ruoyi.project.aspen.domain.TDashboarddata;
+
+/**
+ * dashboard抓取数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-01-06
+ */
+public interface ITDashboarddataService 
+{
+    /**
+     * 查询dashboard抓取数据
+     * 
+     * @param id dashboard抓取数据ID
+     * @return dashboard抓取数据
+     */
+    public TDashboarddata selectTDashboarddataById(Long id);
+
+    /**
+     * 查询dashboard抓取数据列表
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据集合
+     */
+    public List<TDashboarddata> selectTDashboarddataList(TDashboarddata tDashboarddata);
+
+    /**
+     * 新增dashboard抓取数据
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    public int insertTDashboarddata(TDashboarddata tDashboarddata);
+
+    /**
+     * 修改dashboard抓取数据
+     * 
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    public int updateTDashboarddata(TDashboarddata tDashboarddata);
+
+    /**
+     * 批量删除dashboard抓取数据
+     * 
+     * @param ids 需要删除的dashboard抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddataByIds(Long[] ids);
+
+    /**
+     * 删除dashboard抓取数据信息
+     * 
+     * @param id dashboard抓取数据ID
+     * @return 结果
+     */
+    public int deleteTDashboarddataById(Long id);
+}

master/src/main/java/com/ruoyi/project/aspen/service/impl/TDashboarddataServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ruoyi.project.aspen.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.aspen.mapper.TDashboarddataMapper;
+import com.ruoyi.project.aspen.domain.TDashboarddata;
+import com.ruoyi.project.aspen.service.ITDashboarddataService;
+
+import javax.annotation.Resource;
+
+/**
+ * dashboard抓取数据Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-01-06
+ */
+@Service
+public class TDashboarddataServiceImpl implements ITDashboarddataService
+{
+    @Resource
+    private TDashboarddataMapper tDashboarddataMapper;
+
+    /**
+     * 查询dashboard抓取数据
+     *
+     * @param id dashboard抓取数据ID
+     * @return dashboard抓取数据
+     */
+    @Override
+    public TDashboarddata selectTDashboarddataById(Long id)
+    {
+        return tDashboarddataMapper.selectTDashboarddataById(id);
+    }
+
+    /**
+     * 查询dashboard抓取数据列表
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return dashboard抓取数据
+     */
+    @Override
+    public List<TDashboarddata> selectTDashboarddataList(TDashboarddata tDashboarddata)
+    {
+        return tDashboarddataMapper.selectTDashboarddataList(tDashboarddata);
+    }
+
+    /**
+     * 新增dashboard抓取数据
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    @Override
+    public int insertTDashboarddata(TDashboarddata tDashboarddata)
+    {
+        return tDashboarddataMapper.insertTDashboarddata(tDashboarddata);
+    }
+
+    /**
+     * 修改dashboard抓取数据
+     *
+     * @param tDashboarddata dashboard抓取数据
+     * @return 结果
+     */
+    @Override
+    public int updateTDashboarddata(TDashboarddata tDashboarddata)
+    {
+        return tDashboarddataMapper.updateTDashboarddata(tDashboarddata);
+    }
+
+    /**
+     * 批量删除dashboard抓取数据
+     *
+     * @param ids 需要删除的dashboard抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddataByIds(Long[] ids)
+    {
+        return tDashboarddataMapper.deleteTDashboarddataByIds(ids);
+    }
+
+    /**
+     * 删除dashboard抓取数据信息
+     *
+     * @param id dashboard抓取数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDashboarddataById(Long id)
+    {
+        return tDashboarddataMapper.deleteTDashboarddataById(id);
+    }
+}

master/src/main/resources/mybatis/aspen/TDashboarddataMapper.xml

@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.aspen.mapper.TDashboarddataMapper">
+    
+    <resultMap type="TDashboarddata" id="TDashboarddataResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="energyYixi"    column="energy_yixi"    />
+        <result property="energyBingxi"    column="energy_bingxi"    />
+        <result property="energyQingqi"    column="energy_qingqi"    />
+        <result property="energyJiawan"    column="energy_jiawan"    />
+        <result property="energyCsi"    column="energy_csi"    />
+        <result property="energyBenzene"    column="energy_benzene"    />
+        <result property="energyToluene"    column="energy_toluene"    />
+        <result property="energyXylene"    column="energy_xylene"    />
+        <result property="energyTanliu"    column="energy_tanliu"    />
+        <result property="energyWashoil"    column="energy_washoil"    />
+        <result property="energyTanwu"    column="energy_tanwu"    />
+        <result property="energyIma"    column="energy_ima"    />
+        <result property="energyCjiu"    column="energy_cjiu"    />
+        <result property="energyRpg"    column="energy_rpg"    />
+        <result property="energyfeedNap"    column="energyfeed_nap"    />
+        <result property="energyfeedYiwan"    column="energyfeed_yiwan"    />
+        <result property="energyfeedTanwu"    column="energyfeed_tanwu"    />
+        <result property="energyfeedTanliu"    column="energyfeed_tanliu"    />
+        <result property="energyfeedLpg"    column="energyfeed_lpg"    />
+        <result property="energyOffgas"    column="energy_offgas"    />
+        <result property="energyLpg"    column="energy_lpg"    />
+    </resultMap>
+
+    <sql id="selectTDashboarddataVo">
+        select id, del_flag, creater_code, createdate, updater_code, updatedate, energy_yixi, energy_bingxi, energy_qingqi, energy_jiawan, energy_csi, energy_benzene, energy_toluene, energy_xylene, energy_tanliu, energy_washoil, energy_tanwu, energy_ima, energy_cjiu, energy_rpg, energyfeed_nap, energyfeed_yiwan, energyfeed_tanwu, energyfeed_tanliu, energyfeed_lpg, energy_offgas, energy_lpg from t_dashboarddata
+    </sql>
+
+    <select id="selectTDashboarddataList" parameterType="TDashboarddata" resultMap="TDashboarddataResult">
+        <include refid="selectTDashboarddataVo"/>
+        <where>  
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="energyYixi != null  and energyYixi != ''"> and energy_yixi = #{energyYixi}</if>
+            <if test="energyBingxi != null  and energyBingxi != ''"> and energy_bingxi = #{energyBingxi}</if>
+            <if test="energyQingqi != null  and energyQingqi != ''"> and energy_qingqi = #{energyQingqi}</if>
+            <if test="energyJiawan != null  and energyJiawan != ''"> and energy_jiawan = #{energyJiawan}</if>
+            <if test="energyCsi != null  and energyCsi != ''"> and energy_csi = #{energyCsi}</if>
+            <if test="energyBenzene != null  and energyBenzene != ''"> and energy_benzene = #{energyBenzene}</if>
+            <if test="energyToluene != null  and energyToluene != ''"> and energy_toluene = #{energyToluene}</if>
+            <if test="energyXylene != null  and energyXylene != ''"> and energy_xylene = #{energyXylene}</if>
+            <if test="energyTanliu != null  and energyTanliu != ''"> and energy_tanliu = #{energyTanliu}</if>
+            <if test="energyWashoil != null  and energyWashoil != ''"> and energy_washoil = #{energyWashoil}</if>
+            <if test="energyTanwu != null  and energyTanwu != ''"> and energy_tanwu = #{energyTanwu}</if>
+            <if test="energyIma != null  and energyIma != ''"> and energy_ima = #{energyIma}</if>
+            <if test="energyCjiu != null  and energyCjiu != ''"> and energy_cjiu = #{energyCjiu}</if>
+            <if test="energyRpg != null  and energyRpg != ''"> and energy_rpg = #{energyRpg}</if>
+            <if test="energyfeedNap != null  and energyfeedNap != ''"> and energyfeed_nap = #{energyfeedNap}</if>
+            <if test="energyfeedYiwan != null  and energyfeedYiwan != ''"> and energyfeed_yiwan = #{energyfeedYiwan}</if>
+            <if test="energyfeedTanwu != null  and energyfeedTanwu != ''"> and energyfeed_tanwu = #{energyfeedTanwu}</if>
+            <if test="energyfeedTanliu != null  and energyfeedTanliu != ''"> and energyfeed_tanliu = #{energyfeedTanliu}</if>
+            <if test="energyfeedLpg != null  and energyfeedLpg != ''"> and energyfeed_lpg = #{energyfeedLpg}</if>
+            <if test="energyOffgas != null  and energyOffgas != ''"> and energy_offgas = #{energyOffgas}</if>
+            <if test="energyLpg != null  and energyLpg != ''"> and energy_lpg = #{energyLpg}</if>
+            and del_flag = 0
+        </where>
+    </select>
+    
+    <select id="selectTDashboarddataById" parameterType="Long" resultMap="TDashboarddataResult">
+        <include refid="selectTDashboarddataVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTDashboarddata" parameterType="TDashboarddata">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT seq_t_dashboarddata.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_dashboarddata
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="energyYixi != null">energy_yixi,</if>
+            <if test="energyBingxi != null">energy_bingxi,</if>
+            <if test="energyQingqi != null">energy_qingqi,</if>
+            <if test="energyJiawan != null">energy_jiawan,</if>
+            <if test="energyCsi != null">energy_csi,</if>
+            <if test="energyBenzene != null">energy_benzene,</if>
+            <if test="energyToluene != null">energy_toluene,</if>
+            <if test="energyXylene != null">energy_xylene,</if>
+            <if test="energyTanliu != null">energy_tanliu,</if>
+            <if test="energyWashoil != null">energy_washoil,</if>
+            <if test="energyTanwu != null">energy_tanwu,</if>
+            <if test="energyIma != null">energy_ima,</if>
+            <if test="energyCjiu != null">energy_cjiu,</if>
+            <if test="energyRpg != null">energy_rpg,</if>
+            <if test="energyfeedNap != null">energyfeed_nap,</if>
+            <if test="energyfeedYiwan != null">energyfeed_yiwan,</if>
+            <if test="energyfeedTanwu != null">energyfeed_tanwu,</if>
+            <if test="energyfeedTanliu != null">energyfeed_tanliu,</if>
+            <if test="energyfeedLpg != null">energyfeed_lpg,</if>
+            <if test="energyOffgas != null">energy_offgas,</if>
+            <if test="energyLpg != null">energy_lpg,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="energyYixi != null">#{energyYixi},</if>
+            <if test="energyBingxi != null">#{energyBingxi},</if>
+            <if test="energyQingqi != null">#{energyQingqi},</if>
+            <if test="energyJiawan != null">#{energyJiawan},</if>
+            <if test="energyCsi != null">#{energyCsi},</if>
+            <if test="energyBenzene != null">#{energyBenzene},</if>
+            <if test="energyToluene != null">#{energyToluene},</if>
+            <if test="energyXylene != null">#{energyXylene},</if>
+            <if test="energyTanliu != null">#{energyTanliu},</if>
+            <if test="energyWashoil != null">#{energyWashoil},</if>
+            <if test="energyTanwu != null">#{energyTanwu},</if>
+            <if test="energyIma != null">#{energyIma},</if>
+            <if test="energyCjiu != null">#{energyCjiu},</if>
+            <if test="energyRpg != null">#{energyRpg},</if>
+            <if test="energyfeedNap != null">#{energyfeedNap},</if>
+            <if test="energyfeedYiwan != null">#{energyfeedYiwan},</if>
+            <if test="energyfeedTanwu != null">#{energyfeedTanwu},</if>
+            <if test="energyfeedTanliu != null">#{energyfeedTanliu},</if>
+            <if test="energyfeedLpg != null">#{energyfeedLpg},</if>
+            <if test="energyOffgas != null">#{energyOffgas},</if>
+            <if test="energyLpg != null">#{energyLpg},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDashboarddata" parameterType="TDashboarddata">
+        update t_dashboarddata
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="energyYixi != null">energy_yixi = #{energyYixi},</if>
+            <if test="energyBingxi != null">energy_bingxi = #{energyBingxi},</if>
+            <if test="energyQingqi != null">energy_qingqi = #{energyQingqi},</if>
+            <if test="energyJiawan != null">energy_jiawan = #{energyJiawan},</if>
+            <if test="energyCsi != null">energy_csi = #{energyCsi},</if>
+            <if test="energyBenzene != null">energy_benzene = #{energyBenzene},</if>
+            <if test="energyToluene != null">energy_toluene = #{energyToluene},</if>
+            <if test="energyXylene != null">energy_xylene = #{energyXylene},</if>
+            <if test="energyTanliu != null">energy_tanliu = #{energyTanliu},</if>
+            <if test="energyWashoil != null">energy_washoil = #{energyWashoil},</if>
+            <if test="energyTanwu != null">energy_tanwu = #{energyTanwu},</if>
+            <if test="energyIma != null">energy_ima = #{energyIma},</if>
+            <if test="energyCjiu != null">energy_cjiu = #{energyCjiu},</if>
+            <if test="energyRpg != null">energy_rpg = #{energyRpg},</if>
+            <if test="energyfeedNap != null">energyfeed_nap = #{energyfeedNap},</if>
+            <if test="energyfeedYiwan != null">energyfeed_yiwan = #{energyfeedYiwan},</if>
+            <if test="energyfeedTanwu != null">energyfeed_tanwu = #{energyfeedTanwu},</if>
+            <if test="energyfeedTanliu != null">energyfeed_tanliu = #{energyfeedTanliu},</if>
+            <if test="energyfeedLpg != null">energyfeed_lpg = #{energyfeedLpg},</if>
+            <if test="energyOffgas != null">energy_offgas = #{energyOffgas},</if>
+            <if test="energyLpg != null">energy_lpg = #{energyLpg},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTDashboarddataById" parameterType="Long">
+        update t_dashboarddata set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTDashboarddataByIds" parameterType="String">
+        update t_dashboarddata set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/aspen/dashboarddata.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询dashboard抓取数据列表
+export function listDashboarddata(query) {
+  return request({
+    url: '/aspen/dashboarddata/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询dashboard抓取数据详细
+export function getDashboarddata(id) {
+  return request({
+    url: '/aspen/dashboarddata/' + id,
+    method: 'get'
+  })
+}
+
+// 新增dashboard抓取数据
+export function addDashboarddata(data) {
+  return request({
+    url: '/aspen/dashboarddata',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改dashboard抓取数据
+export function updateDashboarddata(data) {
+  return request({
+    url: '/aspen/dashboarddata',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除dashboard抓取数据
+export function delDashboarddata(id) {
+  return request({
+    url: '/aspen/dashboarddata/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出dashboard抓取数据
+export function exportDashboarddata(query) {
+  return request({
+    url: '/aspen/dashboarddata/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/bccHome.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="front" style="width: 100%; height: 100%">
+  <div class="login">
       <dv-loading v-if="loading">Loading...</dv-loading>
       <div v-else class="host-body bg">
         <div class="d-flex jc-center">
@@ -38,7 +38,7 @@
             <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(2)">
               <span class="text colorBlue"></span>
             </div>
-            <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(3)">
+            <div class="react-right ml-3" style="background-color: #0f1325;" @click="openNewWindow">
               <span class="text colorBlue"></span>
             </div>
           </div>
@@ -153,7 +153,8 @@
         dateYear: null,
         dateWeek: null,
         weekday: [this.$t('周日'),this.$t('周一'),this.$t('周二'),this.$t('周三'),this.$t('周四'),this.$t('周五'),this.$t('周六')],
-        timer:null
+        timer:null,
+        redirect: undefined
       };
     },
     components: {
@@ -172,6 +173,14 @@
       acrylicTank,
       productTank
     },
+    watch: {
+      $route: {
+        handler: function(route) {
+          this.redirect = route.query && route.query.redirect;
+        },
+        immediate: true
+      }
+    },
     mounted() {
       this.cancelLoading();
       this.timer = setInterval(()=>{
@@ -200,6 +209,9 @@
         }else if (val === 3) {
           this.dashboard = 3
         }
+      },
+      openNewWindow() {
+        window.open('http://www.baidu.com');//path是文件的全路径地址
       }
     }
   };

ui/src/views/front/bottomLeft.vue

@@ -1,17 +1,23 @@
 <template>
   <div id="bottomLeft">
     <div class="bg-color-black">
-      <!--<div class="d-flex pt-2 pl-2">
+      <div class="d-flex pt-2 pl-2">
         <span style="color:#5cd9e8">
           <icon name="chart-bar"></icon>
         </span>
         <div class="d-flex">
           <span class="fs-xl text mx-2">{{ $t('BCC装置团队总需求') }}</span>
         </div>
-      </div>-->
+      </div>
       <div>
         <!--<valve-chart />-->
-        <dv-scroll-board :config="config" style="height:2.3rem"/>
+
+        <!--BCC装置总需求-->
+        <!--<dv-scroll-board :config="config" style="height:2.1rem"/>-->
+
+        <!--渐变折线图-->
+        <div id="monthEnergyChart" :style="{height:height,width:width}"></div>
+
       </div>
     </div>
   </div>
@@ -19,10 +25,25 @@
 
 <script>
 import valveChart from "../dashboard/ValveChart";
+require('echarts/theme/macarons') // echarts theme
+
+import resize from "../dashboard/mixins/resize";
+const animationDuration = 6000
 export default {
+  mixins: [resize],
+  props: {
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '2.2rem'
+    }
+  },
   data() {
     return {
-      config: {
+      /*config: {
         header: ["", "BCC", "SUB", "EU", "PGU/AEU"],
         data: [
           ["SS(HS)自产", "509", "132", "376", "1"],
@@ -32,24 +53,80 @@ export default {
           ["LS", "-16", "", "-11", "-5"],
           ["TOTAL", "-49", "", "5", ""],
           ["总消耗", "459", "", "381", "62"]
-          /*["TOTAL", "-49", "<span  class='colorRed'>28</span>"],
-          ["总消耗", "459", "<span  class='colorRed'>27</span>"]*/
+          /!*["TOTAL", "-49", "<span  class='colorRed'>28</span>"],
+          ["总消耗", "459", "<span  class='colorRed'>27</span>"]*!/
         ],
-        rowNum: 7, //表格行数
+        rowNum: 6, //表格行数
         headerHeight: 35,
         headerBGC: "#0f1325", //表头
         oddRowBGC: "#0f1325", //奇数行
         evenRowBGC: "#171c33", //偶数行
         columnWidth: [110, 70, 70, 70, 90],
         align: ["center", "center", "center", "center", "center"]
-      }
+      }*/
+
+      chart: null
     };
   },
   components: {
     valveChart
   },
-  mounted() {},
-  methods: {}
+  mounted() {
+    this.initChart()
+  },
+  methods: {
+    beforeDestroy() {
+      if (!this.chart) {
+        return
+      }
+      this.chart.dispose()
+      this.chart = null
+    },
+    initChart() {
+      // 基于准备好的dom，初始化echarts实例
+      this.chart = this.echarts.init(document.getElementById('monthEnergyChart'))
+
+      this.chart.setOption({
+        /* 周围边距 */
+        grid: {
+          left: '3%',
+          right: '3%',
+          bottom: '1%',
+          top: '13%',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31']
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: [150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 150, 230, 224, 218, 135, 147, 260, 23, 147, 123],
+            type: 'line',
+            itemStyle: {
+              color: 'rgb(93,145,255)'
+            },
+            symbol: "none",
+            areaStyle: {
+              color: new this.echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                {
+                  offset: 0,
+                  color: 'rgb(210,233,253)'
+                },
+                {
+                  offset: 1,
+                  color: 'rgb(0,84,253)'
+                }
+              ])
+            },
+          }
+        ]
+      })
+    }
+  }
 };
 </script>
 

ui/src/views/front/materialBalance.vue

@@ -16,7 +16,7 @@
             <div class="flex">
                 <span class="box_one">Nap</span>
                 <div class="arror_one">
-                    <p class="textOne">7326</p>
+                    <p class="textOne">{{ dashboarddata.energyfeedNap }}</p>
                     <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                 </div>
             </div>
@@ -24,7 +24,7 @@
             <div class="flex">
                 <span class="box_one">乙烷</span>
                 <div class="arror_one">
-                    <p class="textOne">4</p>
+                    <p class="textOne">{{ dashboarddata.energyfeedYiwan }}</p>
                     <img src="@/assets/img/arror1.png" class="arror1 move ar-animated" >
                 </div>
             </div>
@@ -32,7 +32,7 @@
             <div class="flex">
                 <span class="box_one">C5</span>
                 <div class="arror_one">
-                    <p class="textOne">7326</p>
+                    <p class="textOne">{{ dashboarddata.energyfeedTanwu }}</p>
                     <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                 </div>
             </div>
@@ -40,7 +40,7 @@
             <div class="flex">
                 <span class="box_one">C6-C8</span>
                 <div class="arror_one">
-                    <p class="textOne">7326</p>
+                    <p class="textOne">{{ dashboarddata.energyfeedTanliu }}</p>
                     <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                 </div>
             </div>
@@ -48,7 +48,7 @@
             <div class="flex">
                 <span class="box_one">LPG</span>
                 <div class="arror_one">
-                    <p class="textOne">0</p>
+                    <p class="textOne">{{ dashboarddata.energyfeedLpg }}</p>
                     <img src="@/assets/img/arror1.png" class="arror1 move ar-animated">
                 </div>
             </div>
@@ -180,7 +180,7 @@
                     <span class="location loc8">AEU</span>
 
 
-                    <span class="location loc9">1884</span>
+                    <span class="location loc9">{{ dashboarddata.energyRpg }}</span>
                     <span class="location loc10">1621</span>
                 </div>
 
@@ -193,22 +193,22 @@
                 <div class="elementBox elementBoxLoc2">
                     <div class="box_one elementItem">Washoil</div>
                     <div class="box_one elementItem">C5</div>
-                    <div class="box_one elementItem"><span>BTX product</span></div>
+                    <div class="box_one elementItem">IMA</div>
                     <div class="box_one elementItem">C9</div>
 
 
                     <div class="sekuaiBox">
                       <span class="item blue pos1">
-                         61
+                         {{ dashboarddata.energyWashoil }}
                       </span>
                       <span class="item red pos2">
-                         266
+                         {{ dashboarddata.energyTanwu }}
                       </span>
                       <span class="item yellow pos3">
-                         2871
+                         {{ dashboarddata.energyIma }}
                       </span>
                       <span class="item blue pos4">
-                         61
+                         {{ dashboarddata.energyCjiu }}
                       </span>
                     </div>
                 </div>
@@ -279,37 +279,37 @@
 
                   <div class="sekuaiBox">
                       <span class="item blue pos5">
-                         26
+                         {{ dashboarddata.energyQingqi }}
                       </span>
                       <span class="item yellow pos6">
-                         2246
+                         {{ dashboarddata.energyYixi }}
                       </span>
                       <span class="item blue pos7">
-                         71
+                         {{ dashboarddata.energyBingxi }}
                       </span>
                       <span class="item red pos8">
-                         1159
+                         {{ dashboarddata.energyOffgas }}
                       </span>
                       <span class="item yellow pos9">
-                         788
+                         {{ dashboarddata.energyLpg }}
                       </span>
                       <span class="item blue pos10">
-                         1149
+                         {{ dashboarddata.energyJiawan }}
                       </span>
                       <span class="item red pos11">
-                         762
+                         {{ dashboarddata.energyCsi }}
                       </span>
                       <span class="item blue pos12">
-                         409
+                         {{ dashboarddata.energyBenzene }}
                       </span>
                       <span class="item yellow pos13">
-                         299
+                         {{ dashboarddata.energyToluene }}
                       </span>
                       <span class="item bule pos14">
-                         177
+                         {{ dashboarddata.energyXylene }}
                       </span>
                       <span class="item red pos15">
-                         196
+                         {{ dashboarddata.energyTanliu }}
                       </span>
                   </div>
 
@@ -351,10 +351,61 @@
 </template>
 
 <script>
+  import { listDashboarddata } from "@/api/aspen/dashboarddata";
+
   export default {
     name: "materialBalance",
     data () {
       return {
+        // dashboard抓取数据
+        dashboarddata: {
+          energyYixi: null,
+          energyBingxi: null,
+          energyQingqi: null,
+          energyJiawan: null,
+          energyCsi: null,
+          energyBenzene: null,
+          energyToluene: null,
+          energyXylene: null,
+          energyTanliu: null,
+          energyWashoil: null,
+          energyTanwu: null,
+          energyIma: null,
+          energyCjiu: null,
+          energyRpg: null,
+          energyfeedNap: null,
+          energyfeedYiwan: null,
+          energyfeedTanwu: null,
+          energyfeedTanliu: null,
+          energyfeedLpg: null,
+          energyOffgas: null,
+          energyLpg: null
+        },
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 20
+        },
+      }
+    },
+    created() {
+      this.getList();
+      // 每隔30秒请求一次数据
+      window.setInterval(() => {undefined
+        setTimeout(() => {undefined
+          ///调取接口获取数据
+          this.getList();
+        }, 0)
+      }, 30000)
+    },
+    methods: {
+      /** 查询dashboard抓取数据列表 */
+      getList()
+      {
+        listDashboarddata(this.queryParams).then(response => {
+          this.dashboarddata = response.rows[0];
+          console.info("刷新数据")
+        });
       }
     }
   }

ui/src/views/monitor/elec/index.vue

@@ -38,9 +38,12 @@
           <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(2)">
             <span class="text colorBlue"></span>
           </div>
-          <div class="react-right ml-3" style="background-color: #0f1325;" @click="changeDashboard(3)">
+          <div class="react-right ml-3" style="background-color: #0f1325;" @click="openNewWindow">
             <span class="text colorBlue"></span>
           </div>
+          <!--<div style="margin-top: -30px">
+            <iframe src="./index" frameborder="0" width="100%" height="700px"></iframe>
+          </div>-->
         </div>
         <div style="width: 40%" class="d-flex">
           <div class="react-left bg-color-blue mr-3">
@@ -201,6 +204,9 @@
         }else if (val === 3) {
           this.dashboard = 3
         }
+      },
+      openNewWindow() {
+        window.open('index.html#/bccHome?redirect=%2Findex');//path是文件的全路径地址cpms/index.html#/login?redirect=%2Findex
       }
     }
   };