From f8a33d539b5249a746f47aebde43e5c29edeca4f Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Thu, 11 Apr 2024 16:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=9A=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=A1=A8=E5=AD=98=E5=82=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zc/business/domain/EventPlanAssoc.java | 21 +++--- .../impl/DcEmergencyPlansServiceImpl.java | 68 +++++++++++-------- .../mapper/business/EventPlanAssocMapper.xml | 39 +++++------ 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java b/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java index 162d32e4..d41b8c5d 100644 --- a/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java +++ b/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java @@ -36,16 +36,17 @@ public class EventPlanAssoc { private Integer emergencyPlansId; /** - * 执行控制设备 (设备id用逗号隔开) + * 控制类型 1执行此操作 2恢复操作 */ - @ApiModelProperty("执行控制设备") - private String executingControlDevice; + @ApiModelProperty("控制类型") + private Integer operationType; /** - * 恢复控制设备 (设备id用逗号隔开) + * 控制设备 (设备id用逗号隔开) */ - @ApiModelProperty("恢复控制设备") - private String recoveredControlDevice; + @ApiModelProperty("控制设备") + private String controlDevice; + @ApiModelProperty("创建时间") private Date createTime; @@ -56,11 +57,5 @@ public class EventPlanAssoc { * 执行操作结果 */ @ApiModelProperty("执行操作结果") - private String executingControlResult; - - /** - * 恢复操作结果 - */ - @ApiModelProperty("恢复操作结果") - private String recoveredControlResult; + private String controlResult; } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java index 110cb4e1..f38ee2c4 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.uuid.IdUtils; import com.zc.business.constant.DeviceFunctionIdConstants; import com.zc.business.constant.DeviceTypeConstants; import com.zc.business.controller.BroadcastController; @@ -728,33 +729,28 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { JSONObject resultObject = new JSONObject(); // 事件编号 eventPlanAssoc.setEventId(id); + eventPlanAssoc.setOperationType(dcEventAnDcEmergencyPlans.getOperationType()); EventPlanAssoc selectEventPlanAssoc = eventPlanAssocMapper.selectByEventId(eventPlanAssoc); - // 区分是执行操作 还是 恢复操作 - if (dcEventAnDcEmergencyPlans.getOperationType().equals(1) && selectEventPlanAssoc == null) { - // 首次执行操作 + + if (selectEventPlanAssoc == null) { + // 执行新增 eventPlanAssoc.setEmergencyPlansId(dcEmergencyPlans.getId()); - eventPlanAssoc.setExecutingControlDevice(deviceIds.toString().replaceFirst(";", "")); - eventPlanAssoc.setExecutingControlResult(resultArray.toJSONString()); + eventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", "")); + eventPlanAssoc.setControlResult(resultArray.toJSONString()); eventPlanAssoc.setCreateTime(DateUtils.getNowDate()); - int eventPlanAssocId = eventPlanAssocMapper.insertEventPlanAssoc(eventPlanAssoc); - resultObject.put("eventPlanAssocId",eventPlanAssocId); - } - else if (StringUtils.isNotEmpty(selectEventPlanAssoc.getId()) && dcEventAnDcEmergencyPlans.getOperationType().equals(1)) { - // 多次执行操作 - selectEventPlanAssoc.setExecutingControlResult(resultArray.toJSONString()); - selectEventPlanAssoc.setUpdateTime(DateUtils.getNowDate()); - eventPlanAssocMapper.updateEventPlanAssoc(selectEventPlanAssoc); - resultObject.put("eventPlanAssocId",selectEventPlanAssoc.getId()); - } - else { - // 恢复操作 未执行的事件不能进行恢复操作 + // IdUtils.fastSimpleUUID() + eventPlanAssoc.setId(IdUtils.fastSimpleUUID()); + eventPlanAssocMapper.insertEventPlanAssoc(eventPlanAssoc); + resultObject.put("eventPlanAssocId",eventPlanAssoc.getId()); + }else { + // 执行修改操作 selectEventPlanAssoc.setUpdateTime(DateUtils.getNowDate()); - selectEventPlanAssoc.setRecoveredControlDevice(deviceIds.toString().replaceFirst(";", "")); - selectEventPlanAssoc.setRecoveredControlResult(resultArray.toJSONString()); + selectEventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", "")); + selectEventPlanAssoc.setControlResult(resultArray.toJSONString()); eventPlanAssocMapper.updateEventPlanAssoc(selectEventPlanAssoc); resultObject.put("eventPlanAssocId",selectEventPlanAssoc.getId()); } - resultObject.put("deviceOperationResult",resultArray); + resultObject.put("deviceOperationResult",resultArray); return resultObject; } @@ -783,18 +779,24 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { props.put("onWorkStatus", otherConfig.get("state").toString()); props.put("inWorkStatus", otherConfig.get("state").toString()); props.put("mode", controlModel); + JSONObject result = new JSONObject(); if (controlModel.equals("01")) { String startTime = otherConfig.get("startTime").toString(); String endTime = otherConfig.get("endTime").toString(); props.put("mode", "01"); props.put("startDisplayTime", startTime); props.put("endDisplayTime", endTime); - } + result.put("content","时间自动"); + } else if (controlModel.equals("00")) { + result.put("content","手动"); + }else { + result.put("content","万年历"); + } AjaxResult ajaxResult = dcDeviceController.invokedFunction(iotDeviceId, functionId, props); // 将调用结果存入到 resultArray（操作结果） 中 - JSONObject result = new JSONObject(); result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); result.put("result", ajaxResult); resultArray.add(result); @@ -831,12 +833,12 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { // 还原上次 props.put("fileId", "10"); functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_1B; - AjaxResult ajaxResult1B; - - ajaxResult1B = dcDeviceController.invokedFunction(iotDeviceId, functionId, props); + AjaxResult ajaxResult1B = dcDeviceController.invokedFunction(iotDeviceId, functionId, props); JSONObject result = new JSONObject(); result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); + result.put("content","还原上次"); result.put("result", ajaxResult1B); resultArray.add(result); }else { @@ -866,6 +868,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { // 说明没有匹配到设备 JSONObject errorResult = new JSONObject(); errorResult.put("device",device.getId()); + errorResult.put("deviceName",device.getDeviceName()); errorResult.put("errorMessage","未匹配到对应的广播内容"); resultArray.add(errorResult); } @@ -882,6 +885,8 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { JSONObject returnResult = broadcastController.nearCamListDistance(params); JSONObject result = new JSONObject(); result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); + result.put("content",params.get("text")); result.put("result", returnResult); resultArray.add(result); @@ -894,6 +899,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { AjaxResult ajaxResultState = dcDeviceController.invokedFunction(iotDeviceId, functionId, new HashMap<>()); JSONObject result = new JSONObject(); result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); result.put("result", ajaxResultState); resultArray.add(result); @@ -906,6 +912,8 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { AjaxResult ajaxResult = dcDeviceController.invokedFunction(iotDeviceId, functionId, propsTime); JSONObject resultTime = new JSONObject(); resultTime.put("device", device.getId()); + resultTime.put("deviceName",device.getDeviceName()); + resultTime.put("content","操作时长"+otherConfig.get("operationDuration")); resultTime.put("result", ajaxResult); resultArray.add(resultTime); @@ -943,8 +951,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_11; props.put("fileName", "play011.lst"); props.put("size", "65535"); - AjaxResult ajaxResult11; - ajaxResult11 = dcDeviceController.invokedFunction(iotDeviceId, functionId, props); + AjaxResult ajaxResult11 = dcDeviceController.invokedFunction(iotDeviceId, functionId, props); if (ajaxResult11.get("code").equals(200)) { // 2:执行13功能码 HashMap props11 = new HashMap<>(); @@ -975,8 +982,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { parameters.put("formatStyle", dcInfoBoardTemplate.getFormatStyle()); list.add(parameters); props11.put("parameters", list); - AjaxResult ajaxResult13 = null; - ajaxResult13 = dcDeviceController.invokedFunction(iotDeviceId, functionId, props11); + AjaxResult ajaxResult13 = dcDeviceController.invokedFunction(iotDeviceId, functionId, props11); JSONObject result = new JSONObject(); if (ajaxResult13.get("code").equals(200)) { HashMap props1B = new HashMap<>(); @@ -985,11 +991,15 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { props1B.put("fileId", "11"); AjaxResult ajaxResult1B = dcDeviceController.invokedFunction(iotDeviceId, functionId, props1B); result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); + result.put("content",dcInfoBoardTemplate.getContent()); result.put("result", ajaxResult1B); resultArray.add(result); } else { result.put("device", device.getId()); + result.put("deviceName",device.getDeviceName()); + result.put("content","发布失败"); result.put("result", ajaxResult13); resultArray.add(result); } diff --git a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml index cc6ed173..58efcd2c 100644 --- a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml +++ b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml @@ -4,39 +4,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + insert into event_plan_assoc + id, event_id, emergency_plans_id, - executing_control_device, - recovered_control_device, + control_device, + operation_type, create_time, update_time, - executing_control_result, - recovered_control_result, + control_result, + #{id}, #{eventId}, #{emergencyPlansId}, - #{executingControlDevice}, - #{recoveredControlDevice}, + #{controlDevice}, + #{operationType}, #{createTime}, #{updateTime}, - #{executingControlResult}, - #{recoveredControlResult} + #{controlResult}, - select id,event_id,emergency_plans_id,executing_control_device,recovered_control_device,create_time,update_time, - executing_control_result,recovered_control_result + select id,event_id,emergency_plans_id,control_device,create_time,update_time, + control_result,operation_type from event_plan_assoc @@ -44,18 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" event_id = #{eventId}, emergency_plans_id = #{emergencyPlansId}, - - executing_control_device = #{executingControlDevice}, + + control_device = #{controlDevice}, - - recovered_control_device = #{recoveredControlDevice}, + + operation_type = #{operationType}, update_time = #{updateTime}, - - executing_control_result = #{executingControlResult}, - - - recovered_control_result = #{recoveredControlResult}, + + control_result = #{controlResult}, where id = #{id}