huwhois 4 years ago
parent
commit
e85eda028e

+ 90 - 0
src/main/java/io/renren/modules/admin/controller/AdvertiseController.java

@ -0,0 +1,90 @@
1
package io.renren.modules.admin.controller;
2
3
import java.util.Arrays;
4
import java.util.Map;
5
6
import org.apache.shiro.authz.annotation.RequiresPermissions;
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.PathVariable;
9
import org.springframework.web.bind.annotation.RequestBody;
10
import org.springframework.web.bind.annotation.RequestMapping;
11
import org.springframework.web.bind.annotation.RequestParam;
12
import org.springframework.web.bind.annotation.RestController;
13
14
import io.renren.modules.admin.entity.AdvertiseEntity;
15
import io.renren.modules.admin.service.AdvertiseService;
16
import io.renren.common.utils.PageUtils;
17
import io.renren.common.utils.R;
18
19
20
21
/**
22
 * 
23
 *
24
 * @author huwhois
25
 * @email huwhois@163.com
26
 * @date 2021-01-15 09:29:21
27
 */
28
@RestController
29
@RequestMapping("admin/advertise")
30
public class AdvertiseController {
31
    @Autowired
32
    private AdvertiseService advertiseService;
33
34
    /**
35
     * 列表
36
     */
37
    @RequestMapping("/list")
38
    @RequiresPermissions("admin:advertise:list")
39
    public R list(@RequestParam Map<String, Object> params){
40
        PageUtils page = advertiseService.queryPage(params);
41
42
        return R.ok().put("page", page);
43
    }
44
45
46
    /**
47
     * 信息
48
     */
49
    @RequestMapping("/info/{id}")
50
    @RequiresPermissions("admin:advertise:info")
51
    public R info(@PathVariable("id") Long id){
52
		AdvertiseEntity advertise = advertiseService.getById(id);
53
54
        return R.ok().put("advertise", advertise);
55
    }
56
57
    /**
58
     * 保存
59
     */
60
    @RequestMapping("/save")
61
    @RequiresPermissions("admin:advertise:save")
62
    public R save(@RequestBody AdvertiseEntity advertise){
63
		advertiseService.save(advertise);
64
65
        return R.ok();
66
    }
67
68
    /**
69
     * 修改
70
     */
71
    @RequestMapping("/update")
72
    @RequiresPermissions("admin:advertise:update")
73
    public R update(@RequestBody AdvertiseEntity advertise){
74
		advertiseService.updateById(advertise);
75
76
        return R.ok();
77
    }
78
79
    /**
80
     * 删除
81
     */
82
    @RequestMapping("/delete")
83
    @RequiresPermissions("admin:advertise:delete")
84
    public R delete(@RequestBody Long[] ids){
85
		advertiseService.removeByIds(Arrays.asList(ids));
86
87
        return R.ok();
88
    }
89
90
}

+ 17 - 0
src/main/java/io/renren/modules/admin/dao/AdvertiseDao.java

@ -0,0 +1,17 @@
1
package io.renren.modules.admin.dao;
2
3
import io.renren.modules.admin.entity.AdvertiseEntity;
4
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
import org.apache.ibatis.annotations.Mapper;
6
7
/**
8
 * 
9
 * 
10
 * @author huwhois
11
 * @email huwhois@163.com
12
 * @date 2021-01-15 09:29:21
13
 */
14
@Mapper
15
public interface AdvertiseDao extends BaseMapper<AdvertiseEntity> {
16
	
17
}

+ 36 - 0
src/main/java/io/renren/modules/admin/entity/AdvertiseEntity.java

@ -0,0 +1,36 @@
1
package io.renren.modules.admin.entity;
2
3
import com.baomidou.mybatisplus.annotation.TableId;
4
import com.baomidou.mybatisplus.annotation.TableName;
5
6
import java.io.Serializable;
7
import java.util.Date;
8
import lombok.Data;
9
10
/**
11
 * 
12
 * 
13
 * @author huwhois
14
 * @email huwhois@163.com
15
 * @date 2021-01-15 09:29:21
16
 */
17
@Data
18
@TableName("advertise")
19
public class AdvertiseEntity implements Serializable {
20
	private static final long serialVersionUID = 1L;
21
22
	/**
23
	 * id
24
	 */
25
	@TableId
26
	private Long id;
27
	/**
28
	 * title
29
	 */
30
	private String title;
31
	/**
32
	 * picture
33
	 */
34
	private String picture;
35
36
}

+ 23 - 0
src/main/java/io/renren/modules/admin/service/AdvertiseService.java

@ -0,0 +1,23 @@
1
package io.renren.modules.admin.service;
2
3
import com.baomidou.mybatisplus.extension.service.IService;
4
import io.renren.common.utils.PageUtils;
5
import io.renren.modules.admin.entity.AdvertiseEntity;
6
7
import java.util.Map;
8
import java.util.List;
9
10
/**
11
 * 
12
 *
13
 * @author huwhois
14
 * @email huwhois@163.com
15
 * @date 2021-01-15 09:29:21
16
 */
