代码格式

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/CanteenController.java

@@ -25,6 +25,15 @@ public class CanteenController {
 
     private final CanteenService canteenService;
 
+    /**
+     * description: 分页
+     * @author zwq
+     * @date 2022/9/2 15:50
+     * @param page 分页参数
+     * @param limit 分页参数
+     * @param canteenName 食堂名称
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @GetMapping("/page")
     public Map<String,Object> page(Integer page, Integer limit, String canteenName) {
         if (Blank.isEmpty(page, limit)) {
@@ -32,7 +41,17 @@ public class CanteenController {
         }
         return canteenService.page(page, limit, canteenName);
     }
-    
+
+    /**
+     * description: 新增
+     * @author zwq
+     * @date 2022/9/2 15:51
+     * @param canteenName 食堂名称
+     * @param founder 创建人
+     * @param supplyTimeId 时间节点
+     * @param files 文件
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/add")
     public Map<String,Object> add(String canteenName, Integer founder, String supplyTimeId, MultipartFile[] files) throws IOException {
         if (Blank.isEmpty(canteenName, founder)) {
@@ -47,7 +66,18 @@ public class CanteenController {
         canteenDO.setSupplyTimeId(supplyTimeId);
         return canteenService.add(canteenDO, files);
     }
-    
+
+    /**
+     * description: 修改
+     * @author zwq
+     * @date 2022/9/2 15:51
+     * @param id 主键
+     * @param canteenName 食堂名称
+     * @param supplyTimeId 时间节点
+     * @param canteenPhotoPath 删除的文件的图片路径
+     * @param files 文件
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/update")
     public Map<String,Object> update(String id, String canteenName, String supplyTimeId, String canteenPhotoPath, MultipartFile[] files) throws IOException {
         if (Blank.isEmpty(id, canteenName)) {
@@ -63,7 +93,14 @@ public class CanteenController {
         canteenDO.setSupplyTimeId(supplyTimeId);
         return canteenService.update(canteenDO, files);
     }
-    
+
+    /**
+     * description: 删除
+     * @author zwq
+     * @date 2022/9/2 15:52
+     * @param id 主键
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/delete")
     public Map<String,Object> delete(String id) {
         return canteenService.deleteById(id);

nngkxxdp/src/main/java/com/example/nngkxxdp/controller/SupplyTimeController.java

@@ -24,6 +24,15 @@ public class SupplyTimeController {
 
     private final SupplyTimeService supplyTimeService;
 
+    /**
+     * description: 分页
+     * @author zwq
+     * @date 2022/9/2 15:53
+     * @param page 分页参数
+     * @param limit 分页参数
+     * @param timeNode 供应时间类型
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @GetMapping("/page")
     public Map<String,Object> page(Integer page, Integer limit, Integer timeNode) {
         if (Blank.isEmpty(page, limit)) {
@@ -31,7 +40,14 @@ public class SupplyTimeController {
         }
         return supplyTimeService.page(page, limit, timeNode);
     }
-    
+
+    /**
+     * description: 新增
+     * @author zwq
+     * @date 2022/9/2 15:53
+     * @param supplyTimeDO 数据
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/add")
     public Map<String,Object> addSupplyTime(@RequestBody SupplyTimeDO supplyTimeDO) {
         // 判空
@@ -46,7 +62,14 @@ public class SupplyTimeController {
         }
         return supplyTimeService.add(supplyTimeDO);
     }
-    
+
+    /**
+     * description: 修改
+     * @author zwq
+     * @date 2022/9/2 15:54
+     * @param supplyTimeDO 数据
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/update")
     public Map<String,Object> updateSupplyTime(@RequestBody SupplyTimeDO supplyTimeDO) {
         // 判空
@@ -61,12 +84,26 @@ public class SupplyTimeController {
         }
         return supplyTimeService.update(supplyTimeDO);
     }
-    
+
+    /**
+     * description: 删除
+     * @author zwq
+     * @date 2022/9/2 15:54
+     * @param id 主键
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @PostMapping("/delete")
     public Map<String,Object> deleteSupplyTimeById(String id) {
         return supplyTimeService.deleteById(id);
     }
 
+    /**
+     * description: 根据供应时间类型查询列表
+     * @author zwq
+     * @date 2022/9/2 15:54
+     * @param timeNode 供应时间类型
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     */
     @GetMapping("/list")
     public Map<String,Object> deleteSupplyTimeById(Integer timeNode) {
         return supplyTimeService.listByNode(timeNode);

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/canteen/CanteenManage.vue

@@ -49,16 +49,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="canteenName" label="食堂名称" />
-      <!-- <el-table-column
-        prop="canteenPhotoPath"
-        :show-overflow-tooltip="true"
-        label="照片"
-      />
-      <el-table-column
-        prop="supplyTimeId"
-        :show-overflow-tooltip="true"
-        label="供应时间ID"
-      /> -->
       <el-table-column prop="founder" label="创建人" />
       <el-table-column prop="createTime" label="创建时间" />
       <el-table-column label="操作" width="230">
@@ -154,7 +144,6 @@
               <el-upload
                 element-loading-text="数据上传中请等待..."
                 action=""
-                class="upload-demo"
                 :on-change="handleChange"
                 :multiple="false"
                 :auto-upload="false"
@@ -197,9 +186,11 @@ export default {
       query: {
         canteenName: "",
       },
+      // 所有时间节点
       timeNodeList: [],
       // 整体分组
       timeNodeOptions: [],
+      // 4个时间段分组
       timeNodeOption1: {
         label: "早餐",
         options: [],
@@ -216,7 +207,6 @@ export default {
         label: "外卖",
         options: [],
       },
-
       // 早餐列表
       timeNodeList1: [],
       // 中餐列表
@@ -242,7 +232,9 @@ export default {
         page: 1,
         limit: 10,
       },
+      // 实际保存的文件File,在文件上传change的时候改变
       uploadFiles: [],
+      // 文件上传绑定的list
       fileList: [],
     };
   },
@@ -261,7 +253,7 @@ export default {
       }
       this.uploadFiles = fileList;
     },
-    // 根据选择的时间节点，禁用相同类型的选项
+    // 根据选择的时间节点，保证同一组选项只能选择一个
     timeNodeChange() {
       // 分别代表早中晚快递选择的数量
       let timeNodeNum1 = 0;
@@ -334,8 +326,8 @@ export default {
         });
       }
     },
