新需求

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.service.ITaContactService;
 import org.slf4j.Logger;
@@ -28,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2020-03-18
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaContactController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaContactController.class);
@@ -147,4 +149,39 @@ public class TaContactController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 联系人列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taContact",method= RequestMethod.GET)
+    public ResponseBean getContactList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @RequestParam(value ="contactName",required = false) String contactName,
+                                       @RequestParam(value ="telephone",required = false) String telephone,
+                                       @RequestParam(value ="phone",required = false) String phone,
+                                       @RequestParam(value ="job",required = false) String job){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaContact> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaContact> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(contactName),"contact_name",contactName);
+            queryWrapper.like(!StringUtils.isEmpty(telephone),"telephone",telephone);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.like(!StringUtils.isEmpty(job),"job",job);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("order_no","create_date");
+
+            IPage<TaContact> result = iTaContactService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContactList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -6,8 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+import com.huiju.estateagents.sample.service.ITaContactService;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -38,6 +43,8 @@ public class TaH5SampleController extends BaseController {
     @Autowired
     public ITaH5SampleService iTaH5SampleService;
 
+    @Autowired
+    public ITaSampleContactService iTaSampleContactService;
 
     /**
      * 分页查询列表
@@ -191,8 +198,16 @@ public class TaH5SampleController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<String> tags = taH5Sample.getTags();
-//            taH5Sample.setTag()
+            taH5Sample.setTag(String.join(",",tags));
+            taH5Sample.setCreateDate(LocalDateTime.now());
             if (iTaH5SampleService.save(taH5Sample)){
+                List<TaContact> taContactList = taH5Sample.getTaContactList();
+                taContactList.forEach(e -> {
+                    TaSampleContact taSampleContact = new TaSampleContact();
+                    taSampleContact.setContactId(e.getContactId());
+                    taSampleContact.setSampleId(taH5Sample.getSampleId());
+                    iTaSampleContactService.save(taSampleContact);
+                });
                 responseBean.addSuccess(taH5Sample);
             }else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

@@ -93,4 +93,10 @@ public class TaH5Sample implements Serializable {
      */
     @TableField(exist = false)
     private List<String> tags = new ArrayList<>();
+
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<TaContact> taContactList = new ArrayList<>();
 }