合并

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

@@ -7,11 +7,15 @@ 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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 /**
  * <p>
     *  前端控制器
@@ -111,25 +115,20 @@ public class TaFirstUsherRecordController extends BaseController {
 
     /**
      * 根据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 {
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "plateNumber", value = "车牌"),
+            @ApiImplicitParam(paramType = "query", dataType ="String", name = "visiteDate", value = "来访时间")})
+    public ResponseBean list(@RequestParam(defaultValue = "1") int pageNumber,
+                             @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "plateNumber",required = false) String plateNumber,
+                             @RequestParam(value = "visiteDate",required = false) String visiteDate){
+            ResponseBean responseBean = new ResponseBean();
             IPage<TaFirstUsherRecord> pg = new Page<>(pageNumber, pageSize);
-            QueryWrapper<TaFirstUsherRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.page(pg, queryWrapper);
+            IPage<TaFirstUsherRecord> result = iTaFirstUsherRecordService.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
             responseBean.addSuccess(result);
-        }catch (Exception e){
-            logger.error("taFirstUsherRecordList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
+            return responseBean;
     }
+
 }

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

@@ -8,10 +8,15 @@ 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.model.TaVisitorAppointment;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
 import com.huiju.welcome.utils.DateUtils;
 import com.huiju.welcome.utils.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -123,4 +128,21 @@ public class TaVisitorAppointmentController extends BaseController {
             return ResponseBean.error("更新数据失败", HttpStatus.SC_INTERNAL_SERVER_ERROR);
         }
     }
+    @ApiOperation(value = "访客预约信息",httpMethod = "访客预约信息")
+    @RequestMapping(value="/visitorAppointmentList",method= RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "platNumber", value = "车牌"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "personName", value = "预约人姓名"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "预约人电话")})
+    public ResponseBean visitorAppointmentList(@RequestParam(defaultValue = "1") int pageNumber,
+                             @RequestParam(defaultValue = "10") int pageSize,
+                             @RequestParam(value = "platNumber",required = false) String platNumber,
+                             @RequestParam(value = "personName",required = false) String personName,
+                             @RequestParam(value = "phone",required = false) String phone){
+
+        IPage<TaVisitorAppointment> pg = new Page<>(pageNumber, pageSize);
+        ResponseBean result = taVisitorAppointmentService.visitorAppointmentList(pg,platNumber,personName,phone);
+        return result;
+    }
+
 }

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

@@ -1,8 +1,12 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -15,4 +19,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaFirstUsherRecordMapper extends BaseMapper<TaFirstUsherRecord> {
 
+    /**
+     * 分页查询安保记录
+     * @param pg
+     * @param plateNumber
+     * @param visiteDate
+     * @return
+     */
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg, @Param("plateNumber") String plateNumber, @Param("visiteDate")String visiteDate);
 }

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

@@ -1,10 +1,21 @@
 package com.huiju.welcome.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 @Mapper
 public interface TaVisitorAppointmentMapper extends BaseMapper<TaVisitorAppointment> {
+    /**
+     * 查询当前访客预约信息
+     * @param pg
+     * @param platNumber
+     * @return
+     */
+    IPage<TaVisitorAppointment> visitorAppointmentList(IPage pg, @Param("platNumber") String platNumber, @Param("personName")String personName, @Param("phone")String phone);
 }

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

@@ -33,6 +33,16 @@ public class TaFirstUsherRecord implements Serializable {
 
     private Integer personNum;
 
+    private String color;
+
+    private String channel;
+
+    private String purpose;
+
+    private String personName;
+
+    private String carImage;
+
     private Boolean appointment;
 
     private LocalDateTime visiteDate;

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

@@ -1,8 +1,11 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.welcome.model.TaFirstUsherRecord;
 
+import java.util.Date;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +15,10 @@ import com.huiju.welcome.model.TaFirstUsherRecord;
  * @since 2019-06-04
  */
 public interface ITaFirstUsherRecordService extends IService<TaFirstUsherRecord> {
+    /**
+     * 查询安保记录
+     * @return
+     */
+    IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage<TaFirstUsherRecord> pg,String plateNumber, String visiteDate);
 
 }

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

