feats

.idea/libraries/Maven__io_jsonwebtoken_jjwt_api_0_10_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.jsonwebtoken:jjwt-api:0.10.5">
+    <CLASSES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-api/0.10.5/jjwt-api-0.10.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-api/0.10.5/jjwt-api-0.10.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-api/0.10.5/jjwt-api-0.10.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__io_jsonwebtoken_jjwt_impl_0_10_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.jsonwebtoken:jjwt-impl:0.10.5">
+    <CLASSES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-impl/0.10.5/jjwt-impl-0.10.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-impl/0.10.5/jjwt-impl-0.10.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-impl/0.10.5/jjwt-impl-0.10.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__io_jsonwebtoken_jjwt_jackson_0_10_5.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.5">
+    <CLASSES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-jackson/0.10.5/jjwt-jackson-0.10.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-jackson/0.10.5/jjwt-jackson-0.10.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://D:/REPO/io/jsonwebtoken/jjwt-jackson/0.10.5/jjwt-jackson-0.10.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/service.iml

@@ -44,8 +44,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-websocket:2.1.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
@@ -120,5 +118,10 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt-api:0.10.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-impl:0.10.5" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.jsonwebtoken:jjwt-jackson:0.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
   </component>
 </module>

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju.welcome</groupId>
 	<artifactId>mainbiz</artifactId>
-	<version>v3.1.0</version>
+	<version>v4.0.0</version>
 	<name>mainbiz</name>
 	<description>com.huiju.welcome main service</description>
 
@@ -75,6 +75,23 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.7.0</version>
 		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.10.5</version>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.10.5</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId>
+			<version>0.10.5</version>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/com.huiju.welcome/common/base/ResponseBean.java

