更新附件添加多个设置

smart-office-manager-ui/admin/src/views/notice/drawershow.vue

@@ -9,8 +9,8 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                             <Field :span="20" label="标题" prop="title" v-model="form.title" type="textarea" placeholder="请输入标题"/>
-                            <Field :span="20" label="公告内容"><editor v-model="form.noticeContent" :min-height="256"/></Field>
-                            <Field label="公告文件"><fileUpload v-model="form.filePath"  :fileName="form.fileName" @getFileName="getFileName"  prePath="/file/fileupload"/></Field>
+<!--                            <Field :span="20" label="公告内容"><editor v-model="form.noticeContent" :min-height="256"/></Field>
+                           --> <Field label="公告文件"><fileUpload v-model="form.filePath"  :fileName="form.fileName" @getFileName="getFileName"  prePath="/file/fileupload"/></Field>
                             <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>

smart-office-manager-ui/admin/src/views/room/drawershow.vue

@@ -4,6 +4,7 @@
             :title="title"
             :visible.sync="open"
             :direction="direction"
+            :destroy-on-close="true"
             size="40%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
@@ -12,10 +13,10 @@
                             <Field :span="20" label="房间类型" prop="roomType" v-model="form.roomType"  type="select" :enumData="dict.roomType" placeholder="请选择房间类型"/>
                             <Field :span="20" label="关联设备" prop="deviceId" v-model="deviceIds" type="select" :multiple="true" :enumData="dict.deviceIds" placeholder="请选择绑定的电子门牌的设备ID"/>
 
-              <Field :span="20" label="关联公告" prop="noticeId" v-model="form.noticeId" type="select"  :enumData="dict.noticeId" placeholder="请选择关联公告"/>
+              <Field :span="24" label="关联公告" prop="noticeId" v-model="form.noticeId" type="select"  :enumData="dict.noticeId" placeholder="请选择关联公告"/>
 
 
-              <Field  :span="20" label="附件" ><fileUpload v-model="form.filePath"   :fileName="form.fileName"   @getFileName="getFileName" prePath="/file/fileupload"/></Field>
+              <Field  :span="20" label="党员示范logo" ><fileUpload v-model="form.filePath"   :fileName="form.fileName"   @getFileName="getFileName" prePath="/file/fileupload"/></Field>
                             <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
 
             </el-row>

smart-office-manager/src/main/java/com/mortals/xhx/module/room/service/impl/RoomServiceImpl.java

 package com.mortals.xhx.module.room.service.impl;
 
 import com.mortals.framework.model.PageInfo;
+import com.mortals.xhx.common.pdu.UploadDeviceReq;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
@@ -50,6 +52,8 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
     private NoticeRoomService noticeRoomService;
     @Autowired
     private NoticeService noticeService;
+    @Autowired
+    private IDeviceMessageFeign messageFeign;
 
 
     @Override
@@ -109,6 +113,12 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
                 noticeRoomService.save(noticeRoomEntity, context);
             }
         }
+
+        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+        uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(entity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
+        uploadDeviceReq.setAction("refreshMetting");
+        messageFeign.downMsg(uploadDeviceReq);
+
         super.saveAfter(entity, context);
     }
 
@@ -184,7 +194,10 @@ public class RoomServiceImpl extends AbstractCRUDServiceImpl<RoomDao, RoomEntity
                 }
             }
         }
-        super.updateAfter(entity, context);
+        UploadDeviceReq uploadDeviceReq = new UploadDeviceReq();
+        uploadDeviceReq.setDeviceCodeList( roomDeviceService.find(new RoomDeviceQuery().roomId(entity.getId())).stream().map(i->i.getDeviceCode()).collect(Collectors.toList()));
+        uploadDeviceReq.setAction("refreshMetting");
+        messageFeign.downMsg(uploadDeviceReq);
     }
 
     @Override