From 679fb5553807993969169e4b1caba304815ebad7 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 11 三月 2024 10:27:42 +0800
Subject: [PATCH] 参数采集配置导数据
---
jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java | 110 +++++++++++++++++++++++++++
jcdm-ui/src/views/main/da/collectionParamConf/index.vue | 69 +++++++++++++++--
jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 38 +++++++++
3 files changed, 206 insertions(+), 11 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
index 5e85836..55354b1 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
@@ -102,7 +102,115 @@
/** 棰勭暀瀛楁4 */
private String spareField4;
- public void setId(Long id)
+ /** 宸ュ簭鍚嶇О */
+ @Excel(name = "宸ュ簭鍚嶇О")
+ private String processesName;
+
+ /** 璁惧 */
+ @Excel(name = "璁惧")
+ private String device;
+
+ /** 椤圭洰 */
+ @Excel(name = "椤圭洰")
+ private String project;
+
+ /** 绮惧害 */
+ @Excel(name = "绮惧害")
+ private Long accuracy;
+
+ /** 鏁扮粍闀垮害 */
+ @Excel(name = "鏁扮粍闀垮害")
+ private Long arrayLength;
+
+ /** 閲囬泦棰戠巼 */
+ @Excel(name = "閲囬泦棰戠巼")
+ private String acquisitionFrequency;
+
+ /** 涓氬姟闇�姹傞儴闂� */
+ @Excel(name = "涓氬姟闇�姹傞儴闂�")
+ private String demandDepartment;
+
+ /** 鏄惁閲囬泦 */
+ @Excel(name = "鏄惁閲囬泦")
+ private String whetherToCollect;
+
+ /** 榛樿鍊� */
+ @Excel(name = "榛樿鍊�")
+ private String defaultValue;
+
+ public String getProcessesName() {
+ return processesName;
+ }
+
+ public void setProcessesName(String processesName) {
+ this.processesName = processesName;
+ }
+
+ public String getDevice() {
+ return device;
+ }
+
+ public void setDevice(String device) {
+ this.device = device;
+ }
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public Long getAccuracy() {
+ return accuracy;
+ }
+
+ public void setAccuracy(Long accuracy) {
+ this.accuracy = accuracy;
+ }
+
+ public Long getArrayLength() {
+ return arrayLength;
+ }
+
+ public void setArrayLength(Long arrayLength) {
+ this.arrayLength = arrayLength;
+ }
+
+ public String getAcquisitionFrequency() {
+ return acquisitionFrequency;
+ }
+
+ public void setAcquisitionFrequency(String acquisitionFrequency) {
+ this.acquisitionFrequency = acquisitionFrequency;
+ }
+
+ public String getDemandDepartment() {
+ return demandDepartment;
+ }
+
+ public void setDemandDepartment(String demandDepartment) {
+ this.demandDepartment = demandDepartment;
+ }
+
+ public String getWhetherToCollect() {
+ return whetherToCollect;
+ }
+
+ public void setWhetherToCollect(String whetherToCollect) {
+ this.whetherToCollect = whetherToCollect;
+ }
+
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
diff --git a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
index 06e8c13..351d97a 100644
--- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -30,10 +30,19 @@
<result property="spareField2" column="spare_field_2" />
<result property="spareField3" column="spare_field_3" />
<result property="spareField4" column="spare_field_4" />
+ <result property="processesName" column="processes_name" />
+ <result property="device" column="device" />
+ <result property="project" column="project" />
+ <result property="accuracy" column="accuracy" />
+ <result property="arrayLength" column="array_length" />
+ <result property="acquisitionFrequency" column="acquisition_frequency" />
+ <result property="demandDepartment" column="demand_department" />
+ <result property="whetherToCollect" column="whether_to_collect" />
+ <result property="defaultValue" column="default_value" />
</resultMap>
<sql id="selectDaCollectionParamConfVo">
- select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from da_collection_param_conf
+ select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf
</sql>
<select id="selectDaCollectionParamConfList" parameterType="DaCollectionParamConf" resultMap="DaCollectionParamConfResult">
@@ -83,6 +92,15 @@
<if test="spareField2 != null">spare_field_2,</if>
<if test="spareField3 != null">spare_field_3,</if>
<if test="spareField4 != null">spare_field_4,</if>
+ <if test="processesName != null">processes_name,</if>
+ <if test="device != null">device,</if>
+ <if test="project != null">project,</if>
+ <if test="accuracy != null">accuracy,</if>
+ <if test="arrayLength != null">array_length,</if>
+ <if test="acquisitionFrequency != null">acquisition_frequency,</if>
+ <if test="demandDepartment != null">demand_department,</if>
+ <if test="whetherToCollect != null">whether_to_collect,</if>
+ <if test="defaultValue != null">default_value,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -110,6 +128,15 @@
<if test="spareField2 != null">#{spareField2},</if>
<if test="spareField3 != null">#{spareField3},</if>
<if test="spareField4 != null">#{spareField4},</if>
+ <if test="processesName != null">#{processesName},</if>
+ <if test="device != null">#{device},</if>
+ <if test="project != null">#{project},</if>
+ <if test="accuracy != null">#{accuracy},</if>
+ <if test="arrayLength != null">#{arrayLength},</if>
+ <if test="acquisitionFrequency != null">#{acquisitionFrequency},</if>
+ <if test="demandDepartment != null">#{demandDepartment},</if>
+ <if test="whetherToCollect != null">#{whetherToCollect},</if>
+ <if test="defaultValue != null">#{defaultValue},</if>
</trim>
</insert>
@@ -140,6 +167,15 @@
<if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
<if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
<if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="processesName != null">processes_name = #{processesName},</if>
+ <if test="device != null">device = #{device},</if>
+ <if test="project != null">project = #{project},</if>
+ <if test="accuracy != null">accuracy = #{accuracy},</if>
+ <if test="arrayLength != null">array_length = #{arrayLength},</if>
+ <if test="acquisitionFrequency != null">acquisition_frequency = #{acquisitionFrequency},</if>
+ <if test="demandDepartment != null">demand_department = #{demandDepartment},</if>
+ <if test="whetherToCollect != null">whether_to_collect = #{whetherToCollect},</if>
+ <if test="defaultValue != null">default_value = #{defaultValue},</if>
</trim>
where id = #{id}
</update>
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index 79e1b0e..d64ac9f 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -129,13 +129,13 @@
</el-table-column>
<el-table-column label="宸ュ簭缂栧彿" align="center" width="80" prop="processesCode">
</el-table-column>
- <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" width="130" prop="parameterSetCode">
+<!-- <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" width="130" prop="parameterSetCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" width="160" prop="parameterSetName">-->
+<!-- </el-table-column>-->
+ <el-table-column label="鍙傛暟缂栫爜" align="center" width="200" prop="collectParameterId">
</el-table-column>
- <el-table-column label="鍙傛暟闆嗗悕绉�" align="center" width="160" prop="parameterSetName">
- </el-table-column>
- <el-table-column label="鍙傛暟缂栫爜" align="center" width="130" prop="collectParameterId">
- </el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" width="160" prop="collectParameterName">
+ <el-table-column label="鍙傛暟鍚嶇О" align="center" width="200" prop="collectParameterName">
</el-table-column>
<!-- <el-table-column label="鏄惁浣滀负瀵规瘮鍙傛暟" align="center" prop="contrastParameterFlag">-->
<!-- </el-table-column>-->
@@ -157,8 +157,23 @@
</el-table-column>
<el-table-column label="涓績鍊�" align="center" prop="paramCentral">
</el-table-column>
-
- <el-table-column label="澶囨敞" align="center" width="160" prop="remarks">
+ <el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
+ </el-table-column>
+ <el-table-column label="璁惧" width="150" align="center" prop="device">
+ </el-table-column>
+ <el-table-column label="椤圭洰" align="center" prop="project">
+ </el-table-column>
+ <el-table-column label="绮惧害" align="center" prop="accuracy">
+ </el-table-column>
+ <el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
+ </el-table-column>
+ <el-table-column label="閲囬泦棰戠巼" width="107" align="center" prop="acquisitionFrequency">
+ </el-table-column>
+ <el-table-column label="涓氬姟闇�姹傞儴闂�" width="155" align="center" prop="demandDepartment">
+ </el-table-column>
+ <el-table-column label="鏄惁閲囬泦" align="center" prop="whetherToCollect">
+ </el-table-column>
+ <el-table-column label="澶囨敞" :show-overflow-tooltip='true' align="center" width="160" prop="remarks">
</el-table-column>
<el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
</el-table-column>
@@ -259,6 +274,33 @@
</el-form-item>
<el-form-item label="閲囬泦椤哄簭" prop="gatherSequence">
<el-input v-model="form.gatherSequence" placeholder="璇疯緭鍏ラ噰闆嗛『搴�" />
+ </el-form-item>
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processesName">
+ <el-input v-model="form.processesName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" />
+ </el-form-item>
+ <el-form-item label="璁惧" prop="device">
+ <el-input v-model="form.device" placeholder="璇疯緭鍏ヨ澶�" />
+ </el-form-item>
+ <el-form-item label="椤圭洰" prop="project">
+ <el-input v-model="form.project" placeholder="璇疯緭鍏ラ」鐩�" />
+ </el-form-item>
+ <el-form-item label="绮惧害" prop="accuracy">
+ <el-input v-model="form.accuracy" placeholder="璇疯緭鍏ョ簿搴�" />
+ </el-form-item>
+ <el-form-item label="鏁扮粍闀垮害" prop="arrayLength">
+ <el-input v-model="form.arrayLength" placeholder="璇疯緭鍏ユ暟缁勯暱搴�" />
+ </el-form-item>
+ <el-form-item label="閲囬泦棰戠巼" prop="acquisitionFrequency">
+ <el-input v-model="form.acquisitionFrequency" placeholder="璇疯緭鍏ラ噰闆嗛鐜�" />
+ </el-form-item>
+ <el-form-item label="涓氬姟闇�姹傞儴闂�" prop="demandDepartment">
+ <el-input v-model="form.demandDepartment" placeholder="璇疯緭鍏ヤ笟鍔￠渶姹傞儴闂�" />
+ </el-form-item>
+ <el-form-item label="鏄惁閲囬泦" prop="whetherToCollect">
+ <el-input v-model="form.whetherToCollect" placeholder="璇疯緭鍏ユ槸鍚﹂噰闆�" />
+ </el-form-item>
+ <el-form-item label="榛樿鍊�" prop="defaultValue">
+ <el-input v-model="form.defaultValue" placeholder="璇疯緭鍏ラ粯璁ゅ��" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
@@ -366,7 +408,16 @@
spareField1: null,
spareField2: null,
spareField3: null,
- spareField4: null
+ spareField4: null,
+ processesName: null,
+ device: null,
+ project: null,
+ accuracy: null,
+ arrayLength: null,
+ acquisitionFrequency: null,
+ demandDepartment: null,
+ whetherToCollect: null,
+ defaultValue: null
};
this.resetForm("form");
},
--
Gitblit v1.9.3