Skip to content

E
entrance_api
Commit 23faa7b1 authored by 王琮's avatar 王琮
Browse files
Options

修改访客导出接口

parent a83451ba
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 49 deletions
src/main/java/org/rcisoft/sys/visit/controller/VisitPersonController.java
View file @ 23faa7b1
......@@ -24,14 +24,15 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
/**
* Created by cy on 2022年11月16日 下午3:19:19.
*/
* Created by cy on 2022年11月16日 下午3:19:19.
*/
@RestController
@RequestMapping("/visitPersonManage")
public class VisitPersonController extends CyPaginationController<SysUser> {
......@@ -45,7 +46,7 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
//@PreAuthorize("@cyPerm.hasPerm('sys:user:add')")
@CyOpeLogAnno(title = "system-访客表管理-新增访客表", businessType = CyLogTypeEnum.INSERT)
@ApiOperation(value="添加访客表", notes="添加访客表")
@ApiOperation(value = "添加访客表", notes = "添加访客表")
@PostMapping(value = "/add")
public CyResult add(@RequestBody SysUser sysUser, BindingResult bindingResult) {
sysUser.setUserType("1");
......@@ -53,78 +54,79 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
sysUser.setPersonId(UUID.randomUUID().toString());
CyPersistModel data = sysUserServiceImpl.persist(sysUser);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUser);
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUser);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:user:delete')")
@CyOpeLogAnno(title = "system-访客表管理-删除访客表", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="逻辑删除访客表", notes="逻辑删除访客表")
@ApiOperation(value = "逻辑删除访客表", notes = "逻辑删除访客表")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@DeleteMapping("/deleteLogical/{businessId:\\w+}")
public CyResult deleteLogical(@PathVariable int businessId,SysUser sysUser) {
public CyResult deleteLogical(@PathVariable int businessId, SysUser sysUser) {
sysUser.setBusinessId(businessId);
CyPersistModel data = sysUserServiceImpl.removeLogical(sysUser);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
}
//逻辑删除
//@PreAuthorize("@cyPerm.hasPerm('sys:user:delete')")
@CyOpeLogAnno(title = "system-访客表管理-删除访客表", businessType = CyLogTypeEnum.DELETE)
@ApiOperation(value="删除访客表", notes="删除访客表")
@ApiOperation(value = "删除访客表", notes = "删除访客表")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@DeleteMapping("/delete/{businessId:\\w+}")
public CyResult delete(@PathVariable int businessId,SysUser sysUser) {
public CyResult delete(@PathVariable int businessId, SysUser sysUser) {
sysUser.setBusinessId(businessId);
CyPersistModel data = sysUserServiceImpl.remove(sysUser);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
businessId);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:user:update')")
@CyOpeLogAnno(title = "system-访客表管理-修改访客表", businessType = CyLogTypeEnum.UPDATE)
@ApiOperation(value="修改访客表", notes="修改访客表")
@ApiOperation(value = "修改访客表", notes = "修改访客表")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
@PutMapping("/update")
public CyResult update(@RequestBody SysUser sysUser, BindingResult bindingResult) {
CyPersistModel data = sysUserServiceImpl.merge(sysUser);
return CyResultGenUtil.builder(data,
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUser);
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUser);
}
//@PreAuthorize("@cyPerm.hasPerm('sys:user:query')")
@CyOpeLogAnno(title = "system-访客表管理-查询访客表", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询单一访客表", notes="查询单一访客表")
@ApiOperation(value = "查询单一访客表", notes = "查询单一访客表")
@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
@GetMapping("/detail/{businessId:\\w+}")
public CyResult detail(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserServiceImpl.findById(businessId));
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserServiceImpl.findById(businessId));
}
// //@PreAuthorize("@cyPerm.hasPerm('sys:user:list')")
// //@PreAuthorize("@cyPerm.hasPerm('sys:user:list')")
@CyOpeLogAnno(title = "system-访客表管理-查询访客表", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询访客表集合", notes="查询访客表集合")
@ApiOperation(value = "查询访客表集合", notes = "查询访客表集合")
@GetMapping(value = "/querySysUsers")
public CyResult querySysUsers(SysUser sysUser) {
sysUser.setUserType("1");
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserServiceImpl.findAll(sysUser));
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserServiceImpl.findAll(sysUser));
}
@CyOpeLogAnno(title = "system-访客表管理-查询访客表", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="查询访客表集合", notes="查询访客表集合")
@ApiOperation(value = "查询访客表集合", notes = "查询访客表集合")
@GetMapping(value = "/querySysUsersList")
public CyResult querySysUsersList() {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -134,7 +136,7 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
}
@CyOpeLogAnno(title = "system-用户表管理-通过ID查询用户", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="通过ID查询用户", notes="通过ID查询用户")
@ApiOperation(value = "通过ID查询用户", notes = "通过ID查询用户")
@GetMapping(value = "/querySysUserById/{businessId:\\w+}")
public CyResult querySysUserById(@PathVariable Integer businessId) {
return CyResultGenUtil.builder(new CyPersistModel(1),
......@@ -145,7 +147,7 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
//@PreAuthorize("@cyPerm.hasPerm('sys:user:list')")
@CyOpeLogAnno(title = "system-访客表管理-查询访客表", businessType = CyLogTypeEnum.QUERY)
@ApiOperation(value="分页查询访客表集合", notes="分页查询访客表集合")
@ApiOperation(value = "分页查询访客表集合", notes = "分页查询访客表集合")
@GetMapping(value = "/querySysUserByPagination")
public CyGridModel listByPagination(SysUser sysUser) {
sysUser.setUserType("1");
......@@ -156,30 +158,36 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
@CyOpeLogAnno(title = "system-访客表管理-查询访客表", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "导出访客表信息", notes = "导出访客表信息")
@GetMapping(value = "/export")
public CyResult outSysUser(HttpServletResponse response,SysUser sysUser,@PathVariable @RequestParam(defaultValue = "0") String excelId) {
public CyResult outSysUser(HttpServletResponse response, SysUser sysUser, @PathVariable @RequestParam(defaultValue = "0") String excelId) {
sysUser.setUserType("1");
String excelName="";
switch(excelId){
case "0": excelName="访客表信息.xls";break;
case "1": excelName="访客表信息.xlsx";break;
case "2": excelName="访客表信息.csv";break;
String excelName = "";
switch (excelId) {
case "0":
excelName = "访客表信息.xls";
break;
case "1":
excelName = "访客表信息.xlsx";
break;
case "2":
excelName = "访客表信息.csv";
break;
}
List<SysUser> sysUserList = sysUserServiceImpl.export(sysUser);
List<VisitPerson> visitPersonList = new ArrayList<>();
for (SysUser u: sysUserList) {
for (SysUser u : sysUserList) {
VisitPerson visitPerson = new VisitPerson();
visitPerson.setName(u.getName());
visitPerson.setPhone(u.getPhone());
visitPerson.setBlacklistFlag(u.getBlacklistFlag());
visitPerson.setBlacklistFlag(u.getBlacklistFlag().equals(1l) ? "黑名单" : "白名单");
visitPerson.setFirstDate(u.getFirstDate());
visitPerson.setLastDate(u.getLastDate());
visitPersonList.add(visitPerson);
}
CyEpExcelUtil.exportExcel(visitPersonList, "访客表信息", "访客表信息", VisitPerson.class, excelName, response);
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserList);
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
sysUserList);
}
@CyOpeLogAnno(title = "system-访客管理-导出访客", businessType = CyLogTypeEnum.EXPORT)
......
src/main/java/org/rcisoft/sys/visit/entity/VisitPerson.java
View file @ 23faa7b1
......@@ -43,5 +43,5 @@ public class VisitPerson {
* @default
*/
@Excel(name = "状态（0白名单1黑名单）", orderNum = "4", width = 20)
private Long blacklistFlag;
private String blacklistFlag;
}
src/main/java/org/rcisoft/sys/visit/service/VisitInfomationService.java
View file @ 23faa7b1
package org.rcisoft.sys.visit.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.rcisoft.sys.rbac.user.dto.ImportUserDTO;
import org.rcisoft.sys.visit.dto.ImportVistInfoDTO;
import org.rcisoft.sys.visit.entity.VisitInfoMation;
import org.rcisoft.core.model.CyPersistModel;
......
src/main/java/org/rcisoft/sys/visit/service/impl/VisitPersonServiceImpl.java
View file @ 23faa7b1
......@@ -293,7 +293,6 @@ public class VisitPersonServiceImpl extends ServiceImpl<VisitPersonRepositorys,
String deptName = sysDepts.get(0).getDeptName();
sysUserList.get(i).setDeptId(deptName);
}
//查询职位id
String position = sysUserList.get(i).getPosition();
List<SysDictData> sysDictData = sysDictDataRepositorys.queryDataByPosition(position);
......@@ -302,7 +301,6 @@ public class VisitPersonServiceImpl extends ServiceImpl<VisitPersonRepositorys,
String dictLabel = sysDictData.get(0).getDictLabel();
sysUserList.get(i).setPosition(dictLabel);
}
//查询班次id
String nltBz = sysUserList.get(i).getNltBz();
List<SysDictData> sysDictData1 = sysDictDataRepositorys.queryDataByNltBz(nltBz);
......@@ -311,7 +309,6 @@ public class VisitPersonServiceImpl extends ServiceImpl<VisitPersonRepositorys,
String dictLabel = sysDictData1.get(0).getDictLabel();
sysUserList.get(i).setNltBz(dictLabel);
}
//性别
if (sysUserList.get(i).getSex() != null) {
if (sysUserList.get(i).getSex().equals("1")) {
......@@ -329,7 +326,6 @@ public class VisitPersonServiceImpl extends ServiceImpl<VisitPersonRepositorys,
list.add(sysUserList.get(i));
}
return list;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment