diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java index fbd7d70..e3c7430 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -11,4 +13,5 @@ public class VisitorApplyStatusRequest { private Long id; private String status; + private String ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java index fbd7d70..e3c7430 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -11,4 +13,5 @@ public class VisitorApplyStatusRequest { private Long id; private String status; + private String ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java index 7db3083..16df306 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -26,32 +26,34 @@ public class VisitorApply { @TableId private Long id; - @ExcelProperty("访客姓名") + @ExcelProperty(value = "访客姓名",order = 1) private String visitorName; - @ExcelProperty("申请单号") + @ExcelProperty(value = "访客申请单号",order = 0) private String applyNo; - @ExcelProperty("申请者工号") + @ExcelProperty(value = "申请者工号",order = 8) private String staffCode; - @ExcelProperty("申请者姓名") + @ExcelProperty(value = "申请者姓名",order = 9) private String staffName; - @ExcelProperty("访客身份证") + @ExcelProperty(value = "访客身份证",order = 2) private String visitorIdCard; - @ExcelProperty("访客联系方式") + @ExcelProperty(value = "访客联系方式",order = 3) private String visitorPhone; - @ExcelProperty("访问目的") + @ExcelProperty(value = "访问目的",order = 4) private String visitReason; - @ExcelProperty("访问区域") + @ExcelProperty(value = "访问楼栋",order = 5) private String visitPosition; - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 12) private String remarks; - @ExcelProperty("访问开始时间") + @ExcelProperty(value = "访问开始时间",order = 6) private String inTime; - @ExcelProperty("访问结束时间") + @ExcelProperty(value = "访问结束时间",order = 7) private String outTime; - @ExcelProperty("申请者查看的访客申请状态") + @ExcelProperty(value = "状态",order = 11) private String visitorApplyStatus; - @ExcelProperty("物业管理员查看的访客申请状态") + private String adminVisitorApplyStatus; + @ExcelProperty(value = "申请者联系方式",order = 10) + private String staffPhone; private String createTime; private String updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java index fbd7d70..e3c7430 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -11,4 +13,5 @@ public class VisitorApplyStatusRequest { private Long id; private String status; + private String ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java index 7db3083..16df306 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -26,32 +26,34 @@ public class VisitorApply { @TableId private Long id; - @ExcelProperty("访客姓名") + @ExcelProperty(value = "访客姓名",order = 1) private String visitorName; - @ExcelProperty("申请单号") + @ExcelProperty(value = "访客申请单号",order = 0) private String applyNo; - @ExcelProperty("申请者工号") + @ExcelProperty(value = "申请者工号",order = 8) private String staffCode; - @ExcelProperty("申请者姓名") + @ExcelProperty(value = "申请者姓名",order = 9) private String staffName; - @ExcelProperty("访客身份证") + @ExcelProperty(value = "访客身份证",order = 2) private String visitorIdCard; - @ExcelProperty("访客联系方式") + @ExcelProperty(value = "访客联系方式",order = 3) private String visitorPhone; - @ExcelProperty("访问目的") + @ExcelProperty(value = "访问目的",order = 4) private String visitReason; - @ExcelProperty("访问区域") + @ExcelProperty(value = "访问楼栋",order = 5) private String visitPosition; - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 12) private String remarks; - @ExcelProperty("访问开始时间") + @ExcelProperty(value = "访问开始时间",order = 6) private String inTime; - @ExcelProperty("访问结束时间") + @ExcelProperty(value = "访问结束时间",order = 7) private String outTime; - @ExcelProperty("申请者查看的访客申请状态") + @ExcelProperty(value = "状态",order = 11) private String visitorApplyStatus; - @ExcelProperty("物业管理员查看的访客申请状态") + private String adminVisitorApplyStatus; + @ExcelProperty(value = "申请者联系方式",order = 10) + private String staffPhone; private String createTime; private String updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java index 2f0b978..32b5597 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 访问申请service @@ -23,4 +24,6 @@ Object getMessageInfo(String messageId, HttpServletRequest request); Object getMessageList(HttpServletRequest request); + + Object exportMessage(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java index fbd7d70..e3c7430 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -11,4 +13,5 @@ public class VisitorApplyStatusRequest { private Long id; private String status; + private String ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java index 7db3083..16df306 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -26,32 +26,34 @@ public class VisitorApply { @TableId private Long id; - @ExcelProperty("访客姓名") + @ExcelProperty(value = "访客姓名",order = 1) private String visitorName; - @ExcelProperty("申请单号") + @ExcelProperty(value = "访客申请单号",order = 0) private String applyNo; - @ExcelProperty("申请者工号") + @ExcelProperty(value = "申请者工号",order = 8) private String staffCode; - @ExcelProperty("申请者姓名") + @ExcelProperty(value = "申请者姓名",order = 9) private String staffName; - @ExcelProperty("访客身份证") + @ExcelProperty(value = "访客身份证",order = 2) private String visitorIdCard; - @ExcelProperty("访客联系方式") + @ExcelProperty(value = "访客联系方式",order = 3) private String visitorPhone; - @ExcelProperty("访问目的") + @ExcelProperty(value = "访问目的",order = 4) private String visitReason; - @ExcelProperty("访问区域") + @ExcelProperty(value = "访问楼栋",order = 5) private String visitPosition; - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 12) private String remarks; - @ExcelProperty("访问开始时间") + @ExcelProperty(value = "访问开始时间",order = 6) private String inTime; - @ExcelProperty("访问结束时间") + @ExcelProperty(value = "访问结束时间",order = 7) private String outTime; - @ExcelProperty("申请者查看的访客申请状态") + @ExcelProperty(value = "状态",order = 11) private String visitorApplyStatus; - @ExcelProperty("物业管理员查看的访客申请状态") + private String adminVisitorApplyStatus; + @ExcelProperty(value = "申请者联系方式",order = 10) + private String staffPhone; private String createTime; private String updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java index 2f0b978..32b5597 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 访问申请service @@ -23,4 +24,6 @@ Object getMessageInfo(String messageId, HttpServletRequest request); Object getMessageList(HttpServletRequest request); + + Object exportMessage(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 2e18abf..a29bf59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -1,10 +1,10 @@ package com.casic.missiles.modular.system.service.impl; -import cn.hutool.core.date.DateUnit; import com.alibaba.excel.util.DateUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dao.VisitorApplyMapper; @@ -19,19 +19,16 @@ import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.crypto.hash.Hash; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * @Description: @@ -50,6 +47,9 @@ @Resource private UserActionMapper userActionMapper; + @Resource + private IBaseExportService iBaseExportService; + @Override public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) { @@ -59,12 +59,16 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } VisitorApply visitorApply = new VisitorApply(); + UserDto userDto = new UserDto(); BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); String messageId = getMassageId(visitorApply.getVisitorName(), visitorApply.getInTime()); + userDto.setAccount(visitorApply.getStaffCode()); + UserDto userInfo = userActionMapper.getUserInfo(userDto); + visitorApply.setStaffCode(userInfo.getPhone()); visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - List list = userActionMapper.getPropertyManager(); + /*List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); @@ -77,7 +81,7 @@ } } // 向提报人推送消息 - sentMessage(visitorApply); + sentMessage(visitorApply);*/ return ResponseData.success(); } return ResponseData.error("访客申请失败"); @@ -106,23 +110,28 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - VisitorApply visitorApply = new VisitorApply(); - BeanUtils.copyProperties(visitorApplyStatusRequest, visitorApply); - if(visitorApplyMapper.updateById(visitorApply) > 0){ + String[] split = visitorApplyStatusRequest.getIds().split(","); + for (String id : split) { + VisitorApply visitorApply = new VisitorApply(); + visitorApply.setId(Long.valueOf(id)); + visitorApply.setVisitorApplyStatus(visitorApplyStatusRequest.getStatus()); + if(visitorApplyMapper.updateById(visitorApply) > 0){ VisitorApply apply = visitorApplyMapper.selectById(visitorApplyStatusRequest.getId()); //申请通过 if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - sentMessage(apply); + //sentMessage(apply); } //申请不通过 if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - sentMessage(apply); + //sentMessage(apply); } - return ResponseData.success(); + return ResponseData.success(); + } + return ResponseData.error("提交失败"); } - return ResponseData.error("提交失败"); + return ResponseData.error(Status.FAIL); } @Override @@ -161,6 +170,25 @@ } + @Override + public Object exportMessage(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + try { + String[] split = visitorApplyListRequest.getIds().split(","); + List list = new ArrayList<>(Arrays.asList(split)); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", list); + List visitorApplyList = visitorApplyMapper.selectList(qw); + visitorApplyList.forEach(visitorApply -> { + visitorApply.setVisitorApplyStatus(""); + }); + iBaseExportService.exportExcel(response,VisitorApply.class,visitorApplyList,"sheet"); + return ResponseData.error(Status.OK); + } catch (IOException e) { + e.printStackTrace(); + return ResponseData.error(Status.FAIL); + } + } + private void sentMessage(VisitorApply visitorApply) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); String toUser = getToUser(visitorApply.getStaffCode()); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index f239d47..e828464 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -18,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.HashMap; /** @@ -64,6 +65,11 @@ return visitorApplyService.getMessageInfo(messageId,request); } + @RequestMapping("/exportMessage") + public Object exportMessage(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + return visitorApplyService.exportMessage(visitorApplyListRequest,request,response); + } + @RequestMapping("/getMessageList") public Object getMessageList(HttpServletRequest request) { return visitorApplyService.getMessageList(request); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java index 8bccf4a..25263d8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -14,4 +16,6 @@ private String startTime; private String endTime; private String status; + private String ids; + private List list; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java index fbd7d70..e3c7430 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyStatusRequest.java @@ -2,6 +2,8 @@ import lombok.Data; +import java.util.List; + /** * @Description: * @Author: wangpeng @@ -11,4 +13,5 @@ public class VisitorApplyStatusRequest { private Long id; private String status; + private String ids; } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java index 7db3083..16df306 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/VisitorApply.java @@ -26,32 +26,34 @@ public class VisitorApply { @TableId private Long id; - @ExcelProperty("访客姓名") + @ExcelProperty(value = "访客姓名",order = 1) private String visitorName; - @ExcelProperty("申请单号") + @ExcelProperty(value = "访客申请单号",order = 0) private String applyNo; - @ExcelProperty("申请者工号") + @ExcelProperty(value = "申请者工号",order = 8) private String staffCode; - @ExcelProperty("申请者姓名") + @ExcelProperty(value = "申请者姓名",order = 9) private String staffName; - @ExcelProperty("访客身份证") + @ExcelProperty(value = "访客身份证",order = 2) private String visitorIdCard; - @ExcelProperty("访客联系方式") + @ExcelProperty(value = "访客联系方式",order = 3) private String visitorPhone; - @ExcelProperty("访问目的") + @ExcelProperty(value = "访问目的",order = 4) private String visitReason; - @ExcelProperty("访问区域") + @ExcelProperty(value = "访问楼栋",order = 5) private String visitPosition; - @ExcelProperty("备注") + @ExcelProperty(value = "备注",order = 12) private String remarks; - @ExcelProperty("访问开始时间") + @ExcelProperty(value = "访问开始时间",order = 6) private String inTime; - @ExcelProperty("访问结束时间") + @ExcelProperty(value = "访问结束时间",order = 7) private String outTime; - @ExcelProperty("申请者查看的访客申请状态") + @ExcelProperty(value = "状态",order = 11) private String visitorApplyStatus; - @ExcelProperty("物业管理员查看的访客申请状态") + private String adminVisitorApplyStatus; + @ExcelProperty(value = "申请者联系方式",order = 10) + private String staffPhone; private String createTime; private String updateTime; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java index 2f0b978..32b5597 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; /** * @Description: 访问申请service @@ -23,4 +24,6 @@ Object getMessageInfo(String messageId, HttpServletRequest request); Object getMessageList(HttpServletRequest request); + + Object exportMessage(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 2e18abf..a29bf59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -1,10 +1,10 @@ package com.casic.missiles.modular.system.service.impl; -import cn.hutool.core.date.DateUnit; import com.alibaba.excel.util.DateUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.UserActionMapper; import com.casic.missiles.modular.system.dao.VisitorApplyMapper; @@ -19,19 +19,16 @@ import com.casic.missiles.modular.system.utils.UuidUtils; import com.casic.missiles.modular.system.utils.WXUserUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.shiro.crypto.hash.Hash; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * @Description: @@ -50,6 +47,9 @@ @Resource private UserActionMapper userActionMapper; + @Resource + private IBaseExportService iBaseExportService; + @Override public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) { @@ -59,12 +59,16 @@ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } VisitorApply visitorApply = new VisitorApply(); + UserDto userDto = new UserDto(); BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); String messageId = getMassageId(visitorApply.getVisitorName(), visitorApply.getInTime()); + userDto.setAccount(visitorApply.getStaffCode()); + UserDto userInfo = userActionMapper.getUserInfo(userDto); + visitorApply.setStaffCode(userInfo.getPhone()); visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - List list = userActionMapper.getPropertyManager(); + /*List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); @@ -77,7 +81,7 @@ } } // 向提报人推送消息 - sentMessage(visitorApply); + sentMessage(visitorApply);*/ return ResponseData.success(); } return ResponseData.error("访客申请失败"); @@ -106,23 +110,28 @@ if(null == jsonObject){ return ResponseData.error(2401,Status.TOKEN_EXPIRES); } - VisitorApply visitorApply = new VisitorApply(); - BeanUtils.copyProperties(visitorApplyStatusRequest, visitorApply); - if(visitorApplyMapper.updateById(visitorApply) > 0){ + String[] split = visitorApplyStatusRequest.getIds().split(","); + for (String id : split) { + VisitorApply visitorApply = new VisitorApply(); + visitorApply.setId(Long.valueOf(id)); + visitorApply.setVisitorApplyStatus(visitorApplyStatusRequest.getStatus()); + if(visitorApplyMapper.updateById(visitorApply) > 0){ VisitorApply apply = visitorApplyMapper.selectById(visitorApplyStatusRequest.getId()); //申请通过 if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - sentMessage(apply); + //sentMessage(apply); } //申请不通过 if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - sentMessage(apply); + //sentMessage(apply); } - return ResponseData.success(); + return ResponseData.success(); + } + return ResponseData.error("提交失败"); } - return ResponseData.error("提交失败"); + return ResponseData.error(Status.FAIL); } @Override @@ -161,6 +170,25 @@ } + @Override + public Object exportMessage(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request, HttpServletResponse response) { + try { + String[] split = visitorApplyListRequest.getIds().split(","); + List list = new ArrayList<>(Arrays.asList(split)); + QueryWrapper qw = new QueryWrapper<>(); + qw.in("id", list); + List visitorApplyList = visitorApplyMapper.selectList(qw); + visitorApplyList.forEach(visitorApply -> { + visitorApply.setVisitorApplyStatus(""); + }); + iBaseExportService.exportExcel(response,VisitorApply.class,visitorApplyList,"sheet"); + return ResponseData.error(Status.OK); + } catch (IOException e) { + e.printStackTrace(); + return ResponseData.error(Status.FAIL); + } + } + private void sentMessage(VisitorApply visitorApply) { String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); String toUser = getToUser(visitorApply.getStaffCode()); diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index e81414d..1eb0ec0 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -20,6 +20,9 @@ and visitor_apply_status = #{request.status} + + and id in #{item} + ORDER BY create_time DESC