Commit 8041561c authored by 王琮's avatar 王琮

修改邀访导入

parent 61a9c5fb
...@@ -27,7 +27,7 @@ public class OssINfoUtil { ...@@ -27,7 +27,7 @@ public class OssINfoUtil {
SEPARATOR = File.separator; SEPARATOR = File.separator;
} }
@Value("${global.path.base_upload_location}") @Value("${global.base_upload_location}")
private String baseUploadLocation; private String baseUploadLocation;
public OssInfo filePath(MultipartFile multipartFile, String temp) { public OssInfo filePath(MultipartFile multipartFile, String temp) {
......
...@@ -210,8 +210,6 @@ public class CyEpExcelUtil { ...@@ -210,8 +210,6 @@ public class CyEpExcelUtil {
* strings 下拉内容 * strings 下拉内容
*/ */
public static void selectList(Workbook workbook, int firstRow, int lastRow, int firstCol, int lastCol, String[] strings) { public static void selectList(Workbook workbook, int firstRow, int lastRow, int firstCol, int lastCol, String[] strings) {
Sheet sheet = workbook.getSheetAt(0); Sheet sheet = workbook.getSheetAt(0);
// 生成下拉列表 // 生成下拉列表
// 只对(x,x)单元格有效 // 只对(x,x)单元格有效
......
...@@ -233,11 +233,20 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM ...@@ -233,11 +233,20 @@ public class VisitInfomationController extends CyPaginationController<VisitInfoM
@PostMapping("/importExcel") @PostMapping("/importExcel")
@CyEptSm4EnableAnno @CyEptSm4EnableAnno
public CyResult importSysUser(MultipartFile file,HttpServletResponse response) throws ParseException { public CyResult importSysUser(MultipartFile file,HttpServletResponse response) throws ParseException {
return CyResultGenUtil.builder(new CyPersistModel(1), return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS, CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR, CyMessCons.MESSAGE_ALERT_ERROR,
visitInfomationServiceImpl.importUserExcel(file,response)); visitInfomationServiceImpl.importUserExcel(file,response));
} }
@CyOpeLogAnno(title = "内勤系统-用户管理-导出用户", businessType = CyLogTypeEnum.EXPORT)
@ApiOperation(value = "下载错误信息", notes = "下载错误信息")
@PostMapping("/downFalseFile")
@CyEptSm4EnableAnno
public CyResult downFile(String fileName, HttpServletResponse response) throws Exception {
return CyResultGenUtil.builder(new CyPersistModel(1),
CyMessCons.MESSAGE_ALERT_SUCCESS,
CyMessCons.MESSAGE_ALERT_ERROR,
visitInfomationServiceImpl.download(fileName, response));
}
} }
...@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel; ...@@ -4,7 +4,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data @Data
public class ExportVisitInfoDto { public class ExportVisitInfoDto {
......
...@@ -103,4 +103,6 @@ public interface VisitInfomationService { ...@@ -103,4 +103,6 @@ public interface VisitInfomationService {
* @return * @return
*/ */
List<VisitInfoMation> findByUser(VisitUser visitUser); List<VisitInfoMation> findByUser(VisitUser visitUser);
int download(String fileName, HttpServletResponse response) throws Exception;
} }
...@@ -85,8 +85,8 @@ logging: ...@@ -85,8 +85,8 @@ logging:
# com.alibaba.nacos: debug # com.alibaba.nacos: debug
global: global:
#base_upload_location: /working/file/ base_upload_location: /working/file/
base_upload_location: D:\working\file #base_upload_location: D:\working\file
base_discovery: 'http://124.71.16.228:18088/file/' base_discovery: 'http://124.71.16.228:18088/file/'
code_generate_location: /code code_generate_location: /code
video_location: /video video_location: /video
......
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