Merge branch 'master' of http://git.ydd100.cn/wangtao01/tour-server

tour-module/src/main/java/com/tour/module/request/LineRequet.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * 旅行线路对象 tour_line
- * 
+ *
  * @author zoe
  * @date 2023-05-23
  */
@@ -55,11 +55,11 @@ private static final long serialVersionUID=1L;
     private String totalService;
 
     /** 线路行程 */
-    private List<String> tourRemark;
+    private String tourRemark;
 
     /** 购票须知 */
     @Excel(name = "购票须知")
-    private List<String> ticketNotice;
+    private String ticketNotice;
 
     /** 展示图 */
     @Excel(name = "展示图")

tour-module/src/main/java/com/tour/module/service/impl/LineServiceImpl.java

@@ -70,21 +70,21 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements IL
         }).collect(Collectors.toList());
         vo.setImage(productList);
 
-        List<String> remarkImageList = Arrays.asList(StringUtils.split(item.getTourRemark(), ","));
-        List<Map<String, String>> remarkList = remarkImageList.stream().map(productImage -> {
-            Map<String, String> product = new HashMap<>();
-            product.put("url", productImage);
-            return product;
-        }).collect(Collectors.toList());
-        vo.setTourRemark(remarkList);
-
-        List<String> noticeImageList = Arrays.asList(StringUtils.split(item.getTicketNotice(), ","));
-        List<Map<String, String>> noticeList = noticeImageList.stream().map(productImage -> {
-            Map<String, String> product = new HashMap<>();
-            product.put("url", productImage);
-            return product;
-        }).collect(Collectors.toList());
-        vo.setTicketNotice(noticeList);
+//        List<String> remarkImageList = Arrays.asList(StringUtils.split(item.getTourRemark(), ","));
+//        List<Map<String, String>> remarkList = remarkImageList.stream().map(productImage -> {
+//            Map<String, String> product = new HashMap<>();
+//            product.put("url", productImage);
+//            return product;
+//        }).collect(Collectors.toList());
+//        vo.setTourRemark(remarkList);
+
+//        List<String> noticeImageList = Arrays.asList(StringUtils.split(item.getTicketNotice(), ","));
+//        List<Map<String, String>> noticeList = noticeImageList.stream().map(productImage -> {
+//            Map<String, String> product = new HashMap<>();
+//            product.put("url", productImage);
+//            return product;
+//        }).collect(Collectors.toList());
+//        vo.setTicketNotice(noticeList);
         return vo;
     }
 
@@ -103,26 +103,26 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements IL
         line.setImage(stringBuilder.toString());
 
 
-        StringBuilder stringBuilder1 = new StringBuilder();
-        for (int i = 0; i < requet.getTourRemark().size(); i++) {
-            if (i >= (requet.getTourRemark().size() - 1)) {
-                stringBuilder1.append(requet.getTourRemark().get(i));
-            } else {
-                stringBuilder1.append(requet.getTourRemark().get(i)).append(",");
-            }
-        }
-        line.setTourRemark(stringBuilder1.toString());
-
-
-        StringBuilder stringBuilder2 = new StringBuilder();
-        for (int i = 0; i < requet.getTicketNotice().size(); i++) {
-            if (i >= (requet.getTicketNotice().size() - 1)) {
-                stringBuilder2.append(requet.getTicketNotice().get(i));
-            } else {
-                stringBuilder2.append(requet.getTicketNotice().get(i)).append(",");
-            }
-        }
-        line.setTicketNotice(stringBuilder2.toString());
+//        StringBuilder stringBuilder1 = new StringBuilder();
+//        for (int i = 0; i < requet.getTourRemark().size(); i++) {
+//            if (i >= (requet.getTourRemark().size() - 1)) {
+//                stringBuilder1.append(requet.getTourRemark().get(i));
+//            } else {
+//                stringBuilder1.append(requet.getTourRemark().get(i)).append(",");
+//            }
+//        }
+//        line.setTourRemark(stringBuilder1.toString());
+//
+//
+//        StringBuilder stringBuilder2 = new StringBuilder();
+//        for (int i = 0; i < requet.getTicketNotice().size(); i++) {
+//            if (i >= (requet.getTicketNotice().size() - 1)) {
+//                stringBuilder2.append(requet.getTicketNotice().get(i));
+//            } else {
+//                stringBuilder2.append(requet.getTicketNotice().get(i)).append(",");
+//            }
+//        }
+//        line.setTicketNotice(stringBuilder2.toString());
 
         return baseMapper.insert(line);
     }
@@ -141,25 +141,25 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements IL
         }
         line.setImage(stringBuilder.toString());
 
