增加下载xml，禁止一键排版以及修改型号节点上级节点

jinlin

2024-11-02 b42429445c22164e951d514348115ee593379026

增加下载xml，禁止一键排版以及修改型号节点上级节点

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

@@ -105,7 +105,14 @@

    @GetMapping("getProductList")
    public Result<List<XhProductModel>> getProductList(Long shipId, Integer productType) {
        if(productType==2){
            shipId =null;
        }
        List<XhProductModel> list = xhProductModelService.getProductList(shipId, productType - 1);
        if(productType == 5){
            List<XhProductModel> list2 =  xhProductModelService.getProductList(shipId, productType - 2);
            list.addAll(list2);
        }
        return Result.ok(list);
    }


 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java

@@ -30,6 +30,8 @@
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

@@ -64,6 +66,11 @@
        return result;
    }

    @GetMapping("downloadXml")
    public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId,Integer xml) {
        reliabilityAssessService.downloadXml(request,response,productId,taskId,itemId,xml);
    }

    @PostMapping("add")
    @ApiOperation("新增")
    @LogOperation("新增")

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/SimulatAssessController.java

@@ -36,6 +36,8 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -269,6 +271,11 @@
        return Result.ok();
    }

    @GetMapping("downloadXml")
    public void downloadXml(HttpServletRequest request, HttpServletResponse response, String type,Long id,Integer xml) {
        simulatAssessService.downloadXml(request, response,type,id,xml);
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/dao/ReliabilityAssessDao.java

@@ -25,4 +25,6 @@
    List<ReliabilityAssess> getProductList(Long productId, Long itemId);

    Long getAssessId(Long itemId, Long productId, Long taskId);

    String getxml(Long assessId);
}

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java

@@ -34,6 +34,9 @@
    @ApiModelProperty(value = "")
    private Long productId;

    @ApiModelProperty(value = "是否自动排版")
    private Integer autoLayout;

    @TableField(exist = false)
    @ApiModelProperty(value = "")
    private Long[] nodeArr;

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java

