From db4d0db12480be7890a606af6f591a13e6f7d3d1 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 10 Jan 2024 18:16:16 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=B9=B3=E5=9D=87=E5=88=86=E9=85=8D?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/rest/DeviceAssignedController.java | 10 ++- .../device/service/dto/DeviceAssignedDto.java | 4 +- .../impl/DeviceAssignedServiceImpl.java | 27 ++++--- .../task/service/impl/TaskServiceImpl.java | 4 +- acs/nladmin-ui/src/i18n/langs/config/en.js | 3 +- acs/nladmin-ui/src/i18n/langs/config/in.js | 3 +- acs/nladmin-ui/src/i18n/langs/config/zh.js | 3 +- .../src/views/acs/config/assigned/index.vue | 76 +++++++++++++++---- 8 files changed, 94 insertions(+), 36 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java index 5eff6b6..6470b68 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java @@ -13,6 +13,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Map; import java.util.Set; /** @@ -37,15 +38,16 @@ public class DeviceAssignedController { @PostMapping @Log("新增设备任务分配信息") @ApiOperation("新增设备任务分配信息") - public ResponseEntity create(@Validated @RequestBody DeviceAssignedDto resources) { - return new ResponseEntity<>(deviceAssignedService.insert(resources), HttpStatus.CREATED); + public ResponseEntity create(@Validated @RequestBody Map resources) { + deviceAssignedService.create(resources); + return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改设备任务分配信息") @ApiOperation("修改设备任务分配信息") - public ResponseEntity update(@Validated @RequestBody DeviceAssignedDto resources) { - deviceAssignedService.updateById(resources); + public ResponseEntity update(@Validated @RequestBody Map resources) { + deviceAssignedService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java index 0267b57..4585a07 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java @@ -26,10 +26,10 @@ public class DeviceAssignedDto implements Serializable { private String device_code; @ApiModelProperty(value = "指令终点") - private String inst_nextdevice_code; + private String inst_nextDevice_code; @ApiModelProperty(value = "任务终点") - private String task_nextdevice_code; + private String task_nextDevice_code; @ApiModelProperty(value = "参数") private String param; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java index fc223ca..9bf5cbc 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java @@ -124,8 +124,8 @@ public class DeviceAssignedServiceImpl extends CommonServiceImpl) whereJson.get("task_nextdevice_code")); - String inst_nextdevice = String.join(",", (List) whereJson.get("inst_nextdevice_code")); - String assgined_id = whereJson.get("assigned_id").toString(); + String task_nextdevice = String.join(",", (List) whereJson.get("task_nextDevice_code")); + String inst_nextdevice = String.join(",", (List) whereJson.get("inst_nextDevice_code")); + String assigned_id = whereJson.get("assigned_id").toString(); + param.put("assigned_id",assigned_id); param.put("device_code", device_code); - param.put("task_nextdevice_code", task_nextdevice.toString()); - param.put("inst_nextdevice_code", inst_nextdevice.toString()); + param.put("task_nextDevice_code", task_nextdevice.toString()); + param.put("inst_nextDevice_code", inst_nextdevice.toString()); ArrayList list = (ArrayList) whereJson.get("tableData"); JSONObject jo = new JSONObject(); for (int i = 0; i < list.size(); i++) { @@ -172,9 +175,11 @@ public class DeviceAssignedServiceImpl extends CommonServiceImpl map = new LinkedHashMap<>(); map.put("设备编码", deviceAssigned.getDevice_code()); - map.put("指令终点", deviceAssigned.getInst_nextdevice_code()); - map.put("任务终点", deviceAssigned.getTask_nextdevice_code()); + map.put("指令终点", deviceAssigned.getInst_nextDevice_code()); + map.put("任务终点", deviceAssigned.getTask_nextDevice_code()); map.put("参数", deviceAssigned.getParam()); map.put("备注", deviceAssigned.getRemark()); map.put("是否启用", deviceAssigned.getIs_active()); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 623bc7f..55b6c25 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1559,8 +1559,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme String flag2 = null; for (int i = 0; i < list.size(); i++) { DeviceAssignedDto dto = list.get(i); - String inst_nextDevice_code = dto.getInst_nextdevice_code(); - String task_nextDevice_code = dto.getTask_nextdevice_code(); + String inst_nextDevice_code = dto.getInst_nextDevice_code(); + String task_nextDevice_code = dto.getTask_nextDevice_code(); String param = dto.getParam(); JSONObject jo = JSON.parseObject(param); String regEx = "[`~!@#$%^&*()+=|{}':;'\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'：”“’。、？]"; diff --git a/acs/nladmin-ui/src/i18n/langs/config/en.js b/acs/nladmin-ui/src/i18n/langs/config/en.js index e60a9b2..5702b9d 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/en.js +++ b/acs/nladmin-ui/src/i18n/langs/config/en.js @@ -16,7 +16,8 @@ export default { 'destination_configuration': 'Destination Configuration', 'operation': 'Operation', 'device_is_not_null': 'Device Code Cannot Be Empty', - 'mapping_relationship': 'Mapping Relationship' + 'mapping_relationship': 'Mapping Relationship', + 'inOut': 'Bidirectional point position' }, 'rules': { } diff --git a/acs/nladmin-ui/src/i18n/langs/config/in.js b/acs/nladmin-ui/src/i18n/langs/config/in.js index 47d56b5..b2edb26 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/in.js +++ b/acs/nladmin-ui/src/i18n/langs/config/in.js @@ -16,7 +16,8 @@ export default { 'destination_configuration': 'Konfigurasi Tujuan', 'operation': 'Operasi', 'device_is_not_null': 'Kode Perangkat Tidak Boleh Kosong', - 'mapping_relationship': 'Hubungan Pemetaan' + 'mapping_relationship': 'Hubungan Pemetaan', + 'inOut': 'Posisi titik bidireksi' }, 'rules': { } diff --git a/acs/nladmin-ui/src/i18n/langs/config/zh.js b/acs/nladmin-ui/src/i18n/langs/config/zh.js index 867ab98..165de0e 100644 --- a/acs/nladmin-ui/src/i18n/langs/config/zh.js +++ b/acs/nladmin-ui/src/i18n/langs/config/zh.js @@ -16,7 +16,8 @@ export default { 'destination_configuration': '终点配置', 'operation': '操作', 'device_is_not_null': '设备编码不能为空', - 'mapping_relationship': '映射关系' + 'mapping_relationship': '映射关系', + 'inOut': '双向点位' }, 'rules': { } diff --git a/acs/nladmin-ui/src/views/acs/config/assigned/index.vue b/acs/nladmin-ui/src/views/acs/config/assigned/index.vue index 894c43a..4efd6d9 100644 --- a/acs/nladmin-ui/src/views/acs/config/assigned/index.vue +++ b/acs/nladmin-ui/src/views/acs/config/assigned/index.vue @@ -31,7 +31,7 @@ + + +
{{ $t('config.table.cancel') }} - {{ $t('config.table.confirm') }} + {{ + $t('config.table.confirm') + }} +
@@ -104,8 +117,8 @@ - - + + { + tableData.push({ + device: key, + inOut: param[key].inOut, + limit: param[key].limit, + scale: param[key].scale + }) + }) + this.form.tableData = tableData + return true + }, paramFormate(row, index) { return JSON.stringify(row.param) }, @@ -199,13 +237,23 @@ export default { } }, getValue: function(value) { - console.log(value) const tableData = [] - value.forEach(item => { - tableData.push({ - device: item + if (!(value && typeof value === 'object' && Object.keys(value).length === 0)) { + // const oldTableData = JSON.parse(JSON.stringify(this.form.tableData)) + // if (oldTableData && oldTableData.length > 0) { + // oldTableData.forEach(row => { + // console.log(row) + // }) + // } + value.forEach(item => { + tableData.push({ + device: item, + limit: 50, + scale: 50, + inOut: false + }) }) - }) + } this.form.tableData = tableData }, changeNextDevice(value) {