Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/controller/SmartVisitorController.java

@@ -4,12 +4,15 @@ package com.template.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.seewo.open.sdk.DefaultSeewoClient;
 import com.seewo.open.sdk.SeewoClient;
 import com.seewo.open.sdk.auth.Account;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartVisitorControllerAPI;
 import com.template.common.utils.*;
@@ -31,6 +34,7 @@ import com.template.model.vo.*;
 import com.template.services.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -453,7 +457,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult appointmentPageRecord(int currentPage, int pageCount, Integer userId, int type, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime) {
-        PageUtils<VisitorPageVo> result = smartVisitorService.smartVisitorPageByUserId(currentPage, pageCount, userId, type, createStartTime, createEndTime, keyWord, visitorStartTime, visitorEndTime);
+        PageUtils<VisitorPageListVo> result = smartVisitorService.smartVisitorPageByUserId(currentPage, pageCount, userId, type, createStartTime, createEndTime, keyWord, visitorStartTime, visitorEndTime);
 
         return CommonResult.ok(result);
     }
@@ -608,7 +612,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime) {
-        PageUtils<SmartVisitor> page = smartVisitorService.getPage(currentPage, pageCount, type, keyWord, status, startTime, endTime, visitorStartTime, visitorEndTime);
+        PageUtils<SmartVisitorVo> page = smartVisitorService.getPage(currentPage, pageCount, type, keyWord, status, startTime, endTime, visitorStartTime, visitorEndTime);
 
         return CommonResult.ok(page);
     }
@@ -943,7 +947,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult getScreenPage(int currentPage, int pageCount, String phone,String status) {
-        PageUtils<SmartVisitorScreenVo> page = smartVisitorService.getScreenPage(currentPage, pageCount,phone,status);
+        PageUtils<SmartVisitorScreenListVo> page = smartVisitorService.getScreenPage(currentPage, pageCount,phone,status);
 
         return CommonResult.ok(page);
     }

src/main/java/com/template/mapper/SmartVisitorMapper.java

@@ -27,7 +27,7 @@ public interface SmartVisitorMapper extends BaseMapper<SmartVisitor> {
 
     IPage<SmartVisitor> queryVisitorPageDatas(IPage<SmartVisitor> page, @Param("type") Integer type, @Param("studentIds") List<Integer> studentIds, @Param("isAdmin") String isAdmin);
 
-    IPage<VisitorPageVo> getPage(Page<SmartVisitor> page,@Param("type")Integer type,@Param("keyWord") String keyWord,@Param("status") Integer status,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("visitorStartTime") String visitorStartTime,@Param("visitorEndTime") String visitorEndTime);
+    IPage<SmartVisitor> getPage(Page<SmartVisitor> page,@Param("type")Integer type,@Param("keyWord") String keyWord,@Param("status") Integer status,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("visitorStartTime") String visitorStartTime,@Param("visitorEndTime") String visitorEndTime);
 
 
     IPage<SmartVisitorScreenVo> getScreenPage(Page<SmartVisitorScreenVo> page,@Param("phone") String phone,@Param("status")  String status);

src/main/java/com/template/model/vo/SmartVisitorScreenListVo.java

@@ -0,0 +1,32 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SmartVisitorScreenListVo {
+    private int id;
+
+    @ApiModelProperty(value = "访问事由")
+    private String visitReason;
+
+    @ApiModelProperty(value = "图片")
+    private List<String> image;
+
+    @ApiModelProperty(value = "来访时间")
+    private Date visitorTime;
+
+    @ApiModelProperty(value = "学生姓名")
+    private String studentName;
+
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+    @ApiModelProperty(value = "学号")
+    private String cardNo;
+
+    private int statu;
+}

src/main/java/com/template/model/vo/SmartVisitorVo.java

@@ -0,0 +1,98 @@
+package com.template.model.vo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SmartVisitorVo {
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "访客姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "访客手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "访客证件号")
+    private String userNumber;
+
+    @ApiModelProperty(value = "同行人数")
+    private Integer peerNum;
+
+    /**
+     * 家长预约 去掉车牌号字段
+     */
+    @ApiModelProperty(value = "车牌号")
+    private String carNum;
+
+    @ApiModelProperty(value = "访问事由")
+    private String visitReason;
+
+    @ApiModelProperty(value = "状态 待审核：1  已拒绝：2  已推送：3")
+    private Integer statu;
+
+    @ApiModelProperty(value = "来访时间")
+    private Date visitorTime;
+
+    /**
+     * 来访截止时间
+     * 家长预约的话 来访时间+4小时
+     * 其他访客时间 当天23:59:59秒结束
+     */
+    @ApiModelProperty(value = "来访截止时间")
+    private Date visitorDeadline;
+
+    @ApiModelProperty(value = "受访者ID")
+    private Integer respondent;
+
+    @ApiModelProperty(value = "受访者编号")
+    private String responcode;
+
+    @ApiModelProperty(value = "部门ID")
+    private Integer departmentId;
+
+    @ApiModelProperty(value = "受访者电话")
+    private String respondentPhone;
+
+    @ApiModelProperty(value = "受访者姓名")
+    private String respondentName;
+
+    @ApiModelProperty(value = "百胜同步授权编码")
+    private String visitorsync;
+
+    /**
+     * 设备编号
+     * 多个设备用逗号隔开
+     */
+    @ApiModelProperty(value = "设备编号")
+    private String deviceNum;
+
+    /**
+     * 访客类型
+     * 家长：1
+     * 其他：2
+     */
+    @ApiModelProperty(value = "访客类型")
+    private Integer visitorType;
+
+    @ApiModelProperty(value = "百胜预约订单号")
+    private String bsOrderNo;
+
+    @ApiModelProperty(value = "访客验证码")
+    private String visitorCode;
+
+    @ApiModelProperty(value = "图片")
+    private List<String> image;
+
+
+}