@@ -9,9 +9,6 @@ public class ResponseBean<T> implements Serializable {
 
     private static final long serialVersionUID = 3593827217136880822L;
 
-    public static final String CODE_SUCCESS =  "0";
-    public static final String CODE_FAIL =  "1";
-
     private int code = 200;
 
     private String message = "成功";
@@ -56,6 +53,34 @@ public class ResponseBean<T> implements Serializable {
         return this.message;
     }
 
+    public static <T> ResponseBean success(T data, String ...msgs) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.code = 200;
+        responseBean.data = data;
+
+        if (null != msgs && msgs.length > 0) {
+            responseBean.message = msgs[0];
+        }
+
+        return responseBean;
+    }
+
+    public static <T> ResponseBean error(String msg, int code, T ...datas) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean.code = code;
+        responseBean.message = msg;
+
+        if (null != datas && datas.length > 0) {
+            responseBean.data = datas[0];
+        }
+
+        return responseBean;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
     @Override
     public String toString() {
         return  "{ code: "+code+", message: "+message+", data: <T> }";

src/main/java/com.huiju.welcome/controller/TaFirstUsherRecordController.java

@@ -0,0 +1,135 @@
+package com.huiju.welcome.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.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.service.ITaFirstUsherRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@RestController
+@RequestMapping("/")
+public class TaFirstUsherRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaFirstUsherRecordController.class);
+
+    @Autowired
+    public ITaFirstUsherRecordService iTaFirstUsherRecordService;
+
+
+    /**
+     * 保存对象
+     * @param taFirstUsherRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/firstUsherRecord",method= RequestMethod.POST)
+    public ResponseBean save(@RequestBody TaFirstUsherRecord taFirstUsherRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaFirstUsherRecordService.save(taFirstUsherRecord)){
+                responseBean.addSuccess(taFirstUsherRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/firstUsherRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean delete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaFirstUsherRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taFirstUsherRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/firstUsherRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean update(@RequestBody TaFirstUsherRecord taFirstUsherRecord, @PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaFirstUsherRecordService.updateById(taFirstUsherRecord)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/firstUsherRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean get(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaFirstUsherRecordService.getById(id));
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordGetByID -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/firstUsherRecord",method= RequestMethod.GET)
+    public ResponseBean list(
+        @RequestParam(defaultValue = "1") int pageNumber,
+        @RequestParam(defaultValue = "10") int pageSize
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taFirstUsherRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

@@ -0,0 +1,134 @@
+package com.huiju.welcome.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.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ITaMainUsherRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@RestController
+@RequestMapping("/")
+public class TaMainUsherRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaMainUsherRecordController.class);
+
+    @Autowired
+    public ITaMainUsherRecordService iTaMainUsherRecordService;
+
+
+    /**
+     * 保存对象
+     * @param taMainUsherRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/mainUsherRecord",method= RequestMethod.POST)
+    public ResponseBean save(@RequestBody TaMainUsherRecord taMainUsherRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMainUsherRecordService.save(taMainUsherRecord)){
+                responseBean.addSuccess(taMainUsherRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taMainUsherRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/mainUsherRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean delete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaMainUsherRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taMainUsherRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taMainUsherRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/mainUsherRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean update(@RequestBody TaMainUsherRecord taMainUsherRecord, @PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaMainUsherRecordService.updateById(taMainUsherRecord)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taMainUsherRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/mainUsherRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean get(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaMainUsherRecordService.getById(id));
+        }catch (Exception e){
+            logger.error("taMainUsherRecordGetByID -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value="/mainUsherRecord",method= RequestMethod.GET)
+    public ResponseBean list(
+        @RequestParam(defaultValue = "1") int pageNumber,
+        @RequestParam(defaultValue = "10") int pageSize
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaMainUsherRecord> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaMainUsherRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaMainUsherRecord> result = iTaMainUsherRecordService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taMainUsherRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com.huiju.welcome/controller/TaPersonController.java

@@ -5,10 +5,7 @@ import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaPerson;
 import com.huiju.welcome.model.TaVisitingLog;
-import com.huiju.welcome.service.ICameraService;
-import com.huiju.welcome.service.ITaDeviceService;
-import com.huiju.welcome.service.ITaPersonService;
-import com.huiju.welcome.service.ITaVisitingLogService;
+import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.StatusUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -224,4 +221,5 @@ public class TaPersonController extends BaseController {
         responseBean.addSuccess(person);
         return responseBean;
     }
+
 }

src/main/java/com.huiju.welcome/controller/TaVisitorAppointmentController.java

@@ -0,0 +1,126 @@
+package com.huiju.welcome.controller;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.service.ITaVisitorAppointmentService;
+import com.huiju.welcome.utils.DateUtils;
+import com.huiju.welcome.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@RestController
+@RequestMapping("/")
+public class TaVisitorAppointmentController extends BaseController {
+    @Autowired
+    ITaVisitorAppointmentService taVisitorAppointmentService;
+
+    @GetMapping("/appointment")
+    public ResponseBean list(
+            @RequestParam(defaultValue = "1") Integer page,
+            @RequestParam(defaultValue = "10") Integer size,
+            String name,
+            String phone,
+            String platNumber
+    ) {
+        IPage<TaVisitorAppointment> pg = new Page<>(page, size);
+        QueryWrapper<TaVisitorAppointment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "person_name", name);
+        queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
+        queryWrapper.like(!StringUtils.isEmpty(platNumber), "plat_number", platNumber);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaVisitorAppointment> result = taVisitorAppointmentService.page(pg, queryWrapper);
+
+        ResponseBean resp = new ResponseBean();
+        resp.addSuccess(result);
+        return resp;
+    }
+
+    @GetMapping("/appointment/{id}")
+    public ResponseBean getByID(@PathVariable Integer id) {
+        TaVisitorAppointment taVisitorAppointment = taVisitorAppointmentService.getById(id);
+        return ResponseBean.success(taVisitorAppointment);
+    }
+
+    @PostMapping("/appointment")
+    public ResponseBean save(@RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("请设置保存内容", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        TaVisitorAppointment taVisitorAppointment = new TaVisitorAppointment();
+        taVisitorAppointment.setPersonId(params.getInteger("personId"));
+        taVisitorAppointment.setPersonName(params.getString("personName"));
+        taVisitorAppointment.setPhone(params.getString("phone"));
+        taVisitorAppointment.setPersonNum(params.getInteger("personNum"));
+        taVisitorAppointment.setCarNum(params.getInteger("carNum"));
+        taVisitorAppointment.setCarModel(params.getString("carModel"));
+        taVisitorAppointment.setPlatNumber(params.getString("platNumber"));
+//        taVisitorAppointment.setStatus(params.getInteger("status"));
+
+        Date dt = params.getDate("visitDate");
+        if (null != dt) {
+            taVisitorAppointment.setVisitDate(DateUtils.date2LocalDateTime(dt));
+        }
+
+        taVisitorAppointment.setCreateDate(LocalDateTime.now());
+        boolean success = taVisitorAppointmentService.save(taVisitorAppointment);
+        if (success) {
+            return ResponseBean.success(taVisitorAppointment);
+        } else {
+            return ResponseBean.error("保存数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    @PutMapping("/appointment/{id}")
+    public ResponseBean update(@PathVariable Integer id, @RequestBody String paramStr) {
+        if (StringUtils.isEmpty(paramStr)) {
+            return ResponseBean.error("请设置保存内容", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        UpdateWrapper<TaVisitorAppointment> wrapper = new UpdateWrapper<>();
+        wrapper.eq("appointment_id", id);
+        wrapper.set("person_id", params.getInteger("personId"));
+        wrapper.set("person_name", params.getString("personName"));
+        wrapper.set("phone", params.getString("phone"));
+        wrapper.set("visit_date", params.getString("visitDate"));
+        wrapper.set("person_num", params.getInteger("personNum"));
+        wrapper.set("car_num", params.getInteger("carNum"));
+        wrapper.set("car_model", params.getString("carModel"));
+        wrapper.set("plat_number", params.getString("platNumber"));
+        wrapper.set("status", params.getInteger("status"));
+
+        Date dt = params.getDate("visitDate");
+        if (null != dt) {
+            wrapper.set("visit_date", DateUtils.date2LocalDateTime(dt));
+        }
+
+        boolean success = taVisitorAppointmentService.update(new TaVisitorAppointment(), wrapper);
+        if (success) {
+            return ResponseBean.success(null);
+        } else {
+            return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+}

src/main/java/com.huiju.welcome/controller/TaWechatUserController.java

@@ -0,0 +1,204 @@
+package com.huiju.welcome.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.welcome.common.base.BaseController;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.model.TaWechatUser;
+import com.huiju.welcome.service.ITaPersonService;
+import com.huiju.welcome.service.ITaWechatUserService;
+import com.huiju.welcome.utils.JWTUtils;
+import com.huiju.welcome.utils.MiniApp;
+import com.huiju.welcome.utils.StatusUtils;
+import org.apache.http.HttpStatus;
+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.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@RestController
+@RequestMapping("/miniapp")
+public class TaWechatUserController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaWechatUserController.class);
+
+    @Autowired
+    private ITaWechatUserService iTaWechatUserService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
+    @GetMapping("/login")
+    public ResponseBean login(@RequestParam String code) {
+        MiniApp miniApp = new MiniApp();
+        ResponseBean resp = miniApp.getOpenid(code);
+        if (resp.getCode() != 200) {
+            return resp;
+        }
+
+        JSONObject data = (JSONObject) resp.getData();
+        String openid = data.getString("openid");
+        String sessionKey = data.getString("session_key");
+        String unionId = data.getString("unionid");
+        String appid = miniApp.getAppid();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("openid", openid);
+        map.put("sessionKey", sessionKey);
+        map.put("unionId", unionId);
+        map.put("appid", appid);
+
+        // 如果已经存在的用户, 直接返回
+        TaWechatUser taWechatUser = iTaWechatUserService.getByOpenid(openid, appid);
+        if (null != taWechatUser) {
+            map.put("user", taWechatUser);
+            map.put("token", JWTUtils.newToken(taWechatUser.getUserId() + ""));
+            return ResponseBean.success(map);
+        }
+
+        // 否则新增用户数据
+        TaWechatUser newUser = new TaWechatUser();
+        newUser.setAppid(appid);
+        newUser.setClientType("miniapp");
+        newUser.setOpenid(openid);
+        newUser.setUnionId(unionId);
+        newUser.setStatus(StatusUtils.Normal);
+        newUser.setCreateDate(LocalDateTime.now());
+
+        boolean success = iTaWechatUserService.save(newUser);
+        if (!success) {
+            ResponseBean.error("预存用户信息失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        map.put("user", newUser);
+        map.put("token", JWTUtils.newToken(newUser.getUserId() + ""));
+        return ResponseBean.success(map);
+    }
+
+    @PostMapping("/bind")
+    public ResponseBean bind(@RequestBody String paramStr, HttpServletRequest request) {
+        String userId = JWTUtils.getSubject(request);
+        TaWechatUser taWechatUser = iTaWechatUserService.getById(Integer.valueOf(userId));
+
+        if (null == taWechatUser) {
+            ResponseBean.error("数据异常, 请清空缓存后重新操作", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        if (null != taWechatUser.getPersonId()) {
+            ResponseBean.error("不支持人员重复绑定", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        String phone = params.getString("phone");
+        String captcha = params.getString("captcha");
+
+        if (null == phone || "".equals(phone.trim()) || null == captcha || "".equals(captcha.trim())) {
+            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        // todo
+        // 先简单验证
+        if (!"1234".equals(captcha)) {
+            ResponseBean.error("绑定参数为空或者非法", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        TaPerson taPerson = iTaPersonService.getByPhone(phone);
+        if (null == taPerson) {
+            ResponseBean.error("该手机号对应人员不存在", HttpStatus.SC_BAD_REQUEST);
+        }
+
+        taWechatUser.setPersonId(taPerson.getRealId());
+        boolean success = iTaWechatUserService.updateById(taWechatUser);
+
+        if (!success) {
+            ResponseBean.error("人员绑定失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        return ResponseBean.success(taWechatUser);
+    }
+
+    /**
+     * 修改对象
+     * @param taWechatUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/user/{id}",method= RequestMethod.PUT)
+    public ResponseBean update(@RequestBody TaWechatUser taWechatUser, @PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaWechatUserService.updateById(taWechatUser)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            logger.error("taWechatUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/user/{id}",method= RequestMethod.GET)
+    public ResponseBean get(@PathVariable Integer id, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (id.intValue() == 0) {
+                String userId = JWTUtils.getSubject(request);
+                responseBean.addSuccess(iTaWechatUserService.getById(Integer.valueOf(userId)));
+            } else {
+                responseBean.addSuccess(iTaWechatUserService.getById(id));
+            }
+        }catch (Exception e){
+            logger.error("taWechatUserGetByID -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询
+     */
+    @RequestMapping(value="/user",method= RequestMethod.GET)
+    public ResponseBean list(
+        @RequestParam(defaultValue = "1") int pageNumber,
+        @RequestParam(defaultValue = "10") int pageSize
+    ){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            IPage<TaWechatUser> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TaWechatUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaWechatUser> result = iTaWechatUserService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taWechatUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com.huiju.welcome/interceptor/AccessInterceptor.java

@@ -1,6 +1,11 @@
 package com.huiju.welcome.interceptor;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.utils.JWTUtils;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
 import org.apache.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
@@ -29,7 +34,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/stranger",
             "/screen",
             "/camera",
-            "/websocket"
+            "/websocket",
+            "/miniapp/login"
     };
 
     /*
@@ -60,6 +66,53 @@ public class AccessInterceptor implements HandlerInterceptor {
             return true;
         }
 
+        return isWechat(request) ? checkJWT(request, response, obj) : checkSession(request, response, obj);
+    }
+
+    private boolean checkJWT(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+
+        // 消息头必须包含 authorization 字段
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader)) {
+            ResponseBean resp = ResponseBean.error("请先进行系统登录操作", HttpStatus.SC_UNAUTHORIZED);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) {
+            ResponseBean resp = ResponseBean.error("权限验证非法, 数据格式不正确", HttpStatus.SC_UNAUTHORIZED);
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        try {
+            // 只尝试去解析
+            Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
+        } catch (ExpiredJwtException e) {
+            ResponseBean resp = ResponseBean.error("权限验证非法, Token 已过期", HttpStatus.SC_UNAUTHORIZED);
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+
+        } catch (JwtException e) {
+            ResponseBean resp = ResponseBean.error("权限验证非法, " + e.getMessage(), HttpStatus.SC_UNAUTHORIZED);
+
+
+            response.addHeader("Content-type", "application/json");
+            response.getOutputStream().write(JSONObject.toJSONBytes(resp));
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean checkSession(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
+
         HttpSession httpSession = request.getSession();
         String token = (String) httpSession.getAttribute("token");
 
@@ -72,10 +125,14 @@ public class AccessInterceptor implements HandlerInterceptor {
             response.getOutputStream().write(JSONObject.toJSONBytes(error));
             return false;
         }
-
         return true;
     }
 
+    private boolean isWechat(HttpServletRequest request) {
+        String ua = request.getHeader("user-agent");
+        return ua.contains("micromessenger") || ua.contains("MicroMessenger");
+    }
+
     private boolean inWhiteList(HttpServletRequest request) {
         String requestURI = request.getRequestURI();
 

src/main/java/com.huiju.welcome/mapper/TaFirstUsherRecordMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@Mapper
+public interface TaFirstUsherRecordMapper extends BaseMapper<TaFirstUsherRecord> {
+
+}

src/main/java/com.huiju.welcome/mapper/TaMainUsherRecordMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaMainUsherRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@Mapper
+public interface TaMainUsherRecordMapper extends BaseMapper<TaMainUsherRecord> {
+
+}

src/main/java/com.huiju.welcome/mapper/TaOperationLogMapper.java

@@ -0,0 +1,9 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaOperationLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaOperationLogMapper extends BaseMapper<TaOperationLog> {
+}

src/main/java/com.huiju.welcome/mapper/TaVisitorAppointmentMapper.java

@@ -0,0 +1,10 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaVisitorAppointment;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface TaVisitorAppointmentMapper extends BaseMapper<TaVisitorAppointment> {
+}

src/main/java/com.huiju.welcome/mapper/TaWechatUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.TaWechatUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@Mapper
+public interface TaWechatUserMapper extends BaseMapper<TaWechatUser> {
+
+}

src/main/java/com.huiju.welcome/model/TaFirstUsherRecord.java

@@ -0,0 +1,51 @@
+package com.huiju.welcome.model;
+
+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-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaFirstUsherRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "rec_id", type = IdType.AUTO)
+    private Integer recId;
+
+    private String plateNumber;
+
+    private String carModel;
+
+    private Integer personNum;
+
+    private Boolean appointment;
+
+    private LocalDateTime visiteDate;
+
+    private Integer status;
+
+    private String plateNumber2;
+
+    private String carModel2;
+
+    private String plateNumber3;
+
+    private String carModel3;
+
+
+}

src/main/java/com.huiju.welcome/model/TaMainUsherRecord.java

@@ -0,0 +1,53 @@
+package com.huiju.welcome.model;
+
+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-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaMainUsherRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "rec_id", type = IdType.AUTO)
+    private Integer recId;
+
+    private Integer visitorId;
+
+    private String visitorName;
+
+    private String visitorPhone;
+
+    private Integer personNum;
+
+    private Integer consultantId;
+
+    private String realtyConsultant;
+
+    private Boolean appointment;
+
+    private LocalDateTime visiteDate;
+
+    private Integer status;
+
+    private String carModel;
+
+    private String plateNumber;
+
+
+}

src/main/java/com.huiju.welcome/model/TaOperationLog.java

@@ -0,0 +1,33 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOperationLog {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "log_id", type = IdType.AUTO)
+    Integer logId;
+
+    LocalDateTime createDate;
+
+    String source;
+
+    String entity;
+
+    String srcId;
+
+    String optType;
+
+    String content;
+
+    String operator;
+}

src/main/java/com.huiju.welcome/model/TaVisitorAppointment.java

@@ -0,0 +1,41 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaVisitorAppointment {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "appointment_id", type = IdType.AUTO)
+    Integer appointmentId;
+
+    Integer personId;
+
+    String personName;
+
+    String phone;
+
+    LocalDateTime visitDate;
+
+    Integer personNum;
+
+    Integer carNum;
+
+    String carModel;
+
+    String platNumber;
+
+    Integer status;
+
+    LocalDateTime createDate;
+
+    String remark;
+}

src/main/java/com.huiju.welcome/model/TaWechatUser.java

@@ -0,0 +1,50 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaWechatUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    private Integer personId;
+
+    private String nickName;
+
+    private String avatarUrl;
+
+    private String gender;
+
+    private String openid;
+
+    private String appid;
+
+    private String unionId;
+
+    private String clientType;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com.huiju.welcome/service/ITaFirstUsherRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord> {
+
+}

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaMainUsherRecord;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+public interface ITaMainUsherRecordService extends IService<TaMainUsherRecord> {
+
+}

src/main/java/com.huiju.welcome/service/ITaOperationLogService.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaOperationLog;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+public interface ITaOperationLogService extends IService<TaOperationLog> {
+
+    int create(String operator, String source, String optType, String entity, String srcId, String content);
+
+}

src/main/java/com.huiju.welcome/service/ITaPersonService.java

@@ -40,4 +40,10 @@ public interface ITaPersonService extends IService<TaPerson> {
             String beginDate,
             String endDate
     );
+
+    void logNew(String opertaor, TaPerson taPerson);
+
+    void logEdit(String opertaor, TaPerson from, TaPerson to);
+
+    TaPerson getByPhone(String phone);
 }

src/main/java/com.huiju.welcome/service/ITaVisitorAppointmentService.java

@@ -0,0 +1,16 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaVisitorAppointment;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointment> {
+
+}

src/main/java/com.huiju.welcome/service/ITaWechatUserService.java

@@ -0,0 +1,17 @@
+package com.huiju.welcome.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.model.TaWechatUser;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+public interface ITaWechatUserService extends IService<TaWechatUser> {
+
+    TaWechatUser getByOpenid(String openid, String appid);
+}

src/main/java/com.huiju.welcome/service/impl/TaFirstUsherRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaFirstUsherRecordMapper;
+import com.huiju.welcome.model.TaFirstUsherRecord;
+import com.huiju.welcome.service.ITaFirstUsherRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@Service
+public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecordMapper, TaFirstUsherRecord> implements ITaFirstUsherRecordService {
+
+}

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaMainUsherRecordMapper;
+import com.huiju.welcome.model.TaMainUsherRecord;
+import com.huiju.welcome.service.ITaMainUsherRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-04
+ */
+@Service
+public class TaMainUsherRecordServiceImpl extends ServiceImpl<TaMainUsherRecordMapper, TaMainUsherRecord> implements ITaMainUsherRecordService {
+
+}

