首页 发现 帮助
登录
lovecoding
/
VIP21
6
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

commit

wuheng 2 年之前
父节点
c4bed4c62a
当前提交
4b618c55a2
共有 10 个文件被更改，包括 196 次插入 和 9 次删除
合并视图 显示文件统计
  1. 二进制
      travel/05_旅游_自由行模块_V1.0.pdf
  2. 5 0
      travel/admin/src/main/java/com/lc/admin/controller/StaticController.java
  3. 56 0
      travel/admin/src/main/java/com/lc/admin/controller/TravelGroupController.java
  4. 1 4
      travel/admin/src/main/java/com/lc/admin/controller/TravelItemController.java
  5. 1 1
      travel/admin/src/main/resources/templates/setmeal.html
  6. 39 4
      travel/admin/src/main/resources/templates/travelgroup.html
  7. 20 0
      travel/service/src/main/java/com/lc/service/TravelGroupService.java
  8. 2 0
      travel/service/src/main/java/com/lc/service/TravelItemService.java
  9. 67 0
      travel/service/src/main/java/com/lc/service/impl/TravelGroupServiceImpl.java
  10. 5 0
      travel/service/src/main/java/com/lc/service/impl/TravelItemServiceImpl.java

二进制
travel/05_旅游_自由行模块_V1.0.pdf
查看文件


+ 5 - 0
travel/admin/src/main/java/com/lc/admin/controller/StaticController.java
查看文件 

@@ -11,6 +11,11 @@ public class StaticController {
 
         return "main";
 
         return "main";
 
     }
 
     }
 
 
 
+    @RequestMapping("/travelgroup.html")
 
+    public String travelgroup(){
 
+        return "travelgroup";
 
+    }
 
+
 
     @RequestMapping("/travelitem.html")
 
     @RequestMapping("/travelitem.html")
 
     public String travelitem(){
 
     public String travelitem(){
 
         return "travelitem";
 
         return "travelitem";

+ 56 - 0
travel/admin/src/main/java/com/lc/admin/controller/TravelGroupController.java
查看文件 

@@ -0,0 +1,56 @@
 
+package com.lc.admin.controller;
 
+
 
+import com.cl.mbg.mapper.TTravelitemMapper;
 
+import com.cl.mbg.model.TTravelgroup;
 
+import com.cl.mbg.model.TTravelitem;
 
+import com.lc.common.pojo.TravelParams;
 
+import com.lc.common.utils.Result;
 
+import com.lc.service.TravelGroupService;
 
+import com.lc.service.TravelItemService;
 
+import org.springframework.web.bind.annotation.*;
 
+
 
+import javax.annotation.Resource;
 
+
 
+@RestController
 
+@RequestMapping("/travelgroup")
 
+public class TravelGroupController {
 
+
 
+
 
+    @Resource
 
+    TravelGroupService travelGroupService;
 
+
 
+
 
+    @PutMapping("/add.do")
 
+    public Result addTravelItem(@RequestBody TTravelgroup travelgroup){
 
+
 
+        travelGroupService.add(travelgroup);
 
+        return Result.ok("操作成功！");
 
+    }
 
+
 
+    @PostMapping("/findPage.do")
 
+    public Result findPage(@RequestBody TravelParams travelParams){
 
+        return Result.data( travelGroupService.findPage(travelParams) );
 
+    }
 
+
 
+    @GetMapping("/delete.do")
 
+    public Result delete(int id){
 
+        int i = travelGroupService.deleteById(id);
 
+        if ( i > 0 )
 
+            return Result.ok();
 
+        return Result.fail();
 
+    }
 
+
 
+    @GetMapping("/selectById.do")
 
+    public Result selectById(int id){
 
+        TTravelgroup tTravelgroup = travelGroupService.selectById(id);
 
+        return Result.data(tTravelgroup);
 
+    }
 
+
 
+    @PostMapping("/edit.do")
 
+    public Result edit( @RequestBody TTravelgroup travelgroup ){
 
+        int edit = travelGroupService.edit(travelgroup);
 
+        return edit > 0 ? Result.ok() : Result.fail();
 
+    }
 
+
 
+
 
+}

+ 1 - 4
travel/admin/src/main/java/com/lc/admin/controller/TravelItemController.java
查看文件 

@@ -15,15 +15,12 @@ import java.util.List;
 
 @RequestMapping("/travelitem")
 
 @RequestMapping("/travelitem")
 
 public class TravelItemController {
 
 public class TravelItemController {
 
 
 
-    @Resource
 
-    TTravelitemMapper travelitemMapper;
 
-
 
     @Resource
 
     @Resource
 
     TravelItemService travelItemService;
 
     TravelItemService travelItemService;
 
 
 
     @PutMapping("/add.do")
 
     @PutMapping("/add.do")
 
     public Result addTravelItem(@RequestBody TTravelitem tTravelitem){
 
     public Result addTravelItem(@RequestBody TTravelitem tTravelitem){
 
-        travelitemMapper.insert( tTravelitem );
 
+        int i = travelItemService.add( tTravelitem );
 
         return Result.ok("恭喜您自由行添加成功！！！");
 
         return Result.ok("恭喜您自由行添加成功！！！");
 
     }
 
     }

+ 1 - 1
travel/admin/src/main/resources/templates/setmeal.html
查看文件 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+；；；；；；；vb[<!DOCTYPE html>
 
 <html>
 
 <html>
 
     <head>
 
     <head>
 
         <!-- 页面meta -->
 
         <!-- 页面meta -->

+ 39 - 4
travel/admin/src/main/resources/templates/travelgroup.html
查看文件 

@@ -54,7 +54,7 @@
 
             <div class="app-container">
 
             <div class="app-container">
 
                 <div class="box">
 
                 <div class="box">
 
                     <div class="filter-container">
 
                     <div class="filter-container">
 
-                        <el-input placeholder="编码/名称/助记码" v-model="pagination.queryString" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"></el-input>
 
+                        <el-input placeholder="编码/名称/助记码" v-model="pagination.queryString.name" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter"></el-input>
 
                         <el-button @click="handleCurrentChange(1)" class="dalfBut">查询</el-button>
 
                         <el-button @click="handleCurrentChange(1)" class="dalfBut">查询</el-button>
 
                         <el-button type="primary" class="butT" @click="handleCreate()">新建</el-button>
 
                         <el-button type="primary" class="butT" @click="handleCreate()">新建</el-button>
 
                     </div>
 
                     </div>
 
@@ -267,7 +267,9 @@
 
                     currentPage: 1,
 
                     currentPage: 1,
 
                     pageSize:10,
 
                     pageSize:10,
 
                     total:0,
 
                     total:0,
 
-                    queryString:null,
 
+                    queryString: {
 
+                        name:""
 
+                    },
 
                 },
 
                 },
 
                 dataList: [],//列表数据
 
                 dataList: [],//列表数据
 
                 formData: {},//表单数据
 
                 formData: {},//表单数据
 
@@ -331,8 +333,8 @@
 
 											//赋值
 
 											//赋值
 
 											console.log(res)
 
 											console.log(res)
 
 											
 											
-											this.dataList = res.data.rows;
 
-											this.pagination.total = res.data.total;
 
+											this.dataList = res.data.data.rows;
 
+											this.pagination.total = res.data.data.total;
 
 									})
 
 									})
 
                 },
 
                 },
 
                 // 重置表单
 
                 // 重置表单
 