src/main/java/com/template/model/vo/VisitorPageListVo.java

@@ -0,0 +1,122 @@
+package com.template.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.template.model.enumModel.eApproveStatu;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class VisitorPageListVo {
+    /**
+     * 数据ID
+     */
+    private Integer id;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 访客姓名
+     */
+    private String userName;
+
+    /**
+     * 访客手机号
+     */
+    private String userPhone;
+
+    /**
+     * 访客证件号
+     */
+    private String userNumber;
+
+    /**
+     * 同行人数
+     */
+    private Integer peerNum;
+
+    /**
+     * 车牌号
+     */
+    private String carNum;
+
+    /**
+     * 访问事由
+     */
+    private String visitReason;
+
+    /**
+     * 数据状态
+     */
+    @JsonIgnore
+    private Integer statu;
+
+    /**
+     * 状态
+     * 待审核：1
+     * 已拒绝：2
+     * 已推送：3
+     */
+    private String statuStr;
+
+    public String getStatuStr() {
+        return eApproveStatu.stringOf(statu);
+    }
+
+    public void setStatuStr(String statuStr) {
+        this.statuStr = statuStr;
+    }
+
+    /**
+     * 来访时间
+     */
+    private Date visitorTime;
+
+    /**
+     * 来访截止时间
+     */
+    private Date visitorDeadline;
+
+    /**
+     * 受访者ID
+     */
+    private Integer respondent;
+
+    /**
+     * 受访者编号
+     */
+    private String responcode;
+
+    /**
+     * 部门ID
+     */
+    private Integer departmentId;
+
+    /**
+     * 受访者电话
+     */
+    private String respondentPhone;
+
+    /**
+     * 受访者姓名
+     */
+    private String respondentName;
+
+    /**
+     * 访客类型
+     * 家长：1
+     * 其他：2
+     */
+    private Integer visitorType;
+
+    /**
+     * 提交时间
+     */
+    private Date createTime;
+
+    private List<String> image;
+}

src/main/java/com/template/model/vo/VisitorPageVo.java

