From 316439a908d0b2363966ebbad23e3b8001291850 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 14:48:46 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 18 +++++++--
web/src/views/modules/project/Environ-AddOrUpdate.vue | 36 ++++++++++--------
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 22 ++++++----
modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml | 4 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java | 2
modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml | 4 +-
7 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index 02608e5..d048a09 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -102,15 +102,15 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Environ environ) {
+ public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
- environService.update(environ);
+ ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = environService.save(softwareTestOrderDto);
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteEnviron")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -121,4 +121,14 @@
return Result.ok();
}
+ @PostMapping("uploadDiagram")
+ @ApiOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ @LogOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ public Result uploadDiagram(@RequestBody Long[] ids) {
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environService.delete(ids);
+
+ return Result.ok();
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
index 26f6414..7ae89e1 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
@@ -31,7 +31,7 @@
private String itemName;
@ApiModelProperty(value = "鐢ㄩ��")
- private String usage;
+ private String purposes;
@ApiModelProperty(value = "鐘舵��")
private String state;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
index d8dcfcb..2c9b926 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
@@ -34,7 +34,7 @@
private String version;
@ApiModelProperty(value = "鐢ㄩ��")
- private String usage;
+ private String purposes;
@ApiModelProperty(value = "鎻愪緵鍗曚綅")
private String provideUnit;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index c8f7deb..9b9fb1a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -54,9 +54,9 @@
public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
- data.setId(environId);
Environ environ = this.get(environId);
data.setEnviron(environ);
+ data.setTestAgencyInfo(testAgencyInfoService.get(environId));
projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
@@ -68,16 +68,15 @@
List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
data.setEnvironAnalysisList(environAnalysesList);
} else {
- Project project = projectService.get(projectId);
- Environ environ = new Environ();
+ Environ environ =new Environ();
data.setEnviron(environ);
- data.getEnviron().setSoftwareName(project.getSoftwareName());
- data.getEnviron().setSoftwareIdentity(project.getSoftwareIdentity());
- data.getEnviron().setProjectId(projectId);
+ }
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
}
if (data.getTestAgencyInfo() == null)
- data.getEnviron().setAgencyName(testAgencyInfoService.get(10000L).getAgencyName());
- data.getEnviron().setSite(testAgencyInfoService.get(10000L).getSite());
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -147,7 +146,12 @@
environAnalysisService.insert(environAnalysis);
}
}
-
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(environId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
return true;
}
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
index db884be..2f417ec 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
@@ -8,8 +8,8 @@
from environ_hardware_resources a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="environId!=null">
+ and environ_id = ${environId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
index d55ed3e..7eff245 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
@@ -8,8 +8,8 @@
from environ_software_resources a
<where>
a.is_delete = 0
- <if test="whereSql!=null">
- and ${whereSql}
+ <if test="environId!=null">
+ and environ_id = ${environId}
</if>
</where>
<if test="orderBySql!=null">
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
index 01bebf7..5966765 100644
--- a/web/src/views/modules/project/Environ-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -8,16 +8,16 @@
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%" class="confirmDAuto DConfirmForm">
<el-form-item class="marginTopAndMarginBottom" label="涓撲笟瀹為獙瀹ゅ悕绉�" style="width: 49%">
- <el-input v-model="dataForm.environ.agencyName" placeholder="涓撲笟瀹為獙瀹ゅ悕绉�"></el-input>
+ <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="涓撲笟瀹為獙瀹ゅ悕绉�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="娴嬭瘯鍦扮偣" style="width: 49%">
- <el-input v-model="dataForm.environ.site" placeholder="娴嬭瘯鍦扮偣"></el-input>
+ <el-input v-model="dataForm.testAgencyInfo.site" placeholder="娴嬭瘯鍦扮偣"></el-input>
</el-form-item>
<el-form-item label="琚祴杞欢" style="width: 49%">
- <el-input v-model="dataForm.environ.softwareName" placeholder="琚祴杞欢"></el-input>
+ <el-input v-model="dataForm.project.softwareName" placeholder="琚祴杞欢"></el-input>
</el-form-item>
<el-form-item label="鐗堟湰" style="width: 49%">
- <el-input v-model="dataForm.environ.softwareIdentity" placeholder="鐗堟湰"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="鐗堟湰"></el-input>
</el-form-item>
<div class="el-flexConfigDialog el-form-border">
<div class="DFormWidth DAlign DHold">
@@ -28,7 +28,7 @@
<div class="table-container">
<el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.softwareResourcesList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿">
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
@@ -43,9 +43,9 @@
<el-input v-model="row.version" placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
- <el-table-column prop="use" align="center" width="180" label="鐢ㄩ��">
+ <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
<template v-slot="{ row }">
- <el-input v-model="row.usage" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="鎻愪緵鍗曚綅" width="180" align="center">
@@ -63,15 +63,15 @@
<div class="table-container">
<el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.hardwareResourcesList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿"></el-table-column>
<el-table-column prop="itemName" min-width="300" label="纭欢鍜屽浐浠堕」鐩悕绉�">
<template v-slot="{ row }">
<el-input v-model="row.itemName" placeholder="纭欢鍜屽浐浠堕」鐩悕绉�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="usage" align="center" width="180" label="鐢ㄩ��">
+ <el-table-column prop="purposes" align="center" width="180" label="鐢ㄩ��">
<template v-slot="{ row }">
- <el-input v-model="row.usage" placeholder="鐢ㄩ��"></el-input>
+ <el-input v-model="row.purposes" placeholder="鐢ㄩ��"></el-input>
</template>
</el-table-column>
<el-table-column prop="number" align="center" width="80" label="鏁伴噺">
@@ -117,7 +117,7 @@
<div class="table-container">
<el-table class="el-software el-margin-top-bot" height="150" border :data="dataForm.environAnalysisList"
stripe>
- <el-table-column prop="code" align="center" width="80" label="搴忓彿"></el-table-column>
+ <el-table-column prop="no" align="center" width="80" label="搴忓彿"></el-table-column>
<el-table-column prop="realEnviron" min-width="300" label="鐪熷疄鐜">
<template v-slot="{ row }">
<el-input v-model="row.realEnviron" placeholder="鐪熷疄鐜"></el-input>
@@ -205,11 +205,7 @@
dataForm: {
id: '',
environ:{
- code: '',
- agencyName:'',
- site:'',
- softwareName:'',
- softwareIdentity:'',
+ code: '1',
hardSoftwareRes: '',
testEnvirontDiagram: '',
establishStaff:'',
@@ -222,6 +218,14 @@
isVirusScan: '',
virusDatabaseVersion: '',
},
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
+ },
+ testAgencyInfo: {
+ agencyName:'',
+ site:'',
+ },
softwareResourcesList:[],
hardwareResourcesList:[],
environAnalysisList:[]
--
Gitblit v1.9.1