@@ -1,6 +1,8 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.model.TaVisitorAppointment;
 
 /**
@@ -13,4 +15,11 @@ import com.huiju.welcome.model.TaVisitorAppointment;
  */
 public interface ITaVisitorAppointmentService extends IService<TaVisitorAppointment> {
 
+    /**
+     *访客预约信息
+     * @param pg
+     * @param platNumber
+     * @return
+     */
+    ResponseBean visitorAppointmentList(IPage<TaVisitorAppointment> pg, String platNumber,String personName,String phone);
 }

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

@@ -1,11 +1,16 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +22,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaFirstUsherRecordServiceImpl extends ServiceImpl<TaFirstUsherRecordMapper, TaFirstUsherRecord> implements ITaFirstUsherRecordService {
 
+    @Autowired
+    private TaFirstUsherRecordMapper taFirstUsherRecordMapper;
+    @Override
+    public IPage<TaFirstUsherRecord> taFirstUsherRecordlist(IPage pg,String plateNumber, String visiteDate) {
+        IPage<TaFirstUsherRecord> pageTaFirstUsherRecord= taFirstUsherRecordMapper.taFirstUsherRecordlist(pg,plateNumber,visiteDate);
+        return pageTaFirstUsherRecord;
+    }
 }

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

@@ -1,11 +1,20 @@
 package com.huiju.welcome.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaVisitorAppointmentMapper;
 import com.huiju.welcome.model.TaVisitorAppointment;
 import com.huiju.welcome.service.ITaVisitorAppointmentService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +26,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaVisitorAppointmentServiceImpl extends ServiceImpl<TaVisitorAppointmentMapper, TaVisitorAppointment> implements ITaVisitorAppointmentService {
 
+    @Autowired
+    private TaVisitorAppointmentMapper taVisitorAppointmentMapper;
+    @Override
+    public ResponseBean visitorAppointmentList(IPage pg, String platNumber, String personName,String phone) {
+       ResponseBean responseBean= new ResponseBean();
+        IPage<TaVisitorAppointment> list= taVisitorAppointmentMapper.visitorAppointmentList(pg,platNumber,personName,phone);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaFirstUsherRecordMapper.xml

@@ -0,0 +1,16 @@
+<?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.TaFirstUsherRecordMapper">
+<select id="taFirstUsherRecordlist" resultType="com.huiju.welcome.model.TaFirstUsherRecord">
+    select * from ta_first_usher_record
+    <where>
+        <if test="visiteDate != null and visiteDate!= ''">
+            date_format(visite_date, '%Y-%m-%d') <![CDATA[= ]]> date_format(#{visiteDate}, '%Y-%m-%d')
+        </if>
+        <if test="plateNumber != null and plateNumber!= ''">
+            plate_number LIKE CONCAT('%',#{plateNumber},'%')
+        </if>
+    </where>
+    ORDER BY visite_date desc
+</select>
+</mapper>

src/main/resources/mapper/TaVisitorAppointmentMapper.xml

@@ -1,5 +1,20 @@
 <?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">
+    <select id="visitorAppointmentList" resultType="com.huiju.welcome.model.TaVisitorAppointment">
+        select * from ta_visitor_appointment
+        <where>
+            <if test="personName !=null and personName !=''">
+                person_name LIKE CONCAT('%',#{personName},'%')
+            </if>
+            <if test="phone !=null and phone !=''">
+                phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+            <if test="platNumber !=null and platNumber !=''">
+                plat_number LIKE CONCAT('%',#{platNumber},'%')
+            </if>
+        </where>
+        order by create_date desc
+    </select>
 
 </mapper>