+    // 监听文件上传改变
     handleChange(file, fileList) {
-      // 文件改变
       this.uploadFiles = fileList;
     },
     //打开新增食堂界面
@@ -345,30 +337,7 @@ export default {
         .then((r) => {
           if (r.data.result) {
             // 拿到时间节点，并分组
-            this.timeNodeList = r.data.data;
-            this.timeNodeList1 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 1;
-            });
-            this.timeNodeList2 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 2;
-            });
-            this.timeNodeList3 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 3;
-            });
-            this.timeNodeList4 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 4;
-            });
-            this.timeNodeOption1.options = this.timeNodeList1;
-            this.timeNodeOption2.options = this.timeNodeList2;
-            this.timeNodeOption3.options = this.timeNodeList3;
-            this.timeNodeOption4.options = this.timeNodeList4;
-            this.timeNodeOptions = [];
-            this.timeNodeOptions.push(
-              this.timeNodeOption1,
-              this.timeNodeOption2,
-              this.timeNodeOption3,
-              this.timeNodeOption4
-            );
+            this.updateTimeNodeGroup(r.data.data)
           } else {
             this.$message.error("获取时间节点列表失败");
           }
@@ -392,30 +361,7 @@ export default {
         .then((r) => {
           if (r.data.result) {
             // 拿到时间节点列表，并分组
-            this.timeNodeList = r.data.data;
-            this.timeNodeList1 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 1;
-            });
-            this.timeNodeList2 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 2;
-            });
-            this.timeNodeList3 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 3;
-            });
-            this.timeNodeList4 = this.timeNodeList.filter((item) => {
-              return item.timeNode === 4;
-            });
-            this.timeNodeOption1.options = this.timeNodeList1;
-            this.timeNodeOption2.options = this.timeNodeList2;
-            this.timeNodeOption3.options = this.timeNodeList3;
-            this.timeNodeOption4.options = this.timeNodeList4;
-            this.timeNodeOptions = [];
-            this.timeNodeOptions.push(
-              this.timeNodeOption1,
-              this.timeNodeOption2,
-              this.timeNodeOption3,
-              this.timeNodeOption4
-            );
+            this.updateTimeNodeGroup(r.data.data)
             this.postManagement = JSON.parse(JSON.stringify(data));
             if (this.postManagement.supplyTimeId && this.postManagement.supplyTimeId !== '') {
               this.postManagement.supplyTimeId =
@@ -453,7 +399,34 @@ export default {
       this.postManagement = JSON.parse(JSON.stringify(data));
       this.workDialog = true;
     },
-    //保存
+    // 更新时间节点的分组
+    updateTimeNodeGroup(data) {
+      this.timeNodeList = data;
+      this.timeNodeList1 = this.timeNodeList.filter((item) => {
+        return item.timeNode === 1;
+      });
+      this.timeNodeList2 = this.timeNodeList.filter((item) => {
+        return item.timeNode === 2;
+      });
+      this.timeNodeList3 = this.timeNodeList.filter((item) => {
+        return item.timeNode === 3;
+      });
+      this.timeNodeList4 = this.timeNodeList.filter((item) => {
+        return item.timeNode === 4;
+      });
+      this.timeNodeOption1.options = this.timeNodeList1;
+      this.timeNodeOption2.options = this.timeNodeList2;
+      this.timeNodeOption3.options = this.timeNodeList3;
+      this.timeNodeOption4.options = this.timeNodeList4;
+      this.timeNodeOptions = [];
+      this.timeNodeOptions.push(
+        this.timeNodeOption1,
+        this.timeNodeOption2,
+        this.timeNodeOption3,
+        this.timeNodeOption4
+      );
+    },
+    // 保存
     saveWork() {
       if (!this.postManagement.canteenName) {
         this.$message.error("请输入食堂名称！");
@@ -487,6 +460,7 @@ export default {
             this.$message.error(r.data.msg);
           });
       } else {
+        // 新增食堂
         let params = new FormData();
         this.uploadFiles.forEach((item) => {
           params.append("files", item.raw);

nngkxxdp/src/main/resources/static/naqwzsjtj/naqwzsjtj/src/views/canteen/EvaluationManage.vue

@@ -3,10 +3,6 @@
     <!--操作栏-->
     <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
       <div>
-<!--        <el-button type="primary" class="add" @click="openAddWork">新增</el-button>-->
-<!--        <el-button type="primary" class="add" style="margin-left: 10px"-->
-<!--                   @click="upload.open = true;upload.fileList = []">导入-->
-<!--        </el-button>-->
       </div>
       <div style="display: flex">
         <el-input v-model.trim="query.dishesName" clearable placeholder="请输入菜品名称"
@@ -85,11 +81,9 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" @click="saveWork">提交</el-button>
         <el-button @click="workDialog = false" size="mini">返回</el-button>
       </div>
     </el-dialog>
-
   </div>
 </template>
 
@@ -115,11 +109,11 @@ export default {
       tableData: [],
       // 总数
       total: 0,
-      //新增/编辑界面
+      //详情界面
       workDialog: false,
-      //新增/编辑标题
+      //详情标题
       workTitle: '详情',
-      // 新增/编辑表单
+      // 详情表单
       postManagement: {
         dishesName: ''
       },
@@ -143,6 +137,7 @@ export default {
       this.sorts.page = currentPage;
       this.getData();
     },
+    // 违规标记
     markEvaluation(id) {
       this.$confirm("是否标记违规?", "提示", {
         cancelButtonClass: "btn-custom-cancel",
@@ -174,12 +169,13 @@ export default {
         });
       })
     },
+    // 详情
     info(data) {
       this.workTitle = "详情";
       this.postManagement = JSON.parse(JSON.stringify(data));
       this.workDialog = true;
     },
-    //删除
+    // 删除
     handleDelete(id, index) {
       this.$confirm("您确定要删除该数据吗?", "提示", {
         cancelButtonClass: "btn-custom-cancel",