@@ -396,6 +398,39 @@
 
                 },
 
                 },
 
                 // 删除
 
                 // 删除
 
                 handleDelete(row) {
 
                 handleDelete(row) {
 
+
 
+                    this.$confirm('此操作将永久删除该自由行, 是否继续?', '提示', {
 
+                        confirmButtonText: '确定',
 
+                        cancelButtonText: '取消',
 
+                        type: 'warning',
 
+                        center: true
 
+                    }).then(() => {
 
+                        // 发送ajax请求，执行删除
 
+                        axios.get(`/travelgroup/delete.do?id=${row.id}`)
 
+                            .then( res =>{
 
+                                console.log(res)
 
+                                if(res.data.flag){
 
+                                    this.$message({
 
+                                        type: 'success',
 
+                                        message: res.data.message
 
+                                    });
 
+                                    //刷新页面
 
+                                    this.findPage();
 
+                                }else{
 
+                                    this.$message({
 
+                                        type: 'error',
 
+                                        message: res.data.message
 
+                                    });
 
+                                }
 
+                            })
 
+
 
+                    }).catch(() => {
 
+                        this.$message({
 
+                            type: 'info',
 
+                            message: '已取消删除'
 
+                        });
 
+                    });
 
+
 
                 }
 
                 }
 
             }
 
             }
 
         })
 
         })

+ 20 - 0
travel/service/src/main/java/com/lc/service/TravelGroupService.java
查看文件 

@@ -0,0 +1,20 @@
 
+package com.lc.service;
 
+
 
+import com.cl.mbg.model.TTravelgroup;
 
+import com.cl.mbg.model.TTravelitem;
 
+import com.lc.common.pojo.TravelParams;
 
+
 
+import java.util.HashMap;
 
+
 