src/main/java/com.huiju.welcome/service/impl/TaOperationLogServiceImpl.java

@@ -0,0 +1,42 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaOperationLogMapper;
+import com.huiju.welcome.model.TaOperationLog;
+import com.huiju.welcome.service.ITaOperationLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Service
+public class TaOperationLogServiceImpl extends ServiceImpl<TaOperationLogMapper, TaOperationLog> implements ITaOperationLogService {
+    @Autowired
+    TaOperationLogMapper taOperationLogMapper;
+
+    @Override
+    public int create(String operator, String source, String optType, String entity, String srcId, String content) {
+        if (null == content || "".equals(content.trim())) return 0;
+
+        if (null == optType || "".equals(optType.trim())) optType = "新增";
+
+        TaOperationLog taOperationLog = new TaOperationLog();
+        taOperationLog.setContent(content);
+        taOperationLog.setCreateDate(LocalDateTime.now());
+        taOperationLog.setEntity(entity);
+        taOperationLog.setOperator(operator);
+        taOperationLog.setSource(source);
+        taOperationLog.setSrcId(srcId);
+        taOperationLog.setOptType(optType);
+
+        return taOperationLogMapper.insert(taOperationLog);
+    }
+}

src/main/java/com.huiju.welcome/service/impl/TaPersonServiceImpl.java

