傅行帆 5 gadus atpakaļ
vecāks
revīzija
79c6a98389

+ 16
- 0
src/main/java/com/huiju/estateagents/controller/TaPosterController.java Parādīt failu

@@ -157,4 +157,20 @@ public class TaPosterController extends BaseController {
157 157
         }
158 158
         return responseBean;
159 159
     }
160
+    
161
+    /**
162
+     * 查询对象
163
+     */
164
+    @RequestMapping(value = "/admin/used/poster", method = RequestMethod.GET)
165
+    public ResponseBean posterUsed(@RequestParam String targetId,@RequestParam String targetType ) {
166
+        ResponseBean responseBean = new ResponseBean();
167
+        try {
168
+            responseBean.addSuccess(iPosterService.getUsedPostersForTarget(targetId,targetType));
169
+        } catch (Exception e) {
170
+            e.printStackTrace();
171
+            logger.error("posterDelete -=- {}", e.toString());
172
+            responseBean.addError(e.getMessage());
173
+        }
174
+        return responseBean;
175
+    }
160 176
 }

+ 149
- 0
src/main/java/com/huiju/estateagents/controller/TaPosterUsedController.java Parādīt failu

@@ -0,0 +1,149 @@
1
+package com.huiju.estateagents.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.huiju.estateagents.base.BaseController;
7
+import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.entity.TaPosterUsed;
9
+import com.huiju.estateagents.service.ITaPosterUsedService;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.PathVariable;
14
+import org.springframework.web.bind.annotation.RequestBody;
15
+import org.springframework.web.bind.annotation.RequestMapping;
16
+import org.springframework.web.bind.annotation.RequestMethod;
17
+import org.springframework.web.bind.annotation.RequestParam;
18
+import org.springframework.web.bind.annotation.ResponseBody;
19
+import org.springframework.web.bind.annotation.RestController;
20
+
21
+/**
22
+ * <p>
23
+    *  前端控制器
24
+    * </p>
25
+ *
26
+ * @author jobob
27
+ * @since 2019-10-28
28
+ */
29
+@RestController
30
+@RequestMapping("/")
31
+public class TaPosterUsedController extends BaseController {
32
+
33
+    private final Logger logger = LoggerFactory.getLogger(TaPosterUsedController.class);
34
+
35
+    @Autowired
36
+    public ITaPosterUsedService iTaPosterUsedService;
37
+
38
+
39
+    /**
40
+     * 分页查询列表
41
+     * @param pageNum
42
+     * @param pageSize
43
+     * @return
44
+     */
45
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.GET)
46
+    public ResponseBean taPosterUsedList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
+        ResponseBean responseBean = new ResponseBean();
49
+        try {
50
+            //使用分页插件
51
+		    IPage<TaPosterUsed> pg = new Page<>(pageNum, pageSize);
52
+            QueryWrapper<TaPosterUsed> queryWrapper = new QueryWrapper<>();
53
+            queryWrapper.orderByDesc("create_date");
54
+
55
+            IPage<TaPosterUsed> result = iTaPosterUsedService.page(pg, queryWrapper);
56
+            responseBean.addSuccess(result);
57
+        }catch (Exception e){
58
+            e.printStackTrace();
59
+            logger.error("taPosterUsedList -=- {}",e.toString());
60
+            responseBean.addError(e.getMessage());
61
+        }
62
+        return responseBean;
63
+    }
64
+
65
+    /**
66
+     * 保存对象
67
+     * @param taPosterUsed 实体对象
68
+     * @return
69
+     */
70
+    @RequestMapping(value="/taPosterUsed",method= RequestMethod.POST)
71
+    public ResponseBean taPosterUsedAdd(@RequestBody TaPosterUsed taPosterUsed){
72
+        ResponseBean responseBean = new ResponseBean();
73
+        try {
74
+            if (iTaPosterUsedService.save(taPosterUsed)){
75
+                responseBean.addSuccess(taPosterUsed);
76
+            }else {
77
+                responseBean.addError("fail");
78
+            }
79
+        }catch (Exception e){
80
+            e.printStackTrace();
81
+            logger.error("taPosterUsedAdd -=- {}",e.toString());
82
+            responseBean.addError(e.getMessage());
83
+        }
84
+        return responseBean;
85
+    }
86
+
87
+    /**
88
+     * 根据id删除对象
89
+     * @param id  实体ID
90
+     */
91
+    @ResponseBody
92
+    @RequestMapping(value="/taPosterUsed/{id}", method= RequestMethod.DELETE)
93
+    public ResponseBean taPosterUsedDelete(@PathVariable Integer id){
94
+        ResponseBean responseBean = new ResponseBean();
95
+        try {
96
+            if(iTaPosterUsedService.removeById(id)){
97
+                responseBean.addSuccess("success");
98
+            }else {
99
+                responseBean.addError("fail");
100
+            }
101
+        }catch (Exception e){
102
+            e.printStackTrace();
103
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
104
+            responseBean.addError(e.getMessage());
105
+        }
106
+        return responseBean;
107
+    }
108
+
109
+    /**
110
+     * 修改对象
111
+     * @param id  实体ID
112
+     * @param taPosterUsed 实体对象
113
+     * @return
114
+     */
115
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.PUT)
116
+    public ResponseBean taPosterUsedUpdate(@PathVariable Integer id,
117
+                                        @RequestBody TaPosterUsed taPosterUsed){
118
+        ResponseBean responseBean = new ResponseBean();
119
+        try {
120
+            if (iTaPosterUsedService.updateById(taPosterUsed)){
121
+                responseBean.addSuccess(taPosterUsed);
122
+            }else {
123
+                responseBean.addError("fail");
124
+            }
125
+        }catch (Exception e){
126
+            e.printStackTrace();
127
+            logger.error("taPosterUsedUpdate -=- {}",e.toString());
128
+            responseBean.addError(e.getMessage());
129
+        }
130
+        return responseBean;
131
+    }
132
+
133
+    /**
134
+     * 根据id查询对象
135
+     * @param id  实体ID
136
+     */
137
+    @RequestMapping(value="/taPosterUsed/{id}",method= RequestMethod.GET)
138
+    public ResponseBean taPosterUsedGet(@PathVariable Integer id){
139
+        ResponseBean responseBean = new ResponseBean();
140
+        try {
141
+            responseBean.addSuccess(iTaPosterUsedService.getById(id));
142
+        }catch (Exception e){
143
+            e.printStackTrace();
144
+            logger.error("taPosterUsedDelete -=- {}",e.toString());
145
+            responseBean.addError(e.getMessage());
146
+        }
147
+        return responseBean;
148
+    }
149
+}

