合并

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -0,0 +1,154 @@
+package com.huiju.estateagents.drainage.controller;
+
+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.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
+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 javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 引流项目  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaDrainageController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDrainageController.class);
+
+    @Autowired
+    public ITaDrainageService iTaDrainageService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage",method= RequestMethod.GET)
+    public ResponseBean taDrainageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDrainage> result = iTaDrainageService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taDrainage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage/add",method= RequestMethod.POST)
+    public ResponseBean taDrainageAdd(@RequestBody TaDrainage taDrainage,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taDrainage.setOrgId(getOrgId(request));
+            if (iTaDrainageService.save(taDrainage)){
+                responseBean.addSuccess(taDrainage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taDrainageDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDrainageService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taDrainage 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainage/{id}",method= RequestMethod.PUT)
+    public ResponseBean taDrainageUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDrainage taDrainage){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taDrainage.setDrainageId(id);
+            if (iTaDrainageService.updateById(taDrainage)){
+                responseBean.addSuccess(taDrainage);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taDrainage/{id}",method= RequestMethod.GET)
+    public ResponseBean taDrainageGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDrainageService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageRecordController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.drainage.controller;
+
+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.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+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 javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 引流记录表 全网引流记录表 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@RestController
+@RequestMapping("/api")
+public class TaDrainageRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaDrainageRecordController.class);
+
+    @Autowired
+    public ITaDrainageRecordService iTaDrainageRecordService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taDrainageRecord",method= RequestMethod.GET)
+    public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "drainageId") Integer drainageId,
+                                             @RequestParam(value = "startTime") String startTime,
+                                             @RequestParam(value = "endTime") String endTime,
+                                             HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaDrainageRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("drainage_id",drainageId);
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
+            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taDrainageRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taDrainageRecord",method= RequestMethod.POST)
+    public ResponseBean taDrainageRecordAdd(@RequestBody TaDrainageRecord taDrainageRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDrainageRecordService.save(taDrainageRecord)){
+                responseBean.addSuccess(taDrainageRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taDrainageRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taDrainageRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaDrainageRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taDrainageRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taDrainageRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taDrainageRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaDrainageRecord taDrainageRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaDrainageRecordService.updateById(taDrainageRecord)){
+                responseBean.addSuccess(taDrainageRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taDrainageRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taDrainageRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaDrainageRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taDrainageRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.drainage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 引流项目 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaDrainage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "drainage_id", type = IdType.AUTO)
+    private Integer drainageId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 截止时间
+     */
+    private LocalDateTime endDate;
+
+    /**
+     * 参与数
+     */
+    private Integer enlistNum;
+
+
+}

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainageRecord.java

@@ -0,0 +1,71 @@
+package com.huiju.estateagents.drainage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_drainage_record")
+public class TaDrainageRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "drainage_record_id", type = IdType.AUTO)
+    private Integer drainageRecordId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 引流项目Id
+     */
+    private String drainageId;
+
+    /**
+     * 记录内容 json字符串
+     */
+    private String content;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 姓名
+     */
+    private String userName;
+
+
+}

src/main/java/com/huiju/estateagents/drainage/mapper/TaDrainageMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.drainage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 引流项目  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaDrainageMapper extends BaseMapper<TaDrainage> {
+
+}

src/main/java/com/huiju/estateagents/drainage/mapper/TaDrainageRecordMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.drainage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Mapper
+public interface TaDrainageRecordMapper extends BaseMapper<TaDrainageRecord> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/ITaDrainageRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.drainage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+public interface ITaDrainageRecordService extends IService<TaDrainageRecord> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/ITaDrainageService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.drainage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+
+/**
+ * <p>
+ * 引流项目  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+public interface ITaDrainageService extends IService<TaDrainage> {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.drainage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.mapper.TaDrainageRecordMapper;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 引流记录表 全网引流记录表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaDrainageRecordServiceImpl extends ServiceImpl<TaDrainageRecordMapper, TaDrainageRecord> implements ITaDrainageRecordService {
+
+}

src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.drainage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 引流项目  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-18
+ */
+@Service
+public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrainage> implements ITaDrainageService {
+
+}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -36,7 +36,7 @@
     <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT * FROM ta_building
         <where>
-            status =1
+            1 =1
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>

src/main/resources/mapper/TaDrainageMapper.xml

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

src/main/resources/mapper/TaDrainageRecordMapper.xml

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