17
public interface AdvertiseService extends IService<AdvertiseEntity> {
18
19
    PageUtils queryPage(Map<String, Object> params);
20
21
	List<AdvertiseEntity> queryList();
22
}
23

+ 0 - 2
src/main/java/io/renren/modules/admin/service/MeetingService.java

@ -21,7 +21,5 @@ public interface MeetingService extends IService<MeetingEntity> {
21 21
    boolean meetingExist(Long id);
22 22
23 23
	List<MeetingEntity> listByPid(Long pid);
24
25
	PageUtils branchAll(Long meetingId);
26 24
}
27 25

+ 33 - 0
src/main/java/io/renren/modules/admin/service/impl/AdvertiseServiceImpl.java

@ -0,0 +1,33 @@
1
package io.renren.modules.admin.service.impl;
2
3
import org.springframework.stereotype.Service;
4
5
import java.util.List;
6
import java.util.Map;
7
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8
import com.baomidou.mybatisplus.core.metadata.IPage;
9
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10
import io.renren.common.utils.PageUtils;
11
import io.renren.common.utils.Query;
12
13
import io.renren.modules.admin.dao.AdvertiseDao;
14
import io.renren.modules.admin.entity.AdvertiseEntity;
15
import io.renren.modules.admin.service.AdvertiseService;
16
17
@Service("advertiseService")
18
public class AdvertiseServiceImpl extends ServiceImpl<AdvertiseDao, AdvertiseEntity> implements AdvertiseService {
19
20
    @Override
21
    public PageUtils queryPage(Map<String, Object> params) {
22
        IPage<AdvertiseEntity> page = this.page(new Query<AdvertiseEntity>().getPage(params),
23
                new QueryWrapper<AdvertiseEntity>());
24
25
        return new PageUtils(page);
26
    }
27
28
    @Override
29
    public List<AdvertiseEntity> queryList() {
30
        return this.list(new QueryWrapper<AdvertiseEntity>().last("limit 5"));
31
    }
32
33
}

+ 1 - 7
src/main/java/io/renren/modules/admin/service/impl/MeetingServiceImpl.java

@ -38,12 +38,6 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
38 38
39 39
    @Override
40 40
    public List<MeetingEntity> listByPid(Long pid) {
41
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid));
41
        return this.list(new QueryWrapper<MeetingEntity>().eq("is_del", 0).eq("pid", pid).orderByAsc("id"));
42 42
    }
43
44
    @Override
45
    public PageUtils branchAll(Long meetingId) {
46
        return null;
47
    }
48
49 43
}

+ 33 - 0
src/main/java/io/renren/modules/app/controller/AppAdvertiseController.java

@ -0,0 +1,33 @@
1
package io.renren.modules.app.controller;
2
3
import java.util.Map;
4
import java.util.List;
5
6
import org.springframework.beans.factory.annotation.Autowired;
7
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.RequestParam;
9
import org.springframework.web.bind.annotation.RestController;
10
11
import io.renren.modules.admin.entity.AdvertiseEntity;
12
import io.renren.modules.admin.service.AdvertiseService;
13
import io.renren.common.utils.R;
14
15
/**
16
 * 广告接口
17
 */
18
@RestController
19
@RequestMapping("/app/advertise")
20
public class AppAdvertiseController {
21
    @Autowired
22
    private AdvertiseService advertiseService;
23
24
    /**
25
     * 列表
26
     */
27
    @RequestMapping("/list")
28
    public R list(@RequestParam Map<String, Object> params){
29
        List<AdvertiseEntity> list = advertiseService.queryList();
30
31
        return R.ok().put("list", list);
32
    }
33
}

+ 11 - 0
src/main/java/io/renren/modules/app/controller/AppReportController.java

@ -1,14 +1,25 @@
1 1
package io.renren.modules.app.controller;
2 2
3 3
import java.util.List;
4
import java.util.Map;
5
6
import org.apache.shiro.authz.annotation.RequiresPermissions;
4 7
import org.springframework.beans.factory.annotation.Autowired;
5 8
import org.springframework.web.bind.annotation.GetMapping;
6 9
import org.springframework.web.bind.annotation.PathVariable;
10
import org.springframework.web.bind.annotation.PostMapping;
11
import org.springframework.web.bind.annotation.RequestBody;
7 12
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.RequestParam;
8 14
import org.springframework.web.bind.annotation.RestController;
9 15
16
import io.renren.modules.admin.entity.AttendersEntity;
10 17
import io.renren.modules.admin.entity.ReportEntity;
18
import io.renren.modules.admin.service.AttendersService;
11 19
import io.renren.modules.admin.service.ReportService;
20
import io.renren.modules.admin.entity.ScheduleEntity;
21
import io.renren.modules.admin.service.ScheduleService;
22
import io.renren.common.utils.PageUtils;
12 23
import io.renren.common.utils.R;
13 24
14 25