@@ -123,4 +123,6 @@ public class VisitorPageVo {
      */
     private Date createTime;
 
+    private String image;
+
 }

src/main/java/com/template/services/SmartVisitorService.java

@@ -4,8 +4,7 @@ import com.template.model.pojo.SmartVisitor;
 import com.template.model.pojo.SmartVisitor;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.SmartVisitorScreenVo;
-import com.template.model.vo.VisitorPageVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,7 +30,7 @@ public interface SmartVisitorService extends IService<SmartVisitor> {
 
     boolean insertVisitorBatch(List<SmartVisitor> visitors);
 
-    PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime);
+    PageUtils<VisitorPageListVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime);
 
     Integer queryVisitorCount(String cardNo, String startTime, String endTime);
 
@@ -41,7 +40,7 @@ public interface SmartVisitorService extends IService<SmartVisitor> {
 
     SmartVisitor queryParentVisitor(Integer userId);
 
-    PageUtils<SmartVisitor> getPage(int currentPage, int pageCount,Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime);
+    PageUtils<SmartVisitorVo> getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime);
 
-    PageUtils<SmartVisitorScreenVo> getScreenPage(int currentPage, int pageCount, String phone, String status);
+    PageUtils<SmartVisitorScreenListVo> getScreenPage(int currentPage, int pageCount, String phone, String status);
 }

src/main/java/com/template/services/impl/SmartVisitorServiceImpl.java

@@ -2,6 +2,7 @@ package com.template.services.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.common.utils.TimeExchange;
 import com.template.mapper.SmartVisitorMapper;
@@ -9,14 +10,15 @@ import com.template.model.pojo.SmartVisitor;
 import com.template.model.pojo.SmartVisitor;
 import com.template.mapper.SmartVisitorMapper;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.SmartVisitorScreenVo;
-import com.template.model.vo.VisitorPageVo;
+import com.template.model.vo.*;
 import com.template.services.SmartVisitorService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -73,12 +75,36 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
     }
 
     @Override
-    public PageUtils<VisitorPageVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime) {
+    public PageUtils<VisitorPageListVo> smartVisitorPageByUserId(int currentPage, int pageCount, Integer userId, Integer statu, String createStartTime, String createEndTime, String keyWord, String visitorStartTime, String visitorEndTime) {
         Page<VisitorPageVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
         IPage<VisitorPageVo> datas = smartVisitorMapper.queryVisitorPage(page, userId, statu, createStartTime, createEndTime, keyWord, visitorStartTime, visitorEndTime);
-        return new PageUtils(datas);
+
+        List<VisitorPageVo> list = datas.getRecords();
+        ArrayList<VisitorPageListVo> smartVisitorVos = new ArrayList<>();
+        for (VisitorPageVo smartVisitor : list) {
+            VisitorPageListVo smartVisitorVo = new VisitorPageListVo();
+            BeanUtils.copyProperties(smartVisitor,smartVisitorVo);
+            String image = smartVisitor.getImage();
+            if (ObjectUtils.isNotEmpty(image)) {
+                String[] split = image.split(",");
+                ArrayList<String> strings = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i];
+                    strings.add(s);
+                }
+                smartVisitorVo.setImage(strings);
+            }
+            smartVisitorVos.add(smartVisitorVo);
+        }
+
+        IPage<VisitorPageListVo> voIPage=new Page<>();
+        BeanUtils.copyProperties(datas ,voIPage);
+        voIPage.setRecords(smartVisitorVos);
+
+
+        return new PageUtils(voIPage);
     }
 
     @Override
@@ -120,20 +146,67 @@ public class SmartVisitorServiceImpl extends ServiceImpl<SmartVisitorMapper, Sma
     }
 
     @Override
