设备增加名称

zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java

@@ -167,7 +167,7 @@ public class OperationLogAspect {
                 operLog.setStatus(UniversalEnum.ONE.getNumber());
                 //sta = UniversalEnum.LOSE.getValue();
             }
-    
+
             ArrayList<String> deviceIds = new ArrayList<>();
             ArrayList<String> deviceNames = new ArrayList<>();
             String deviceType = UniversalEnum.EMPTY_STRING.getValue();
@@ -512,8 +512,16 @@ public class OperationLogAspect {
 
                     for (int i = UniversalEnum.ZERO.getNumber(); i < devices.size(); i++) {
 
+                        JSONObject device = (JSONObject) JSON.toJSON(devices.get(i));
+
+                        LambdaQueryWrapper<DcDevice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                        lambdaQueryWrapper.eq(DcDevice::getId, device.get("id"));
+                        DcDevice dcDevice = dcDeviceService.getById(device.getString("id"));
+
                         DcPublishManage dcPublishManage = new DcPublishManage();
 
+                        dcPublishManage.setPosition(dcDevice.getDeviceName());
+
                         if (Objects.equals(state, UniversalEnum.ZERO.getValue()) && Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("code")), UniversalEnum.TWO_HUNDRED.getValue()) && !Objects.equals(String.valueOf(((AjaxResult) jsonResult).get("msg")), UniversalEnum.FIVE_HUNDRED.getValue()) && status.get()) {
                             dcPublishManage.setPublishStatus(UniversalEnum.ONE.getNumber());//发布状态1-成功2-失败
                         } else {
@@ -540,7 +548,6 @@ public class OperationLogAspect {
                     }
                 }
 
-
             } else if (operUrl.contains(UniversalEnum.FUNCTIONS.getValue())) {
 
                 LambdaQueryWrapper<DcDevice> lambdaQueryWrapper = new LambdaQueryWrapper<>();