Browse Source

新需求

傅行帆 5 years ago
parent
commit
5977b1cf50

+ 38
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java View File

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
9
+import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.sample.entity.TaContact;
10
 import com.huiju.estateagents.sample.entity.TaContact;
9
 import com.huiju.estateagents.sample.service.ITaContactService;
11
 import com.huiju.estateagents.sample.service.ITaContactService;
10
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
28
  * @since 2020-03-18
30
  * @since 2020-03-18
29
  */
31
  */
30
 @RestController
32
 @RestController
31
-@RequestMapping("/")
33
+@RequestMapping("/api")
32
 public class TaContactController extends BaseController {
34
 public class TaContactController extends BaseController {
33
 
35
 
34
     private final Logger logger = LoggerFactory.getLogger(TaContactController.class);
36
     private final Logger logger = LoggerFactory.getLogger(TaContactController.class);
147
         }
149
         }
148
         return responseBean;
150
         return responseBean;
149
     }
151
     }
152
+
153
+    /**
154
+     * 联系人列表
155
+     * @param pageNum
156
+     * @param pageSize
157
+     * @return
158
+     */
159
+    @RequestMapping(value="/channel/taContact",method= RequestMethod.GET)
160
+    public ResponseBean getContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
161
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
162
+                                       @RequestParam(value ="contactName",required = false) String contactName,
163
+                                       @RequestParam(value ="telephone",required = false) String telephone,
164
+                                       @RequestParam(value ="phone",required = false) String phone,
165
+                                       @RequestParam(value ="job",required = false) String job){
166
+        ResponseBean responseBean = new ResponseBean();
167
+        try {
168
+            //使用分页插件
169
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
170
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
171
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name",contactName);
172
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone",telephone);
173
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
174
+            queryWrapper.like(!StringUtils.isEmpty(job),"job",job);
175
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
176
+            queryWrapper.orderByDesc("order_no","create_date");
177
+
178
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
179
+            responseBean.addSuccess(result);
180
+        }catch (Exception e){
181
+            e.printStackTrace();
182
+            logger.error("taContactList -=- {}",e.toString());
183
+            responseBean.addError(e.getMessage());
184
+        }
185
+        return responseBean;
186
+    }
150
 }
187
 }

+ 16
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java View File

6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.common.StringUtils;
9
+import com.huiju.estateagents.sample.entity.TaContact;
9
 import com.huiju.estateagents.sample.entity.TaH5Sample;
10
 import com.huiju.estateagents.sample.entity.TaH5Sample;
11
+import com.huiju.estateagents.sample.entity.TaSampleContact;
12
+import com.huiju.estateagents.sample.service.ITaContactService;
10
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
13
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
14
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
11
 import org.slf4j.Logger;
15
 import org.slf4j.Logger;
12
 import org.slf4j.LoggerFactory;
16
 import org.slf4j.LoggerFactory;
13
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.web.bind.annotation.ResponseBody;
23
 import org.springframework.web.bind.annotation.ResponseBody;
20
 import org.springframework.web.bind.annotation.RestController;
24
 import org.springframework.web.bind.annotation.RestController;
21
 
25
 
26
+import java.time.LocalDateTime;
22
 import java.util.List;
27
 import java.util.List;
23
 
28
 
24
 /**
29
 /**
38
     @Autowired
43
     @Autowired
39
     public ITaH5SampleService iTaH5SampleService;
44
     public ITaH5SampleService iTaH5SampleService;
40
 
45
 
46
+    @Autowired
47
+    public ITaSampleContactService iTaSampleContactService;
41
 
48
 
42
     /**
49
     /**
43
      * 分页查询列表
50
      * 分页查询列表
191
         ResponseBean responseBean = new ResponseBean();
198
         ResponseBean responseBean = new ResponseBean();
192
         try {
199
         try {
193
             List<String> tags = taH5Sample.getTags();
200
             List<String> tags = taH5Sample.getTags();
194
-//            taH5Sample.setTag()
201
+            taH5Sample.setTag(String.join(",",tags));
202
+            taH5Sample.setCreateDate(LocalDateTime.now());
195
             if (iTaH5SampleService.save(taH5Sample)){
203
             if (iTaH5SampleService.save(taH5Sample)){
204
+                List<TaContact> taContactList = taH5Sample.getTaContactList();
205
+                taContactList.forEach(e -> {
206
+                    TaSampleContact taSampleContact = new TaSampleContact();
207
+                    taSampleContact.setContactId(e.getContactId());
208
+                    taSampleContact.setSampleId(taH5Sample.getSampleId());
209
+                    iTaSampleContactService.save(taSampleContact);
210
+                });
196
                 responseBean.addSuccess(taH5Sample);
211
                 responseBean.addSuccess(taH5Sample);
197
             }else {
212
             }else {
198
                 responseBean.addError("fail");
213
                 responseBean.addError("fail");

+ 6
- 0
src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java View File

93
      */
93
      */
94
     @TableField(exist = false)
94
     @TableField(exist = false)
95
     private List<String> tags = new ArrayList<>();
95
     private List<String> tags = new ArrayList<>();
96
+
97
+    /**
98
+     * 标签集合
99
+     */
100
+    @TableField(exist = false)
101
+    private List<TaContact> taContactList = new ArrayList<>();
96
 }
102
 }