+ 6
- 1
src/main/java/com/huiju/estateagents/entity/TaPoster.java Parādīt failu

@@ -1,10 +1,14 @@
1 1
 package com.huiju.estateagents.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.TableField;
3 4
 import com.baomidou.mybatisplus.annotation.TableName;
4 5
 import com.baomidou.mybatisplus.annotation.IdType;
5 6
 import com.baomidou.mybatisplus.annotation.TableId;
6 7
 import java.time.LocalDateTime;
7 8
 import java.io.Serializable;
9
+import java.util.ArrayList;
10
+import java.util.List;
11
+
8 12
 import lombok.Data;
9 13
 import lombok.EqualsAndHashCode;
10 14
 import lombok.experimental.Accessors;
@@ -73,5 +77,6 @@ public class TaPoster implements Serializable {
73 77
      */
74 78
     private Integer orgId;
75 79
 
76
-
80
+    @TableField(exist = false)
81
+    private List<Integer> templateIds = new ArrayList<>();
77 82
 }

+ 34
- 0
src/main/java/com/huiju/estateagents/entity/TaPosterUsed.java Parādīt failu

@@ -0,0 +1,34 @@
1
+package com.huiju.estateagents.entity;
2
+
3
+import lombok.Data;
4
+import lombok.EqualsAndHashCode;
5
+import lombok.experimental.Accessors;
6
+
7
+import java.io.Serializable;
8
+import java.time.LocalDateTime;
9
+
10
+/**
11
+ * <p>
12
+ * 
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-10-28
17
+ */
18
+@Data
19
+@EqualsAndHashCode(callSuper = false)
20
+@Accessors(chain = true)
21
+public class TaPosterUsed implements Serializable {
22
+
23
+    private static final long serialVersionUID = 1L;
24
+
25
+    private Integer posterId;
26
+
27
+    private Integer templateId;
28
+
29
+    private Integer orgId;
30
+
31
+    private LocalDateTime createDate;
32
+
33
+
34
+}

+ 18
- 0
src/main/java/com/huiju/estateagents/mapper/TaPosterUsedMapper.java Parādīt failu

@@ -0,0 +1,18 @@
1
+package com.huiju.estateagents.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.huiju.estateagents.entity.TaPosterUsed;
5
+import org.apache.ibatis.annotations.Mapper;
6
+
7
+/**
8
+ * <p>
9
+ *  Mapper 接口
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-10-28
14
+ */
15
+@Mapper
16
+public interface TaPosterUsedMapper extends BaseMapper<TaPosterUsed> {
17
+
18
+}

+ 16
- 0
src/main/java/com/huiju/estateagents/service/ITaPosterUsedService.java Parādīt failu