@@ -8,11 +8,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.mapper.TaDeviceMapper;
 import com.huiju.welcome.mapper.TaPersonMapper;
+import com.huiju.welcome.mapper.TaPersonTypeMapper;
 import com.huiju.welcome.model.TaDevice;
 import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.model.TaPersonType;
 import com.huiju.welcome.model.TaVisitingLog;
+import com.huiju.welcome.service.ITaOperationLogService;
 import com.huiju.welcome.service.ITaPersonService;
 import com.huiju.welcome.service.ITaVisitingLogService;
+import com.huiju.welcome.utils.LogBuilder;
 import com.huiju.welcome.utils.StatusUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,11 +52,17 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Autowired
     private TaPersonMapper taPersonMapper;
 
+    @Autowired
+    private TaPersonTypeMapper taPersonTypeMapper;
+
     @Autowired
     private ITaVisitingLogService taVisitingLogService;
     
     @Autowired
     private TaDeviceMapper taDeviceMapper;
+
+    @Autowired
+    private ITaOperationLogService taOperationLogService;
     
     @Value("${huiju.files}")
     private String huijuFiles;
@@ -182,4 +192,71 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public IPage<TaPerson> getRealPersonList(Page<TaPerson> page, Integer personId, Integer typeId, String name, String phone, String beginDate, String endDate) {
         return taPersonMapper.getRealPersonList(page, personId, typeId, name, phone, beginDate, endDate);
     }
