Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -715,4 +715,9 @@ public class CommConstant {
      * 线下缴费
      */
     public static final String PAY_TYPE_ONLINE = "onLine";
+
+    /**
+     * 作废状态
+     */
+    public static final Integer DEMAND_STATUS_INVALID = 4;
 }

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

@@ -1,12 +1,17 @@
 package com.huiju.estateagents.sample.controller;
 
+import com.alibaba.fastjson.JSONArray;
+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.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import com.huiju.estateagents.sample.service.ITaH5DemandService;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +24,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -151,4 +160,118 @@ public class TaH5DemandController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 获取h5需求清单
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand",method= RequestMethod.GET)
+    public ResponseBean getH5DemandList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @RequestParam(value ="sampleName",required = false) String sampleName,
+                                        @RequestParam(value ="orgName",required = false) String orgName,
+                                        @RequestParam(value ="orderer",required = false) String orderer,
+                                        @RequestParam(value ="phone",required = false) String phone,
+                                        @RequestParam(value ="demandStatus",required = false) Integer demandStatus,
+                                        @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                        @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Demand> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(orgName),"org_name",orgName);
+            queryWrapper.like(!StringUtils.isEmpty(orderer),"orderer",orderer);
+            queryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
+            queryWrapper.eq(null != demandStatus,"demand_status",demandStatus);
+            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("demand_status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaH5Demand> result = iTaH5DemandService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 批量删除需求单
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/batch",method= RequestMethod.PUT)
+    public ResponseBean batchUpdateH5DemandList(@RequestBody String ids,
+                                        HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            int successNum = 0;
+            int failNum = 0;
+            JSONArray jsonArray = JSONObject.parseObject(ids).getJSONArray("ids");
+            for (Object id : jsonArray) {
+                TaH5Demand h5Demand = iTaH5DemandService.getById((Integer) id);
+                if (CommConstant.DEMAND_STATUS_INVALID.equals(h5Demand.getDemandStatus())){
+                    h5Demand.setDemandStatus(CommConstant.STATUS_DELETE);
+                    iTaH5DemandService.updateById(h5Demand);
+                    successNum++;
+                }else{
+                    failNum++;
+                }
+            }
+            Map<String,Object> map = new HashMap<>();
+            map.put("successNum",successNum);
+            map.put("failNum",failNum);
+            responseBean.addSuccess(map);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5DemandList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 获取需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/{id}",method= RequestMethod.GET)
+    public ResponseBean getH5Demand(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaH5DemandService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 更新需求单详情
+     * @return
+     */
+    @RequestMapping(value="/channel/taH5Demand/update/{id}",method= RequestMethod.PUT)
+    public ResponseBean updateH5Demand(@PathVariable Integer id,@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taH5Demand.setDemandId(id);
+            taH5Demand.setUpdateDate(LocalDateTime.now());
+            responseBean.addSuccess(iTaH5DemandService.updateById(taH5Demand));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getH5Demand -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
     * 样例表  前端控制器
@@ -151,4 +153,57 @@ public class TaH5SampleController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @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){
+        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.orderByDesc("order_no","create_date");
+
+            IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taH5Sample 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/h5Sample/add",method= RequestMethod.POST)
+    public ResponseBean AddTaH5Sample(@RequestBody TaH5Sample taH5Sample){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<String> tags = taH5Sample.getTags();
+//            taH5Sample.setTag()
+            if (iTaH5SampleService.save(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/entity/TaH5Sample.java

@@ -1,9 +1,13 @@
 package com.huiju.estateagents.sample.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -79,5 +83,14 @@ public class TaH5Sample implements Serializable {
      */
     private String sampleContent;
 
+    /**
+     * 样例链接
+     */
+    private String sampleContentLink;
 
+    /**
+     * 标签集合
+     */
+    @TableField(exist = false)
+    private List<String> tags = new ArrayList<>();
 }