@@ -38,6 +38,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.*;
import java.util.stream.Collectors;
@@ -936,4 +938,30 @@
        return baseDao.getAssessDataList(productId);
    }

    public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId, Integer xml) {
        Long assessId = baseDao.getAssessId(itemId, productId, taskId);
        String json="";
        if (xml == 1) {
            json = baseDao.getxml(assessId);
        } else {
            String filePath = path + "/" + assessId + "/" + "result.xml";
            InputStream in = null;
            File file = new File(filePath);
            if (file.exists()) {
                try {
                    in = new FileInputStream(filePath);
                    json = IOUtils.toString(in);
                } catch (IOException e) {
                    throw new RenException("文件不存在或者文件打不开");
                } finally {
                    try {
                        in.close();
                    } catch (IOException e) {
                        e.printStackTrace();
                    }
                }
            }
        }
        simulatAssessService.writeToTxt(request, response, json, "评定");
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java

@@ -11,6 +11,7 @@
import com.zt.common.servlet.Result;
import com.zt.common.utils.TreeUtils;
import com.zt.common.utils.UUIDUtil;
import com.zt.life.export.service.DownloadService;
import com.zt.life.modules.mainPart.basicInfo.dao.ParamDataDao;
import com.zt.life.modules.mainPart.basicInfo.dao.XhProductModelDao;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
@@ -46,6 +47,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.nio.file.FileAlreadyExistsException;
import java.util.*;
@@ -1607,4 +1611,84 @@
        dto.setCurveList(curveList);
        return dto;
    }

    public void downloadXml(HttpServletRequest request, HttpServletResponse response, String type, Long id, Integer xml) {
        if (type.equals("fz")) {
            if (xml == 1) {
                SimulatAssess simulatAssess = this.get(id);
                String xml1 = simulatAssess.getXml();
                writeToTxt(request, response, xml1, "仿真输入");
            } else {
                String filePath = path + "/" + id + "/" + "result.xml";
                String xml1;
                InputStream in = null;

                try {
                    in = new FileInputStream(filePath);
                    xml1 = IOUtils.toString(in);
                } catch (IOException e) {
                    e.printStackTrace();
                    throw new RenException("文件不存在或者文件打不开");
                } finally {
                    try {
                        if (in != null) {
                            in.close();
                        }
                    } catch (IOException e) {
                        e.printStackTrace();
                    }
                }
                writeToTxt(request, response, xml1, "仿真输出");
            }
        } else if (type.equals("sxt")) {
            if (xml == 1) {
                String filePath = path + "/" + id + "/" + "status.json";
                ObjectMapper mapper = new ObjectMapper();
                String jsonStr = null;
                try {
                    // 使用 ObjectMapper 的 readValue 方法，将文件中的 JSON 数据转换为一个 Java 对象
                    // 这里使用 Object 类作为泛型参数，表示任意类型的对象
                    Object obj = mapper.readValue(new File(filePath), Object.class);
                    // 使用 ObjectMapper 的 writeValueAsString 方法，将 Java 对象转换为 JSON 字符串
                    jsonStr = mapper.writeValueAsString(obj);

                } catch (IOException e) {
                    // 处理异常
                    e.printStackTrace();
                    throw new RenException("文件不存在或者文件打不开");
                }
                writeToTxt(request, response, jsonStr, "时序图输入");
            } else {
                SimulatAssess simulatAssess = this.get(id);
                TimeDiagramDto timeDiagram = getTimeDiagram(simulatAssess.getProductId(), simulatAssess.getTaskModelId(), simulatAssess.getId(), 1200, 5);
                String xml2 = timeDiagram.getDiagramJson();
                writeToTxt(request, response, xml2, "时序图输出");
            }
        }
    }

    public void writeToTxt(HttpServletRequest request, HttpServletResponse response, String jsonString, String name) {//设置响应的字符集
        //设置响应内容的类型
        BufferedOutputStream buff = null;
        ServletOutputStream outStr = null;
        try {
            response.setContentType("text/plain;charset=UTF-8");
            String encodedFilename = DownloadService.getNameEncoder(request, name + "xml.txt");
            response.addHeader("Content-Disposition", "attachment;filename=" + encodedFilename);
            outStr = response.getOutputStream();
            buff = new BufferedOutputStream(outStr);
            buff.write(jsonString.getBytes("UTF-8"));
            buff.flush();
            buff.close();
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                buff.close();
                outStr.close();
            } catch (Exception e) {
                e.printStackTrace();
            }
        }
    }
}

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

@@ -52,4 +52,13 @@
            UPDATE_DATE DESC
        LIMIT 1
    </select>
    <select id="getxml" resultType="java.lang.String">
        SELECT
            xml
        FROM
            assess_result
        WHERE
            is_delete = 0
          AND id = ${assessId}
    </select>
</mapper>

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

@@ -18,7 +18,9 @@
              <el-button type="primary" @click="saveDiagram()">暂存</el-button>
              <el-button type="primary" @click="analyzeDiagram()">提交</el-button>
              <el-button type="primary" @click="clearDiagram()">清空图形</el-button>
              <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout">是否开启一键排版</el-checkbox>
              <el-checkbox style="margin: 0 10px 0 10px" v-model="dataForm.autoLayout" true-label="1" false-label="0">
                是否开启一键排版
              </el-checkbox>
              <el-button type="primary" @click="layoutDiagram()" :disabled="!dataForm.autoLayout">一键排版</el-button>
              <el-button @click="leftAlign()">
                <i style="font-size: 1rem;" class="wt-iconfont icon-zuoduiqi"></i>
@@ -578,7 +580,7 @@
          hasPublish: 0,
          urlPref: '',
          nodeArr: [],
          autoLayout:true,
          autoLayout: 1,
        },
        type: '',
        id: '',
