新增用戶

src/main/java/com/huiju/estateagents/controller/TaPersonFromRecordController.java

@@ -0,0 +1,190 @@
+package com.huiju.estateagents.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.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+    * 新增用户来源表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@RestController
+@RequestMapping("/")
+public class TaPersonFromRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPersonFromRecordController.class);
+
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taPersonFromRecord",method= RequestMethod.GET)
+    public ResponseBean taPersonFromRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaPersonFromRecord> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPersonFromRecord> result = iTaPersonFromRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPersonFromRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonFromRecord",method= RequestMethod.POST)
+    public ResponseBean taPersonFromRecordAdd(@RequestBody TaPersonFromRecord taPersonFromRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonFromRecordService.save(taPersonFromRecord)){
+                responseBean.addSuccess(taPersonFromRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPersonFromRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPersonFromRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPersonFromRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPersonFromRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonFromRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPersonFromRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPersonFromRecord taPersonFromRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonFromRecordService.updateById(taPersonFromRecord)){
+                responseBean.addSuccess(taPersonFromRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPersonFromRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taPersonFromRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPersonFromRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象--新增用户数据记录
+     *
+     * @return
+     */
+    @RequestMapping(value="/wx/taPersonFromRecord",method= RequestMethod.POST)
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonFromRecord taPersonFromRecord, HttpServletRequest request){
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(getOpenId(request));
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        taPersonFromRecord.setActivity(taPersonFromRecord.getPropertyName());
+        taPersonFromRecord.setOrgId(getOrgId(request));
+        taPersonFromRecord.setPersonId(person.getPersonId());
+        taPersonFromRecord.setCreateDate(LocalDateTime.now());
+        QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id",person.getOrgId());
+        queryWrapper.eq("person_id",person.getPersonId());
+        int count = iTaPersonFromRecordService.count(queryWrapper);
+        if(count > 0){
+            taPersonFromRecord.setIsFirstTime(false);
+        }else {
+            taPersonFromRecord.setIsFirstTime(true);
+        }
+        try {
+            if (iTaPersonFromRecordService.save(taPersonFromRecord)){
+                return ResponseBean.success(taPersonFromRecord);
+            }else {
+                return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }catch (Exception e){
+            logger.error("taPersonFromRecordAdd -=- {}",e.toString());
+            return ResponseBean.error("系统异常"+e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+}

src/main/java/com/huiju/estateagents/entity/TaPersonFromRecord.java

@@ -0,0 +1,96 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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 2020-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonFromRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新增用户来源id
+     */
+    @TableId(value = "from_record_id", type = IdType.AUTO)
+    private Integer fromRecordId;
+
+    /**
+     * 微信来源字典id
+     */
+    private String sceneId;
+
+    /**
+     * 新增用户id
+     */
+    private String personId;
+
+    /**
+     * 是否第一次
+     */
+    private Boolean isFirstTime;
+
+    /**
+     * 类型
+     */
+    private String targetType;
+
+    /**
+     * 类型ID值
+     */
+    private String targetId;
+
+    /**
+     * 分享人Id
+     */
+    private String sharePersonId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 事件
+     */
+    private String event;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 行为
+     */
+    private String activity;
+
+    @TableField(exist = false)
+    private String propertyName;
+}

src/main/java/com/huiju/estateagents/mapper/TaPersonFromRecordMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 新增用户来源表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@Mapper
+public interface TaPersonFromRecordMapper extends BaseMapper<TaPersonFromRecord> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaPersonFromRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+
+/**
+ * <p>
+ * 新增用户来源表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord> {
+
+}

src/main/java/com/huiju/estateagents/service/impl/TaPersonFromRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 新增用户来源表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@Service
+public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecordMapper, TaPersonFromRecord> implements ITaPersonFromRecordService {
+
+}

src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: estateagents
     password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_dev?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaPersonFromRecordMapper.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.mapper.TaPersonFromRecordMapper">
+
+</mapper>