图片上传控制联调

inspur-admin/src/main/java/com/inspur/web/controller/partywork/RemoteControlController.java

@@ -51,7 +51,7 @@ public class RemoteControlController extends BaseController {
         return remoteControlService.takePhoto(meetingId,deviceId);
     }
 
-    @GetMapping("/photo/upload")
+    @PostMapping("/photo/upload")
     public AjaxResult photoUpload(@RequestParam Long meetingId,@RequestBody MultipartFile file)  {
         return remoteControlService.photoUpload(meetingId,file);
     }

inspur-party/src/main/java/com/inspur/service/partywork/impl/RemoteControlServiceImpl.java

@@ -187,7 +187,7 @@ public class RemoteControlServiceImpl implements IRemoteControlService {
         // 更新数据库
         partyMeeting.setPicsPath(picsPath);
         partyMeetingInfoMapper.updatePartyMeetingInfo(partyMeeting);
-        return AjaxResult.success("上传音频文件成功");
+        return AjaxResult.success("上传拍照图片成功");
     }
     private Map<String, String> uploadFile(MultipartFile file) {
         Map<String,String> resultMap = new HashMap<>();

inspur-pc/src/main/java/com/inspur/netty/message/push/UrlControl.java

@@ -14,4 +14,6 @@ public class UrlControl {
 
     private Long deviceId;
 
+    private Long meetingId;
+
 }

inspur-ui/src/views/party_work/meeting/info.vue

@@ -119,7 +119,7 @@
             </div>
             <div v-else style="width: 70%;border-left: 1px solid #e6e6e6;">
               <div style="font-size: medium;margin-bottom: 10px;margin-left: 20px">录音内容</div>
-              <el-input resize="none" v-model="audioTxt" style="margin-left: 10px" type="textarea" :readonly="audioReadOnly" :rows = "31" placeholder="请输入内容" />
+              <el-input resize="none" v-model="audioTxt" style="margin-left: 10px" type="textarea" :readonly="audioReadOnly" :rows = "29" placeholder="请输入内容" />
               <div style="margin-top: 35px;display: flex;justify-content: center;align-items: center;">
 <!--                <el-button  type="primary" @click="copyWord">文本复制</el-button>-->
                 <el-button  type="primary" @click="audioTxtEdit">文本编辑</el-button>
@@ -136,7 +136,7 @@
               <el-button  type="waring" @click="resetWord">文本重置</el-button>
             </div>
             <el-divider style="margin-top: 10px;margin-bottom: 10px"></el-divider>
-            <el-input id="targetWord" resize="none" v-model="targetWord"  type="textarea" :readonly="true" :rows = "15" placeholder="请输入内容" />
+            <el-input id="targetWord" resize="none" v-model="targetWord"  type="textarea" :readonly="true" :rows = "14" placeholder="请输入内容" />
             <div style="margin-top: 20px;display: flex;flex-direction: column;justify-content: center;align-items: center;">
               <el-button  type="primary" @click="copyWord">文本复制</el-button>
             </div>
@@ -279,7 +279,8 @@ export default {
       getMeeting(id).then(response => {
         // 会议照片集合
         if (response.data.picsPath != null && response.data.picsPath !== '')  {
-          this.photoList = this.form.picsPath.split(",");
+          this.photoList = response.data.pics_path;
+          console.log(this.photoList)
         }
       });
     },
@@ -382,7 +383,8 @@ export default {
       let param = {
         material : url,
         type : 1,
-        deviceId: this.deviceId
+        deviceId: this.deviceId,
+        meetingId: this.meetingId
       };
       urlControl(param).then(response => {
         this.$message({