@@ -756,6 +758,7 @@
        }
        let res = await this.$http.get(`/taskReliability/ModelLine/getDiagram`, {params: params})
        this.dataForm = res.data
        this.dataForm.autoLayout = parseInt(this.dataForm.autoLayout) == 1
        if (res.data.content != null) {
          console.log(this.dataForm, 'getDiagram datafrom')
          console.log(res.data, 'getDiagram res.data')
@@ -1582,7 +1585,7 @@
        })
      },
      async layoutDiagram() {
        if(this.dataForm.autoLayout){
        if (this.dataForm.autoLayout == 1) {
          console.log(JSON.stringify(this.graph.toJSON()), 'graph.toJSON()')
          this.dataForm.content = JSON.stringify(this.graph.toJSON())
          this.dataForm.urlPref = window.SITE_CONFIG['apiURL']
@@ -1780,7 +1783,7 @@
            inEdges[0].target = {cell: result.newStartNode.id}
            outEdges[0].source = {cell: result.newEndNode.id}
            graphNode.remove()
            if(this.dataForm.autoLayout){
            if (this.dataForm.autoLayout == 1) {
              if (!result.canPlace) {
                //调用自动排版
                this.layoutDiagram()
@@ -1837,7 +1840,7 @@
            connector: {name: 'rounded'},
            zIndex: -1
          })
          if(this.dataForm.autoLayout){
          if (this.dataForm.autoLayout == 1) {
            if (!result.canPlace) {
              //调用自动排版
              this.layoutDiagram()
@@ -1971,7 +1974,7 @@
            })
            graphEdge.source = {cell: result.newEndNode.id}
          }
          if(this.dataForm.autoLayout){
          if (this.dataForm.autoLayout == 1) {
            if (!result.canPlace) {
              //调用自动排版
              this.layoutDiagram()

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

@@ -19,6 +19,15 @@
          <el-button type="primary" @click="assess()">评定</el-button>
          <el-button type="primary" @click="add()">新增评定数据</el-button>
          <el-button type="primary" @click="handleExpand()">{{expandText}}</el-button>
          <el-dropdown style="margin-left: 10px" @command="download">
            <el-button type="primary">
              下载xml<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="1">输入xml</el-dropdown-item>
              <el-dropdown-item command="2">输出xml</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </el-form>
        <el-table ref="multipleTable" v-loading="table.dataLoading" :data="dataList" height="100px" v-adaptive="{bottomOffset:70}"
                  row-key="id"
@@ -43,6 +52,8 @@
</template>
<script>
  import AddOrUpdate from './RelisbilityAssess-AddOrUpdate'
  import qs from "qs";
  import Cookies from "js-cookie";

  export default {
    data() {
@@ -189,6 +200,21 @@
          }
        })
      },
      async download(selsect) {
        if (!this.dataForm.productId || !this.dataForm.taskId || !this.dataForm.itemId ) {
          this.$tip.alert("有未填写的数据")
          return
    }
          let param = qs.stringify({
            'token': Cookies.get('token'),
            productId: this.dataForm.productId,
            taskId: this.dataForm.taskId,
            itemId: this.dataForm.itemId,
            xml:selsect
          })
          let apiURL = `/taskReliability/ReliabilityAssess/downloadXml`
          window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${param}`
        }
      },
  }
</script>

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

@@ -9,21 +9,32 @@
          <zt-select v-model="dataForm.taskModelId" :datas="taskList" @change="onTaskSelected"/>
        </zt-form-item>
        <zt-form-item label="时间分片" prop="samplPeriod" >
          <el-input type="number" :min="1" v-model="dataForm.samplPeriod" style="width: 150px;vertical-align: baseline;">
          <el-input type="number" :min="1" v-model="dataForm.samplPeriod"
                    style="width: 150px;vertical-align: baseline;">
            <template slot="append">分钟</template>
          </el-input>
        </zt-form-item>
        <zt-form-item label="仿真次数" prop="simulatFrequency" >
          <el-input type="number" :min="1" v-model="dataForm.simulatFrequency" style="width: 150px;vertical-align: baseline;">
          <el-input type="number" :min="1" v-model="dataForm.simulatFrequency"
                    style="width: 150px;vertical-align: baseline;">
            <template slot="append">次数</template>
          </el-input>
        </zt-form-item>
        <el-form-item prop="repairDiracFlag" label-width="150px" style="margin-left: 20px">
          <el-checkbox v-model="dataForm.repairDiracFlag">可修设备可靠度为1</el-checkbox>
        </el-form-item>
        <zt-form-item style="margin-left: 20px">
        <zt-form-item style="margin-left: 10px">
          <zt-button @click="analyze()">仿真分析</zt-button>
          <zt-button @click="displayProcess()">查看算法库进程</zt-button>
          <zt-button @click="displayProcess()">算法库进程</zt-button>
          <el-dropdown style="margin-left: 10px" @command="download">
            <el-button type="primary">
              下载xml<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item command="1">输入xml</el-dropdown-item>
              <el-dropdown-item command="2">输出xml</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </zt-form-item>
      </el-form>
      <el-progress v-if="isShow" :percentage="percentage"></el-progress>
@@ -39,7 +50,8 @@
            </div>
          </el-col>
    </el-row>
    <el-dialog v-dialogDrag :close-on-click-modal="false" top="8vh" :visible.sync="dialogVisible" title="模型检查" width="60%" @close="dialogVisible = false">
    <el-dialog v-dialogDrag :close-on-click-modal="false" top="8vh" :visible.sync="dialogVisible" title="模型检查"
               width="60%" @close="dialogVisible = false">
      <el-tag type="danger" style="margin-bottom: 10px">模型定义/参数配置里存在以下问题：</el-tag>
      <el-table :data="modelCheckResult" height="350"
                :header-cell-style="{'text-align':'center'}">
@@ -64,6 +76,8 @@
  import SimulatCurve from "./SimulatCurve";
  import ProductModelTree from "../basicInfo/ProductModelTree";
  import Process from "./Process";
  import qs from "qs";
  import Cookies from "js-cookie";


  export default {
@@ -182,6 +196,21 @@
          }
        }
      },
      async download(selsect) {
        if(this.dataForm.id){
          let param = qs.stringify({
            'token': Cookies.get('token'),
            type: 'fz',
            xml:selsect,
            id: this.dataForm.id
          })
          let apiURL = `/taskReliability/SimulatAssess/downloadXml`
          window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${param}`
        }else{
          this.$alert('还未进行仿真操作')
        }

      },
      displayProcess() {
        this.$refs.process.$refs.dialog.init()
      }

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

@@ -23,6 +23,15 @@
          </zt-form-item>
          <zt-form-item>
            <zt-button @click="getDiagram(null)">查看时序图</zt-button>
            <el-dropdown style="margin-left: 10px" @command="download">
              <el-button type="primary">
                下载xml<i class="el-icon-arrow-down el-icon--right"></i>
              </el-button>
              <el-dropdown-menu slot="dropdown">
                <el-dropdown-item command="1">输入xml</el-dropdown-item>
                <el-dropdown-item command="2">输出xml</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
          </zt-form-item>
        </el-form>
        <div style="display: flex">
@@ -59,6 +68,8 @@
  import ModelView from "./ModelView";
  import textDiagram from "./textDiagram";
  import timeDiagramThumbnail from "./timeDiagramThumbnail"
  import qs from "qs";
  import Cookies from "js-cookie";


  export default {
@@ -439,7 +450,21 @@
      getPoint(x,smallWidth){
        let pointX = Number((x * (this.bigWidth / smallWidth )).toFixed(0))
        this.graph.setScrollbarPosition(pointX, null)
      },
      async download(selsect) {
        if(this.dataForm.id){
          let param = qs.stringify({
            'token': Cookies.get('token'),
            type: 'sxt',
            xml:selsect,
            id: this.dataForm.id
          })
          let apiURL = `/taskReliability/SimulatAssess/downloadXml`
          window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${param}`
        }else{
          this.$alert('还未选择仿真记录')
      }
      },
    }
  }
</script>