Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -12,13 +12,7 @@ import com.huiju.estateagents.sample.service.ITaContactService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -122,7 +116,6 @@ public class TaContactController extends BaseController {
                 newContact.setStatus(CommConstant.STATUS_DELETE);
                 updateList.add(newContact);
             }
-
             responseBean.addSuccess(iTaContactService.updateBatchById(updateList));
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -6,10 +6,14 @@ 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.entity.SysAdvancedConfigRelation;
 import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.sample.entity.TaH5Demand;
 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.ITaH5DemandService;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import org.slf4j.Logger;
@@ -24,7 +28,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -46,6 +52,12 @@ public class TaH5SampleController extends BaseController {
     @Autowired
     public ITaSampleContactService iTaSampleContactService;
 
+    @Autowired
+    public ITaContactService taContactService;
+
+    @Autowired
+    public ITaH5DemandService iTaH5DemandService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -202,16 +214,30 @@ public class TaH5SampleController extends BaseController {
     @RequestMapping(value="/channel/h5Sample/list",method= RequestMethod.GET)
     public ResponseBean geth5SampleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                        String sampleName){
+                                        @RequestParam(value ="sampleName",required = false) String sampleName,
+                                        @RequestParam(value ="tag",required = false) String tag,
+                                        @RequestParam(value ="status",required = false) Integer status,
+                                        @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                        @RequestParam(value ="endCreateDate",required = false) String endCreateDate){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag),"tag",tag);
+            queryWrapper.eq(null != status,"demand_status",status);
+            queryWrapper.ge(!StringUtils.isEmpty(startCreateDate),"date_format(create_date,'%Y-%m-%d')",startCreateDate);
+            queryWrapper.le(!StringUtils.isEmpty(endCreateDate),"date_format(create_date,'%Y-%m-%d')",endCreateDate);
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no","create_date");
 
             IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            result.getRecords().forEach(e -> {
+                if (!StringUtils.isEmpty(e.getTag())){
+                    e.setTags(Arrays.asList(e.getTag().split(",")));
+                }
+            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -252,4 +278,107 @@ public class TaH5SampleController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 获取详情
+     * @param
+     * @return
+     */
+    @RequestMapping(value="/channel/get/h5Sample/{id}",method= RequestMethod.GET)
+    public ResponseBean getTaH5Sample(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("sample_id",taH5Sample.getSampleId());
+            List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
+            if (sampleContactList.size() > 0){
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id",sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
+                taH5Sample.setTaContactList(taContactList);
+            }
+            if (!StringUtils.isEmpty(taH5Sample.getTag())){
+                taH5Sample.setTags(Arrays.asList(taH5Sample.getTag().split(",")));
+            }
+            responseBean.addSuccess(taH5Sample);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+
+    /**
+     * 更新对象
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/update/h5Sample/{id}",method= RequestMethod.PUT)
+    public ResponseBean updateTaH5Sample(@PathVariable Integer id,@RequestBody TaH5Sample taH5Sample){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Sample.setSampleId(id);
+            List<String> tags = taH5Sample.getTags();
+            if (tags.size() > 0){
+                taH5Sample.setTag(String.join(",",tags));
+            }else{
+                taH5Sample.setTag("");
+            }
+            QueryWrapper<TaSampleContact> taSampleContactQueryWrapper = new QueryWrapper<>();
+            taSampleContactQueryWrapper.eq("sample_id",id);
+            iTaSampleContactService.remove(taSampleContactQueryWrapper);
+            if (iTaH5SampleService.updateById(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");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 删除sample
+     * @return
+     */
+    @RequestMapping(value="/channel/put/h5Sample/{id}",method= RequestMethod.PUT)
+    public ResponseBean putTaH5Sample(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //查看是否有关联的需求单
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sample_id",id);
+            queryWrapper.gt("demand_status",CommConstant.STATUS_DELETE);
+            List<TaH5Demand> list = iTaH5DemandService.list(queryWrapper);
+            if (list.size() > 0){
+                return ResponseBean.error("存在关联的需求单，删除失败！",ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
+            taH5Sample.setStatus(CommConstant.STATUS_DELETE);
+            if (iTaH5SampleService.updateById(taH5Sample)){
+                responseBean.addSuccess(taH5Sample);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,25 +1,17 @@
 package com.huiju.estateagents.sample.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.sample.entity.TaH5Sample;
 import com.huiju.estateagents.sample.entity.TaNotice;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaNoticeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -40,6 +32,9 @@ public class TaNoticeController extends BaseController {
     @Autowired
     public ITaNoticeService iTaNoticeService;
 
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
     /**
      * 条件查询通知列表
      *
@@ -49,7 +44,7 @@ public class TaNoticeController extends BaseController {
      * @param targetType
      * @param targetName
      * @param status
-     * @param type       类型
+     * @param type       类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/channel/listNoticeByCondition", method = RequestMethod.GET)
@@ -147,7 +142,18 @@ public class TaNoticeController extends BaseController {
     public ResponseBean taNoticeGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaNoticeService.getById(id));
+            TaNotice taNotice = iTaNoticeService.getById(id);
+            if (taNotice == null) {
+                responseBean.addError("fail");
+                return responseBean;
+            }
+            if (taNotice.getTargetId() != null) {
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
+                if(taH5Sample != null){
+                    taNotice.setTargetName(taH5Sample.getSampleName());
+                }
+            }
+            responseBean.addSuccess(taNotice);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taNoticeDelete -=- {}", e.toString());
@@ -161,13 +167,13 @@ public class TaNoticeController extends BaseController {
      *
      * @param pageNum
      * @param pageSize
-     * @param type       类型 目前默认 sample
+     * @param type     类型 目前默认 sample
      * @return
      */
     @RequestMapping(value = "/admin/listNoticeByCondition", method = RequestMethod.GET)
     public ResponseBean listNoticeByConditionForAdmin(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                              String type) {
+                                                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      String type) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaNoticeService.listNoticeByConditionForAdmin(pageNum, pageSize, type);

src/main/resources/mapper/sample/TaNoticeMapper.xml

@@ -34,10 +34,11 @@
         FROM
             ta_notice t
             LEFT JOIN ta_h5_sample t2 ON t.target_id = t2.sample_id
-        where
-            t.`status` == 1
-            AND t.invalid_time >= NOW( )
+        WHERE
+            t.`status` = 1
+            AND t.invalid_time >= NOW( )
         ORDER BY
-            t.order_no DESC,t.create_date DESC
+            t.order_no DESC,
+            t.create_date DESC
     </select>
 </mapper>