-    public PageUtils<SmartVisitor> getPage(int currentPage, int pageCount,Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime) {
+    public PageUtils<SmartVisitorVo> getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime) {
         Page<SmartVisitor> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<VisitorPageVo> datas = smartVisitorMapper.getPage(page,type,keyWord,status,startTime,endTime,visitorStartTime,visitorEndTime);
-        return new PageUtils(datas);
+        IPage<SmartVisitor> datas = smartVisitorMapper.getPage(page,type,keyWord,status,startTime,endTime,visitorStartTime,visitorEndTime);
+
+        List<SmartVisitor> list = datas.getRecords();
+        ArrayList<SmartVisitorVo> smartVisitorVos = new ArrayList<>();
+        for (SmartVisitor smartVisitor : list) {
+            SmartVisitorVo smartVisitorVo = new SmartVisitorVo();
+            BeanUtils.copyProperties(smartVisitor,smartVisitorVo);
+            String image = smartVisitor.getImage();
+            if (ObjectUtils.isNotEmpty(image)) {
+                String[] split = image.split(",");
+                ArrayList<String> strings = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i];
+                    strings.add(s);
+                }
+                smartVisitorVo.setImage(strings);
+            }
+            smartVisitorVos.add(smartVisitorVo);
+        }
+
+        IPage<SmartVisitorVo> voIPage=new Page<>();
+        BeanUtils.copyProperties(datas ,voIPage);
+        voIPage.setRecords(smartVisitorVos);
+
+        return new PageUtils(voIPage);
     }
 
     @Override
-    public PageUtils<SmartVisitorScreenVo> getScreenPage(int currentPage, int pageCount, String phone, String status) {
+    public PageUtils<SmartVisitorScreenListVo> getScreenPage(int currentPage, int pageCount, String phone, String status) {
         Page<SmartVisitorScreenVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
         IPage<SmartVisitorScreenVo> datas = smartVisitorMapper.getScreenPage(page,phone,status);
-        return new PageUtils(datas);
+
+        List<SmartVisitorScreenVo> list = datas.getRecords();
+        ArrayList<SmartVisitorScreenListVo> smartVisitorVos = new ArrayList<>();
+        for (SmartVisitorScreenVo smartVisitor : list) {
+            SmartVisitorScreenListVo smartVisitorVo = new SmartVisitorScreenListVo();
+            BeanUtils.copyProperties(smartVisitor,smartVisitorVo);
+            String image = smartVisitor.getImage();
+            if (ObjectUtils.isNotEmpty(image)) {
+                String[] split = image.split(",");
+                ArrayList<String> strings = new ArrayList<>();
+                for (int i = 0; i < split.length; i++) {
+                    String s = split[i];
+                    strings.add(s);
+                }
+                smartVisitorVo.setImage(strings);
+            }
+            smartVisitorVos.add(smartVisitorVo);
+        }
+
+        IPage<SmartVisitorScreenListVo> voIPage=new Page<>();
+        BeanUtils.copyProperties(datas ,voIPage);
+        voIPage.setRecords(smartVisitorVos);
+
+
+        return new PageUtils(voIPage);
     }
 }

src/main/resources/mapper/template/SmartVisitorMapper.xml

@@ -25,7 +25,7 @@
     <select id="queryVisitorPage" resultType="com.template.model.vo.VisitorPageVo" resultMap="visitorPageMap">
         select
         sv.id,sv.user_id,sv.user_name,sv.user_phone,sv.user_number,sv.peer_num,sv.car_num,sv.visit_reason,sv.statu,sv.visitor_time,sv.visitor_deadline,sv.respondent,
-        sv.responcode,sv.department_id,sv.respondent_phone,sv.respondent_name,sv.visitor_type,sv.create_time from
+        sv.responcode,sv.department_id,sv.respondent_phone,sv.respondent_name,sv.visitor_type,sv.create_time,sv.image from
         smart_visitor sv
         inner join smart_user su on su.deleted = 0 and sv.user_id = su.id
         where sv.deleted = 0
@@ -111,7 +111,7 @@
         order by create_time desc
     </select>
 
-    <select id="getPage" resultType="com.template.model.vo.VisitorPageVo">
+    <select id="getPage" resultType="com.template.model.pojo.SmartVisitor">
         SELECT
             sv.*
         FROM