Compare commits

..

No commits in common. '109508c53d7a817eb4f1b2d6f95dc377f1ec687f' and 'd297d570686553553f170ac870434bc5fa5a2626' have entirely different histories.

@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSONObject;
import com.bsd.cases.model.CaseUsers; import com.bsd.cases.model.CaseUsers;
import com.bsd.cases.service.CaseUsersService; import com.bsd.cases.service.CaseUsersService;
import com.bsd.cases.util.AjaxResult; import com.bsd.cases.util.AjaxResult;
import com.bsd.cases.util.FileUtils;
import com.bsd.cases.util.PageAjax; import com.bsd.cases.util.PageAjax;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -22,8 +20,8 @@ public class CaseUserController {
@Resource @Resource
private CaseUsersService caseUsersService; private CaseUsersService caseUsersService;
@Value("${upload.path}") // @Value("${upload.path}")
private String uploadPath; // private String uploadPath;
@ApiOperation(value = "用户列表PC", notes = "用户列表PC") @ApiOperation(value = "用户列表PC", notes = "用户列表PC")
@ApiImplicitParams({ @ApiImplicitParams({
@ -161,8 +159,8 @@ public class CaseUserController {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
AjaxResult ajaxResult = new AjaxResult(); AjaxResult ajaxResult = new AjaxResult();
try { try {
FileUtils.uploadFile(file.getBytes(), uploadPath, fileName); // FileUtils.uploadFile(file.getBytes(), uploadPath, fileName);
caseUsersService.saveUserList(uploadPath, fileName); // caseUsersService.saveUserList(uploadPath, fileName);
ajaxResult.setRetcode(AjaxResult.SUCCESS); ajaxResult.setRetcode(AjaxResult.SUCCESS);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

@ -478,12 +478,12 @@ public class CaseUsersServiceImpl implements CaseUsersService {
String storeName = row.getCell(7).getStringCellValue(); String storeName = row.getCell(7).getStringCellValue();
importPO.setStoreName(storeName); importPO.setStoreName(storeName);
} }
// if (row.getCell(8) != null) { if (row.getCell(8) != null) {
//
// row.getCell(8).setCellType(CellType.STRING); row.getCell(8).setCellType(CellType.STRING);
// String areaName = row.getCell(8).getStringCellValue(); String areaName = row.getCell(8).getStringCellValue();
// importPO.setAreaName(areaName); importPO.setAreaName(areaName);
// } }
importPOList.add(importPO); importPOList.add(importPO);
} }

@ -1,7 +1,10 @@
server: server:
port: 8888 port: 8888
servlet: tomcat:
context-path: /api/ max-http-header-size: 16000
uri-encoding: UTF-8
max-http-header-size: 16000
spring: spring:
datasource: datasource:
name: druidDataSource name: druidDataSource
@ -50,11 +53,6 @@ pagehelper:
reasonable: true reasonable: true
support-methods-arguments: true support-methods-arguments: true
params: count=countSql params: count=countSql
upload:
path: /tmp/upload/
export:
path: /tmp/export/
wx: wx:
BASE_URI: https://api.weixin.qq.com BASE_URI: https://api.weixin.qq.com

Loading…
Cancel
Save