+
+    @Override
+    public void logNew(String opertaor, TaPerson taPerson) {
+        String source = "人员信息";
+        String optType = "新增";
+        String entity = taPerson.getName();
+
+        LogBuilder logBuilder = new LogBuilder();
+        logBuilder.append("姓名", taPerson.getName());
+        logBuilder.append("类型", getTypeName(taPerson));
+        logBuilder.append("性别", getSex(taPerson));
+        logBuilder.append("头像", taPerson.getAvatar());
+        logBuilder.append("手机", taPerson.getPhone());
+        logBuilder.append("邮箱", taPerson.getEmail());
+        logBuilder.append("备注", taPerson.getRemark());
+        logBuilder.append("欢迎词", taPerson.getWords());
+
+        String content = logBuilder.build();
+        taOperationLogService.create(opertaor, source, optType, entity, String.valueOf(taPerson.getPersonId()), content);
+    }
+
+    @Override
+    public void logEdit(String opertaor, TaPerson from, TaPerson to) {
+        String source = "人员信息";
+        String optType = "编辑";
+        String entity = from.getName();
+
+        LogBuilder logBuilder = new LogBuilder();
+        logBuilder.append("姓名", from.getName(), to.getName());
+        logBuilder.append("类型", getTypeName(from), getTypeName(to));
+        logBuilder.append("性别", getSex(from), getSex(to));
+        logBuilder.append("头像", from.getAvatar(), to.getAvatar());
+        logBuilder.append("手机", from.getPhone(), to.getPhone());
+        logBuilder.append("邮箱", from.getEmail(), to.getEmail());
+        logBuilder.append("备注", from.getRemark(), to.getRemark());
+        logBuilder.append("欢迎词", from.getWords(), to.getWords());
+
+        String content = logBuilder.build();
+        taOperationLogService.create(opertaor, source, optType, entity, String.valueOf(from.getPersonId()), content);
+    }
+
+    @Override
+    public TaPerson getByPhone(String phone) {
+        QueryWrapper<TaPerson> wrapper = new QueryWrapper<>();
+        wrapper.eq("phone", phone);
+        wrapper.eq("status", StatusUtils.Normal);
+        wrapper.last("limit 1");
+
+        return taPersonMapper.selectOne(wrapper);
+    }
+
+    private String getTypeName(TaPerson taPerson) {
+        TaPersonType taPersonType = taPersonTypeMapper.selectById(taPerson.getTypeId());
+        return null == taPersonType ? null : taPersonType.getTypeName();
+    }
+
+    private String getSex(TaPerson taPerson) {
+        if (null == taPerson.getSex()) return null;
+
+        Map<String, String> dict = new HashMap<>();
+        dict.put("1", "男");
+        dict.put("1", "女");
+        dict.put("9", "未知");
+
+        String sex = dict.get(taPerson.getSex());
+        return null == sex ? taPerson.getSex() : sex;
+    }
 }