+public interface TravelGroupService {
 
+
 
+    TTravelgroup selectById(Integer id);
 
+
 
+    int deleteById(Integer id);
 
+
 
+    HashMap<String, Object> findPage(TravelParams travelParams);
 
+
 
+    int edit(TTravelgroup travelitem);
 
+
 
+    int add(TTravelgroup travelgroup);
 
+}

+ 2 - 0
travel/service/src/main/java/com/lc/service/TravelItemService.java
查看文件 

@@ -15,4 +15,6 @@ public interface TravelItemService {
 
     HashMap<String, Object> findPage(TravelParams travelParams);
 
     HashMap<String, Object> findPage(TravelParams travelParams);
 
 
 
     int edit(TTravelitem travelitem);
 
     int edit(TTravelitem travelitem);
 
+
 
+    int add(TTravelitem tTravelitem);
 
 }
 
 }

+ 67 - 0
travel/service/src/main/java/com/lc/service/impl/TravelGroupServiceImpl.java
查看文件 

@@ -0,0 +1,67 @@
 
+package com.lc.service.impl;
 
+
 
+import com.cl.mbg.mapper.TTravelgroupMapper;
 
+import com.cl.mbg.mapper.TTravelitemMapper;
 
+import com.cl.mbg.model.TTravelgroup;
 
+import com.cl.mbg.model.TTravelgroupExample;
 
+import com.cl.mbg.model.TTravelitem;
 
+import com.cl.mbg.model.TTravelitemExample;
 
+import com.github.pagehelper.PageHelper;
 
+import com.lc.common.pojo.QueryString;
 
+import com.lc.common.pojo.TravelParams;
 
+import com.lc.service.TravelGroupService;
 
+import org.springframework.stereotype.Service;
 
+import org.springframework.util.StringUtils;
 
+
 
+import javax.annotation.Resource;
 
+import java.util.HashMap;
 
+import java.util.List;
 
+
 
+@Service
 
+public class TravelGroupServiceImpl implements TravelGroupService {
 
+
 
+    @Resource
 
+    TTravelgroupMapper tTravelGroupMapper;
 
+
 
+    @Override
 
+    public TTravelgroup selectById(Integer id) {
 
+        return tTravelGroupMapper.selectByPrimaryKey(id);
 
+    }
 
+
 
+    @Override
 
+    public int deleteById(Integer id) {
 
+        return tTravelGroupMapper.deleteByPrimaryKey(id);
 
+    }
 
+
 
+    @Override
 
+    public HashMap<String, Object> findPage(TravelParams travelParams) {
 
+        //请求的 当前页面
 
+        int currentPage =  travelParams.getCurrentPage();
 
+        int pageSize = travelParams.getPageSize();
 
+        QueryString queryString = travelParams.getQueryString();
 
+        String name = queryString.getName();
 
+        PageHelper.startPage(  currentPage , pageSize == 0 ? 10 : pageSize );
 
+        TTravelgroupExample tTravelgroupExample = new TTravelgroupExample();
 
+        if ( StringUtils.hasText(name) ) {
 
+            TTravelgroupExample.Criteria criteria = tTravelgroupExample.createCriteria();
 
+            criteria.andNameLike( "%" + name + "%" );
 
+        }
 
+        List<TTravelgroup> tTravelgroup = tTravelGroupMapper.selectByExample(tTravelgroupExample);
 
+
 
+        long count = tTravelGroupMapper.countByExample(tTravelgroupExample);
 
+        HashMap<String, Object> ret = new HashMap<>();
 
+        ret.put("rows", tTravelgroup);
 
+        ret.put("total", count);
 
+        return ret;
 
+    }
 
+
 
+    @Override
 
+    public int edit(TTravelgroup travelgroup) {
 
+        return tTravelGroupMapper.updateByPrimaryKey(travelgroup);
 
+    }
 
+
 
+    @Override
 
+    public int add(TTravelgroup travelgroup) {
 
+        return tTravelGroupMapper.insert(travelgroup);
 
+    }
 
+}

+ 5 - 0
travel/service/src/main/java/com/lc/service/impl/TravelItemServiceImpl.java
查看文件 

@@ -57,4 +57,9 @@ public class TravelItemServiceImpl implements TravelItemService {
 
     public int edit(TTravelitem travelitem) {
 
     public int edit(TTravelitem travelitem) {
 
         return travelitemMapper.updateByPrimaryKey(travelitem);
 
         return travelitemMapper.updateByPrimaryKey(travelitem);
 
     }
 
     }
 
+
 
+    @Override
 
+    public int add(TTravelitem tTravelitem) {
 
+        return travelitemMapper.insert( tTravelitem );
 
+    }
 
 }
 
 }