修改

jinlin

2024-03-12 69218874b7d166cf9c5a10e23e9d2e0b9280633a

修改

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java

@@ -12,9 +12,11 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.mainPart.basicInfo.service.XhProductModelService;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.life.modules.sysPictureBase.service.SysPictureBaseService;
import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
@@ -71,6 +73,14 @@
        return Result.ok(list);
    }

    @GetMapping("getProduct")
    public Result<List<ProductImg>> getProduct(Long productId) {

        List<ProductImg> list = xhProductModelService.getProduct(productId);

        return Result.ok(list);
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<XhProductModel> get(@PathVariable("id") Long id){

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/XhProductModelDao.java

@@ -1,7 +1,9 @@
package com.zt.life.modules.mainPart.basicInfo.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import org.apache.ibatis.annotations.Mapper;


@@ -24,4 +26,6 @@
    Integer getNo(Long pid);

    List<XhProductModel> getProductList();

    List<ProductImg> getProduct(Long productId);
}

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ProductImg.java

New file
@@ -0,0 +1,44 @@
package com.zt.life.modules.mainPart.basicInfo.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import com.zt.common.entity.TreeNode;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.ArrayList;
import java.util.List;

/**
 * product_model
 *
 * @author zt generator 
 * @since 1.0.0 2024-02-29
 */
@Data
public class ProductImg {
    @TableField(exist = false)
    private String nodeType;

    @TableField(exist = false)
    private String imgPath;
    @TableField(exist = false)
    private String imgName;

    @TableField(exist = false)
    private String nodeTypeExt;

    @TableField(exist = false)
    private int imgWidth;

    @TableField(exist = false)
    private int imgHeight;
    @TableField(exist = false)
    private String dataId;
    @TableField(exist = false)
    private String statusImg;
    @TableField(exist = false)
    private String productType;
}

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java

@@ -33,7 +33,10 @@
    private String name;

    @ApiModelProperty(value = "节点类型")
    private String nodeType;
    private String productType;

    @ApiModelProperty(value = "默认图片")
    private String defaultImg;

    @ApiModelProperty(value = "运行状态图片")
    private String operationalStatus;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -5,8 +5,10 @@
import com.zt.common.service.BaseService;
import com.zt.common.utils.TreeUtils;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ProductImg;
import com.zt.life.modules.mainPart.basicInfo.model.TyProductModel;
import com.zt.life.modules.mainPart.basicInfo.model.XhProductModel;
import com.zt.life.modules.sysPictureBase.model.SysPictureBase;
import com.zt.modules.sys.model.SysMenu;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
@@ -58,4 +60,8 @@
        List<XhProductModel> ProductList = baseDao.getProductList();
        return TreeUtils.build(ProductList);
    }

    public List<ProductImg> getProduct(Long productId) {
        return baseDao.getProduct(productId);
    }
}

 modules/mainPart/src/main/resources/mapper/basicInfo/XhProductModelDao.xml

@@ -37,8 +37,25 @@
        Group by node_type
    </select>
    <select id="getProductList" resultType="com.zt.life.modules.mainPart.basicInfo.model.XhProductModel">
        select a.name,a.id
        select a.name, a.id
        from product_model a
        where a.is_delete =0 and a.node_type = 5
        where a.is_delete = 0
          and a.node_type = 5
    </select>
    <select id="getProduct" resultType="com.zt.life.modules.mainPart.basicInfo.model.ProductImg">
        SELECT a.operational_status as imgPath,
               a.`NAME`             as imgName,
               'node'               as nodeType,
               ''                   as nodeTypeExt,
               60                   as imgWidth,
               60                   as imgHeight,
               a.id                 as dataId,
               ''                   as statusImg,
               d.dict_code          as productType
        FROM product_model a
                 left join sys_dict_data d on d.DICT_VALUE = a.node_type and dict_type_id = '1728965873022050306' --
        WHERE a.is_delete = 0
          AND a.PID = ${productId}

    </select>
</mapper>

 modules/mainPart/src/main/resources/mapper/taskReliability/ModelRbdDao.xml

@@ -6,7 +6,7 @@
    <select id="getList" resultType="com.zt.life.modules.taskReliability.model.ModelRbd">
        select a.*,
        CASE
        WHEN b.end =1  THEN '已报称'
        WHEN b.end =1  THEN '已完成'
        WHEN c.num >0  THEN '正在编辑'
        ELSE '未编辑' END AS modelState
        from model_rbd a

 web/src/views/modules/taskReliability/ModelRbd.vue

@@ -85,6 +85,7 @@
        this.$nextTick(() => {
          this.$refs.rbdEditImg.init(row)
        })
        this.$refs.tableObj.query()
      }
    }
  }

 web/src/views/modules/taskReliability/RBD-edit-img.vue

@@ -124,7 +124,7 @@
          {imgPath:'voteRight',imgName:'vote',nodeType:'vote',imgWidth:60,imgHeight:60,imgId:'6',data:{}},
        ],
        imgsList2:[
          {imgPath:'logo',imgName:'logo',nodeType:'node',statusImg:'',imgWidth:60,imgHeight:60,imgId:'100',data:{dataId:'123456',nodeTypeExt:''}},
         // {imgPath:'logo',imgName:'logo',nodeType:'node',,nodeTypeExt:'',productType:'',statusImg:'',imgWidth:60,imgHeight:60,imgId:'100',dataId:'123456'},
        ],
        nodeType:'',
        first: true,
@@ -295,7 +295,7 @@
      }
    },
    mounted() {
      this.initDigram()
      //this.initDigram()
      this.type = 'grid'
    },
    methods: {
@@ -303,7 +303,11 @@
        this.modelName = row.modelName
        let modelId = row.id
        this.dataForm.id = modelId
        // this.productId = row.productId
        // this.getProduct(row.productId)
        this.initDigram(row.productId)
        this.getDiagram(modelId)
        console.log(row,'init(row){')
      },
      async getDiagram(modelId) {
        let params = {
@@ -331,7 +335,9 @@
        this.graph.zoomToFit()
        // this.graph.freeze()
      },
      initDigram() {
      async initDigram(productId) {


        this.timer = setHartBeat(10, 240);
        console.log(document.documentElement.clientWidth, 'document.documentElement.clientWidth')
        console.log(document.documentElement.clientHeight, 'document.documentElement.clientHeight')
@@ -791,18 +797,25 @@
              ports: {...this.ports},
            }),
        )
        let params = {
          productId : productId
        }
        let res = await this.$http.get(`/basicInfo/XhProductModel/getProduct`, {params: params})
        this.imgsList2 = res.data
        console.log(this.imgsList2 ,'getProduct(productId)234567890')
        const imageNodes2 = this.imgsList2.map((item) =>
            this.graph.createNode({
              shape: 'image',
              imageUrl: require('/public/modelImg/'+item.imgPath+'.png'),
              imageUrl: `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${item.imgPath}`,
              width:item.imgWidth,
              height:item.imgHeight,
              x:item.imgWidth,
              y:item.imgHeight,
              data: {
                dataId: item.data.dataId,
                dataId: item.dataId,
                nodeType: item.nodeType,
                nodeTypeExt: item.data.nodeTypeExt,
                nodeTypeExt: item.nodeTypeExt,
                productType: item.productType,
                statusImg:item.statusImg
              },
              attrs: {