src/main/java/com.huiju.welcome/service/impl/TaVisitorAppointmentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
+import com.huiju.welcome.model.TaVisitorAppointment;
+import com.huiju.welcome.service.ITaVisitorAppointmentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-12
+ */
+@Service
+public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppointmentMapper, TaVisitorAppointment> implements ITaVisitorAppointmentService {
+
+}

src/main/java/com.huiju.welcome/service/impl/TaWechatUserServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huiju.welcome.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.mapper.TaWechatUserMapper;
+import com.huiju.welcome.model.TaWechatUser;
+import com.huiju.welcome.service.ITaWechatUserService;
+import com.huiju.welcome.utils.StatusUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-06-11
+ */
+@Service
+public class TaWechatUserServiceImpl extends ServiceImpl<TaWechatUserMapper, TaWechatUser> implements ITaWechatUserService {
+    @Autowired
+    TaWechatUserMapper taWechatUserMapper;
+
+    @Override
+    public TaWechatUser getByOpenid(String openid, String appid) {
+        QueryWrapper<TaWechatUser> wrapper = new QueryWrapper<>();
+        wrapper.eq("openid", openid);
+        wrapper.eq("appid", appid);
+        wrapper.eq("status", StatusUtils.Normal);
+        wrapper.last("limit 1");
+
+        return taWechatUserMapper.selectOne(wrapper);
+    }
+}