-        StringBuilder stringBuilder1 = new StringBuilder();
-        for (int i = 0; i < requet.getTourRemark().size(); i++) {
-            if (i >= (requet.getTourRemark().size() - 1)) {
-                stringBuilder1.append(requet.getTourRemark().get(i));
-            } else {
-                stringBuilder1.append(requet.getTourRemark().get(i)).append(",");
-            }
-        }
-        line.setTourRemark(stringBuilder1.toString());
-
-        StringBuilder stringBuilder2 = new StringBuilder();
-        for (int i = 0; i < requet.getTicketNotice().size(); i++) {
-            if (i >= (requet.getTicketNotice().size() - 1)) {
-                stringBuilder2.append(requet.getTicketNotice().get(i));
-            } else {
-                stringBuilder2.append(requet.getTicketNotice().get(i)).append(",");
-            }
-        }
-        line.setTicketNotice(stringBuilder2.toString());
+//        StringBuilder stringBuilder1 = new StringBuilder();
+//        for (int i = 0; i < requet.getTourRemark().size(); i++) {
+//            if (i >= (requet.getTourRemark().size() - 1)) {
+//                stringBuilder1.append(requet.getTourRemark().get(i));
+//            } else {
+//                stringBuilder1.append(requet.getTourRemark().get(i)).append(",");
+//            }
+//        }
+//        line.setTourRemark(stringBuilder1.toString());
+//
+//        StringBuilder stringBuilder2 = new StringBuilder();
+//        for (int i = 0; i < requet.getTicketNotice().size(); i++) {
+//            if (i >= (requet.getTicketNotice().size() - 1)) {
+//                stringBuilder2.append(requet.getTicketNotice().get(i));
+//            } else {
+//                stringBuilder2.append(requet.getTicketNotice().get(i)).append(",");
+//            }
+//        }
+//        line.setTicketNotice(stringBuilder2.toString());
         return baseMapper.updateById(line);
     }
 }

tour-module/src/main/java/com/tour/module/vo/LineVo.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * 旅行线路对象 tour_line
- * 
+ *
  * @author zoe
  * @date 2023-05-23
  */
@@ -55,11 +55,11 @@ private static final long serialVersionUID=1L;
     private String totalService;
 
     /** 线路行程 */
-    private List<Map<String,String>> tourRemark;
+    private String tourRemark;
 
     /** 购票须知 */
     @Excel(name = "购票须知")
-    private List<Map<String,String>> ticketNotice;
+    private String ticketNotice;
 
     /** 展示图 */
     @Excel(name = "展示图")

web-ui/src/components/Editor/index.vue

@@ -42,7 +42,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.VUE_APP_BASE_API+'/common/upload',//上传路径
+      uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload",//上传路径
       headers: {
         Authorization: "Bearer " + getToken(),
       },

web-ui/src/views/module/line/index.vue

@@ -97,8 +97,8 @@
     <!-- 添加或修改线路基础信息对话框 -->
     <template>
       <div>
-        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false" @close='closeDialog'>
-          <el-form ref="elForm" :model="form" :rules="rules" size="small" label-width="100px" @keyup.enter.native="submitForm">
+        <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
+          <el-form ref="elForm" :model="form" :rules="rules" size="small" label-width="100px">
             <el-row :gutter=15>
               <el-col :span="20">
                 <el-form-item label="标题:" prop="title">
@@ -203,7 +203,7 @@
            
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button type="primary" :loading="subLoading" @click="submitForm">确 定</el-button>
+            <el-button type="primary" @click="submitForm">确 定</el-button>
             <el-button @click="cancel">取 消</el-button>
           </div>
         </el-dialog>
@@ -342,7 +342,7 @@ export default {
 
     },
        /** 重置按钮操作 */
-       resetQuery() {
+    resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -369,8 +369,8 @@ export default {
         title:undefined,
         subTitle:undefined,
         image: [],
-        ticketNotice:[],
-        tourRemark:[],
+        ticketNotice:'',
+        tourRemark:'',
       };
       this.resetForm("form");
       this.attributionOptions = [];
@@ -405,8 +405,8 @@ export default {
         this.form = response.data;
         console.log("*********"+JSON.stringify( this.form));
         this.imageFileList = [...this.form.image];
-        this.remarkFileList = [...this.form.tourRemark];
-        this.noticeFileList = [...this.form.ticketNotice];
+        // this.remarkFileList = [...this.form.tourRemark];
+        // this.noticeFileList = [...this.form.ticketNotice];
         this.open = true;
         this.title = "修改旅游线路信息";
       });
@@ -416,9 +416,10 @@ export default {
     submitForm() {
       this.$refs["elForm"].validate(valid => {
         if (valid) {
-          let tourRemarkImage = [];
-          let tourNoticeImage = [];
+          // let tourRemarkImage = [];
+          // let tourNoticeImage = [];
           let productImage = [];
+          console.log('form', this.form)
           this.form.image.forEach(item => {
             if ((typeof item) === 'string') {
               productImage.push(item);
@@ -426,23 +427,23 @@ export default {
               productImage.push(item.url);
             }
           });
-          this.form.tourRemark.forEach(item => {
-            if ((typeof item) === 'string') {
-              tourRemarkImage.push(item);
-            } else {
-              tourRemarkImage.push(item.url);
-            }
-          });
-          this.form.ticketNotice.forEach(item => {
-            if ((typeof item) === 'string') {
-              tourNoticeImage.push(item);
-            } else {
-              tourNoticeImage.push(item.url);
-            }
-          });
+          // this.form.tourRemark.forEach(item => {
+          //   if ((typeof item) === 'string') {
+          //     tourRemarkImage.push(item);
+          //   } else {
+          //     tourRemarkImage.push(item.url);
+          //   }
+          // });
+          // this.form.ticketNotice.forEach(item => {
+          //   if ((typeof item) === 'string') {
+          //     tourNoticeImage.push(item);
+          //   } else {
+          //     tourNoticeImage.push(item.url);
+          //   }
+          // });
           this.form.image = productImage;
-          this.form.tourRemark = tourRemarkImage;
-          this.form.ticketNotice = tourNoticeImage;
+          // this.form.tourRemark = tourRemarkImage;
+          // this.form.ticketNotice = tourNoticeImage;
 
 
           if (this.form.id != null) {