@@ -0,0 +1,16 @@
1
+package com.huiju.estateagents.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.huiju.estateagents.entity.TaPosterUsed;
5
+
6
+/**
7
+ * <p>
8
+ *  服务类
9
+ * </p>
10
+ *
11
+ * @author jobob
12
+ * @since 2019-10-28
13
+ */
14
+public interface ITaPosterUsedService extends IService<TaPosterUsed> {
15
+
16
+}

+ 8
- 1
src/main/java/com/huiju/estateagents/service/TaPosterService.java Parādīt failu

@@ -17,5 +17,12 @@ import java.util.List;
17 17
 public interface TaPosterService extends IService<TaPoster> {
18 18
 
19 19
     List<TaPoster> getPostersForTarget(String targetId,String targetType);
20
-
20
+	
21
+	/**
22
+	 * 获取海报和已使用的海报模板
23
+	 * @param targetId
24
+	 * @param targetType
25
+	 * @return
26
+	 */
27
+	TaPoster getUsedPostersForTarget(String targetId, String targetType);
21 28
 }

+ 35
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPosterServiceImpl.java Parādīt failu

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6
 import com.huiju.estateagents.common.CommConstant;
7 7
 import com.huiju.estateagents.entity.TaPoster;
8
+import com.huiju.estateagents.entity.TaPosterUsed;
8 9
 import com.huiju.estateagents.mapper.TaPosterMapper;
10
+import com.huiju.estateagents.mapper.TaPosterUsedMapper;
9 11
 import com.huiju.estateagents.service.TaPosterService;
10 12
 import org.springframework.beans.factory.annotation.Autowired;
11 13
 import org.springframework.stereotype.Service;
12 14
 
15
+import java.util.ArrayList;
13 16
 import java.util.List;
14 17
 
15 18
 /**
@@ -26,6 +29,8 @@ public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> i
26 29
     @Autowired
27 30
     TaPosterMapper taPosterMapper;
28 31
 
32
+    @Autowired
33
+    private TaPosterUsedMapper taPosterUsedMapper;
29 34
 
30 35
     @Override
31 36
     public List<TaPoster> getPostersForTarget(String targetId, String targetType){
@@ -37,5 +42,34 @@ public class TaPosterServiceImpl extends ServiceImpl<TaPosterMapper, TaPoster> i
37 42
         return data;
38 43
 
39 44
     }
40
-
45
+    
46
+    /**
47
+     * 获取海报和已使用的海报模板
48
+     *
49
+     * @param targetId
50
+     * @param targetType
51
+     * @return
52
+     */
53
+    @Override
54
+    public TaPoster getUsedPostersForTarget(String targetId, String targetType) {
55
+        QueryWrapper<TaPoster>queryWrapper = new QueryWrapper<>();
56
+        queryWrapper.eq("target_id",targetId);
57
+        queryWrapper.eq("target_type",targetType);
58
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
59
+        TaPoster taPoster =taPosterMapper.selectOne(queryWrapper);
60
+        if (null != taPoster){
61
+            //获取使用的模板集合
62
+            QueryWrapper<TaPosterUsed> usedQueryWrapper = new QueryWrapper<>();
63
+            usedQueryWrapper.eq("poster_id",taPoster.getPosterId());
64
+            usedQueryWrapper.eq("org_id",taPoster.getOrgId());
65
+            List<TaPosterUsed> taPosterUsedList = taPosterUsedMapper.selectList(usedQueryWrapper);
66
+            List<Integer> checkedList = new ArrayList<>();
67
+            taPosterUsedList.forEach(e -> {
68
+                checkedList.add(e.getTemplateId());
69
+            });
70
+            taPoster.setTemplateIds(checkedList);
71
+        }
72
+        return taPoster;
73
+    }
74
+    
41 75
 }

+ 20
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPosterUsedServiceImpl.java Parādīt failu

@@ -0,0 +1,20 @@
1
+package com.huiju.estateagents.service.impl;
2
+
3
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4
+import com.huiju.estateagents.entity.TaPosterUsed;
5
+import com.huiju.estateagents.mapper.TaPosterUsedMapper;
6
+import com.huiju.estateagents.service.ITaPosterUsedService;
7
+import org.springframework.stereotype.Service;
8
+
9
+/**
10
+ * <p>
11
+ *  服务实现类
12
+ * </p>
13
+ *
14
+ * @author jobob
15
+ * @since 2019-10-28
16
+ */
17
+@Service
18
+public class TaPosterUsedServiceImpl extends ServiceImpl<TaPosterUsedMapper, TaPosterUsed> implements ITaPosterUsedService {
19
+
20
+}

+ 5
- 0
src/main/resources/mapper/TaPosterUsedMapper.xml Parādīt failu

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+<mapper namespace="com.huiju.estateagents.mapper.TaPosterUsedMapper">
4
+
5
+</mapper>