src/main/java/com.huiju.welcome/utils/DateUtils.java

@@ -0,0 +1,30 @@
+package com.huiju.welcome.utils;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+public class DateUtils {
+    public static LocalDateTime date2LocalDateTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zone = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zone);
+    }
+
+    public static boolean sameDay(LocalDateTime d1, LocalDateTime d2) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        return d1.format(formatter).equals(d2.format(formatter));
+    }
+
+    public static String cutSecond(LocalDateTime dt) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        return dt.format(formatter);
+    }
+
+    public static LocalDateTime day2LocalDateime(String day) {
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(day + " 00:00:00",df);
+    }
+}

src/main/java/com.huiju.welcome/utils/JWTUtils.java

@@ -0,0 +1,55 @@
+package com.huiju.welcome.utils;
+
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Key;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * JWTUtils
+ * jwt 辅助类
+ * https://github.com/jwtk/jjwt
+ */
+public class JWTUtils {
+    // 直接定义常量是不安全的
+    // 注意, 不能修改值定义，否则已经生成的 token 会不可用
+    public final static Key key = Keys.hmacShaKeyFor("yansenisahero,2019-6-5 16:18:14".getBytes());
+
+    /**
+     * getSubject 获取 jwt subject
+     * @param request
+     * @return
+     */
+    public static String getSubject(HttpServletRequest request) {
+        String jwtHeader = request.getHeader("authorization");
+        if (null == jwtHeader || "".equals(jwtHeader.trim())) return null;
+
+        String[] jwtAuths = jwtHeader.split("Bearer ");
+        if (null == jwtAuths || jwtAuths.length < 2) return null;
+
+        try {
+            return Jwts.parser().setSigningKey(key).parseClaimsJws(jwtAuths[1]).getBody().getSubject();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * newToken 生成新的 token
+     * @param subject
+     * @return
+     */
+    public static String newToken(String subject) {
+        // 有效期 7 天
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.get(Calendar.DAY_OF_MONTH)+7);
+
+        return Jwts.builder().setSubject(subject).setExpiration(calendar.getTime()).signWith(key).compact();
+    }
+}

src/main/java/com.huiju.welcome/utils/LogBuilder.java

@@ -0,0 +1,38 @@
+package com.huiju.welcome.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LogBuilder {
+    private List<String> content = new ArrayList<>();
+
+    public LogBuilder append(String name, String value) {
+        if (null == value || "".equals(value.trim())) return this;
+        content.add(String.format("【%s】 %s ", name, value));
+        return this;
+    }
+
+    public LogBuilder append(String ctt) {
+        if (null == ctt || "".equals(ctt.trim())) return this;
+        content.add(ctt);
+        return this;
+    }
+
+    public LogBuilder append(String name, String before, String after) {
+        if ((null == before || "".equals(before.trim())) && (null == after || "".equals(after.trim()))) return this;
+
+        if (null == before) before = "null";
+        if (null == after) after = "null";
+
+        if (before.equals(after)) return this;
+
+        content.add(String.format("【%s】 修改前 %s, 修改后 %s", name, before, after));
+        return this;
+    }
+
+    public String build() {
+        String result = String.join(" ; ", content);
+        content.clear();
+        return result;
+    }
+}

src/main/java/com.huiju.welcome/utils/MiniApp.java

@@ -0,0 +1,79 @@
+package com.huiju.welcome.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.welcome.common.base.ResponseBean;
+import lombok.Data;
+import org.apache.http.HttpStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@ConfigurationProperties(prefix = "file")
+public class MiniApp {
+    private Logger log = LoggerFactory.getLogger(MiniApp.class);
+
+    @Value("${miniapp.api}")
+    private String url;
+
+    @Value("${miniapp.appid}")
+    private String appid;
+
+    @Value("${miniapp.sercret}")
+    private String sercret;
+
+    public String getAppid() {
+        return this.appid;
+    }
+
+    public ResponseBean getOpenid(String code) {
+        String api = url + "/" + appid + "/login?code=" + code;
+        RestTemplate restTemplate = new RestTemplate();
+        String resp = restTemplate.exchange(api,HttpMethod.resolve("GET"), new HttpEntity<String>(null, null),String.class).getBody();
+
+        JSONObject result = JSONObject.parseObject(resp);
+        Integer respCode = result.getInteger("code");
+        if (null == respCode || respCode.intValue() != 0) {
+            log.error("请求小程序服务接口失败, 请求地址 " + api);
+            log.error("请求结果: " + resp);
+            return ResponseBean.error("调用小程序接口失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        return ResponseBean.success(result.getJSONObject("data"));
+    }
+
+    public ResponseBean sendTPLMessage(String tplId, String formId, String toUser, String page, List<Object> data) {
+        String api = String.format("/api/%s/tpl/%s/form/%s/to/%s", appid, tplId, formId, toUser);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        Map<String, Object> sendData = new HashMap<String, Object>();
+        sendData.put("page", page);
+        sendData.put("data", data);
+
+        RestTemplate restTemplate = new RestTemplate();
+        HttpEntity<Map<String, Object>> request = new HttpEntity<Map<String, Object>>(sendData, headers);
+        String resp = restTemplate.postForEntity(url, request, String.class).getBody();
+
+        JSONObject result = JSONObject.parseObject(resp);
+        Integer respCode = result.getInteger("code");
+        if (null == respCode || respCode.intValue() != 0) {
+            log.error("请求小程序服务接口失败, 请求地址 " + api);
+            log.error("请求结果: " + resp);
+            return ResponseBean.error("调用小程序接口失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
+        }
+
+        return ResponseBean.success("");
+    }
+}

src/main/java/com.huiju.welcome/utils/StringUtils.java

@@ -0,0 +1,36 @@
+package com.huiju.welcome.utils;
+
+import java.util.Random;
+
+public class StringUtils {
+    public static boolean isEmpty(String str) {
+        return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
+    }
+
+    public static String trim(String src, String ...st) {
+        if (null == src) return src;
+        if (null == st || st.length == 0) return src.trim();
+
+        String start = st[0];
+        if (!src.startsWith(start)) {
+            return src;
+        }
+
+        return src.substring(start.length());
+    }
+
+    public static String ifNull(String src, String defaultVal) {
+        return null == src || "".equals(src) ? defaultVal : src;
+    }
+
+    public static String random(int length) {
+        String str="abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Random random = new Random();
+        StringBuffer sb = new StringBuffer();
+        for(int i=0;i<length;i++){
+            int number=random.nextInt(62);
+            sb.append(str.charAt(number));
+        }
+        return sb.toString();
+    }
+}

src/main/resources/application.yml

@@ -38,4 +38,10 @@ saweather:
   need3HourForcast: 0
   needAlarm: 0
   needHourData: 0
-  needMoreDay: 0
+  needMoreDay: 0
+
+# 小程序服务
+miniapp:
+  api: http://127.0.0.1:8088/api/miniapp
+  appid: wx3f26e5f48c72d39f
+  secret: 03fcb0228ada1dd27ba45fb5a64c6f52

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

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

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