From 09c28ce51b729ba5bfa982bdfecd9001eabda3b1 Mon Sep 17 00:00:00 2001 From: zyy <121611808@qq.com> Date: Sat, 17 Oct 2020 11:06:20 +0800 Subject: [PATCH] up --- .../cases/controller/CaseIndexController.java | 1 - .../cases/controller/CaseStoreController.java | 2 +- .../cases/controller/CaseUserController.java | 14 +- .../bsd/cases/service/CaseUsersService.java | 2 +- .../service/impl/CaseUsersServiceImpl.java | 308 +++++++++--------- src/main/resources/application-production.yml | 2 +- 6 files changed, 168 insertions(+), 161 deletions(-) diff --git a/src/main/java/com/bsd/cases/controller/CaseIndexController.java b/src/main/java/com/bsd/cases/controller/CaseIndexController.java index 003926c..70ca290 100644 --- a/src/main/java/com/bsd/cases/controller/CaseIndexController.java +++ b/src/main/java/com/bsd/cases/controller/CaseIndexController.java @@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletResponse; @Api("后台登录API") @RestController -@RequestMapping("api") @CrossOrigin public class CaseIndexController { diff --git a/src/main/java/com/bsd/cases/controller/CaseStoreController.java b/src/main/java/com/bsd/cases/controller/CaseStoreController.java index 6c19b55..43c1a47 100644 --- a/src/main/java/com/bsd/cases/controller/CaseStoreController.java +++ b/src/main/java/com/bsd/cases/controller/CaseStoreController.java @@ -19,7 +19,7 @@ import javax.annotation.Resource; @Api("店铺API") @RestController -@RequestMapping("/api/store") +@RequestMapping("/store") public class CaseStoreController { @Resource diff --git a/src/main/java/com/bsd/cases/controller/CaseUserController.java b/src/main/java/com/bsd/cases/controller/CaseUserController.java index 47b435e..d657056 100644 --- a/src/main/java/com/bsd/cases/controller/CaseUserController.java +++ b/src/main/java/com/bsd/cases/controller/CaseUserController.java @@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSONObject; import com.bsd.cases.model.CaseUsers; import com.bsd.cases.service.CaseUsersService; import com.bsd.cases.util.AjaxResult; -import com.bsd.cases.util.FileUtils; import com.bsd.cases.util.PageAjax; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresAuthentication; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -22,8 +20,8 @@ public class CaseUserController { @Resource private CaseUsersService caseUsersService; - @Value("${upload.path}") - private String uploadPath; +// @Value("${upload.path}") +// private String uploadPath; @ApiOperation(value = "用户列表PC", notes = "用户列表PC") @ApiImplicitParams({ @@ -140,8 +138,8 @@ public class CaseUserController { AjaxResult ajaxResult = new AjaxResult(); try { - String url = caseUsersService.export(jsonObject); - ajaxResult.setData(url); +// String url = caseUsersService.export(jsonObject); +// ajaxResult.setData(url); ajaxResult.setRetcode(AjaxResult.SUCCESS); } catch (Exception e) { e.printStackTrace(); @@ -161,8 +159,8 @@ public class CaseUserController { String fileName = file.getOriginalFilename(); AjaxResult ajaxResult = new AjaxResult(); try { - FileUtils.uploadFile(file.getBytes(), uploadPath, fileName); - caseUsersService.saveUserList(uploadPath, fileName); +// FileUtils.uploadFile(file.getBytes(), uploadPath, fileName); +// caseUsersService.saveUserList(uploadPath, fileName); ajaxResult.setRetcode(AjaxResult.SUCCESS); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/bsd/cases/service/CaseUsersService.java b/src/main/java/com/bsd/cases/service/CaseUsersService.java index 82d4c97..6e930cb 100644 --- a/src/main/java/com/bsd/cases/service/CaseUsersService.java +++ b/src/main/java/com/bsd/cases/service/CaseUsersService.java @@ -35,7 +35,7 @@ public interface CaseUsersService { void delete(JSONObject params); - String export(JSONObject params); +// String export(JSONObject params); void saveUserList(String uploadPath, String fileName); diff --git a/src/main/java/com/bsd/cases/service/impl/CaseUsersServiceImpl.java b/src/main/java/com/bsd/cases/service/impl/CaseUsersServiceImpl.java index b188cee..de83774 100644 --- a/src/main/java/com/bsd/cases/service/impl/CaseUsersServiceImpl.java +++ b/src/main/java/com/bsd/cases/service/impl/CaseUsersServiceImpl.java @@ -46,10 +46,10 @@ public class CaseUsersServiceImpl implements CaseUsersService { @Resource private CaseAreaMapper caseAreaMapper; - @Value("${export.path}") - private String exportPath; - @Value("${export.url}") - private String exportUrl; +// @Value("${export.path}") +// private String exportPath; +// @Value("${export.url}") +// private String exportUrl; private String uploadPath; private String fileName; @@ -76,6 +76,16 @@ public class CaseUsersServiceImpl implements CaseUsersService { return caseUser; } + @Override + public CaseUsers findByUserNo(JSONObject jsonObject) { + + CaseUsers caseUsers = new CaseUsers(); + String userNo = jsonObject.getString("userNo"); + caseUsers.setUserNo(userNo); + caseUsers = caseUsersMapper.selectOne(caseUsers); + return caseUsers; + } + public CaseUsers findByUserNo(String userNo) { CaseUsers caseUser = new CaseUsers(); @@ -685,151 +695,151 @@ public class CaseUsersServiceImpl implements CaseUsersService { * @param params * @return */ - public String export(JSONObject params) { - - Integer state = params.getInteger("state"); - String key = params.getString("key"); - Integer companyId = params.getInteger("companyId"); - Integer storeId = params.getInteger("storeId"); - Condition condition = new Condition(CaseUsers.class); - Example.Criteria criteria = condition.createCriteria(); - criteria.andCondition("state=" + state); - - if (null != companyId) { - - criteria.andCondition("company_id=" + companyId); - } - - if (null != storeId) { - - criteria.andCondition("store_id=" + storeId); - } - if (null != key) { - - key = com.bsd.cases.util.StringUtils.generateLike(key); - criteria.andLike("userName", key).orLike("userNo", key); - } - - List usersList = caseUsersMapper.selectByExample(condition); - - - String[] title = {"员工姓名", "员工号", "电话", "店铺编号", "店铺编号", "店铺编号", "店铺编号", "用户类型"}; - //创建HSSF工作薄 - HSSFWorkbook workbook = new HSSFWorkbook(); - //创建一个Sheet页 - HSSFSheet sheet = workbook.createSheet(); - //创建第一行（一般是表头） - HSSFRow row0 = sheet.createRow(0); - //创建列 - HSSFCell cell = null; - - // 设置字体 - HSSFFont font = workbook.createFont(); - font.setFontName("黑体"); //字体 - font.setFontHeightInPoints((short) 12); - // 设置单元格类型 - HSSFCellStyle cellStyle = workbook.createCellStyle(); - cellStyle.setFont(font); - cellStyle.setAlignment(HorizontalAlignment.CENTER); //水平布局：居中 - cellStyle.setWrapText(true); - - //设置表头 - for (int i = 0; i < title.length; i++) { - - cell = row0.createCell(i); - cell.setCellStyle(cellStyle); - cell.setCellValue(title[i]); - } - - //填充20行数据 - for (int i = 0; i < usersList.size(); i++) { - - CaseUsers users = usersList.get(i); - HSSFRow row = sheet.createRow(i + 1); - HSSFCell cell1 = row.createCell(0); - cell1.setCellStyle(cellStyle); - cell1.setCellValue(i + 1); - - HSSFCell cell2 = row.createCell(1); - cell2.setCellStyle(cellStyle); - cell2.setCellValue(users.getUserName()); - - HSSFCell cell3 = row.createCell(2); - cell3.setCellStyle(cellStyle); - cell3.setCellValue(users.getUserNo()); - - HSSFCell cell4 = row.createCell(3); - cell4.setCellStyle(cellStyle); - cell4.setCellValue(users.getStoreCode()); - - HSSFCell cell5 = row.createCell(4); - cell5.setCellStyle(cellStyle); - cell5.setCellValue(users.getStoreName()); - - HSSFCell cell6 = row.createCell(5); - cell6.setCellStyle(cellStyle); - cell6.setCellValue(users.getCompanyCode()); - - HSSFCell cell7 = row.createCell(6); - cell7.setCellStyle(cellStyle); - cell7.setCellValue(users.getCompanyName()); - - HSSFCell cell8 = row.createCell(7); - cell8.setCellStyle(cellStyle); - - int role = users.getRole(); - - switch (role) { - - case Constants.MOFANG_USER: - - cell8.setCellValue("店铺用户"); - break; - case Constants.WECHAT_USER: - - cell8.setCellValue("微信用户"); - break; - case Constants.HEAD_USER: - - cell8.setCellValue("总部用户"); - break; - case Constants.COMPANY_USER: - - cell8.setCellValue("店铺用户"); - break; - default: - break; - } - } - - sheet.autoSizeColumn((short) 0); - sheet.autoSizeColumn((short) 1); - sheet.autoSizeColumn((short) 2); - sheet.autoSizeColumn((short) 3); - sheet.autoSizeColumn((short) 4); - sheet.autoSizeColumn((short) 5); - sheet.autoSizeColumn((short) 6); - sheet.autoSizeColumn((short) 7); - - String fileName = System.currentTimeMillis() + ".xls"; - String absPath = exportPath + fileName; - String url = exportUrl + fileName; - //保存到本地 - File file = new File(absPath); - FileOutputStream outputStream = null; - try { - outputStream = new FileOutputStream(file); - workbook.write(outputStream); - outputStream.flush(); - outputStream.close(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - //将Excel写入输出流中 - return url; - } +// public String export(JSONObject params) { +// +// Integer state = params.getInteger("state"); +// String key = params.getString("key"); +// Integer companyId = params.getInteger("companyId"); +// Integer storeId = params.getInteger("storeId"); +// Condition condition = new Condition(CaseUsers.class); +// Example.Criteria criteria = condition.createCriteria(); +// criteria.andCondition("state=" + state); +// +// if (null != companyId) { +// +// criteria.andCondition("company_id=" + companyId); +// } +// +// if (null != storeId) { +// +// criteria.andCondition("store_id=" + storeId); +// } +// if (null != key) { +// +// key = com.bsd.cases.util.StringUtils.generateLike(key); +// criteria.andLike("userName", key).orLike("userNo", key); +// } +// +// List usersList = caseUsersMapper.selectByExample(condition); +// +// +// String[] title = {"员工姓名", "员工号", "电话", "店铺编号", "店铺编号", "店铺编号", "店铺编号", "用户类型"}; +// //创建HSSF工作薄 +// HSSFWorkbook workbook = new HSSFWorkbook(); +// //创建一个Sheet页 +// HSSFSheet sheet = workbook.createSheet(); +// //创建第一行（一般是表头） +// HSSFRow row0 = sheet.createRow(0); +// //创建列 +// HSSFCell cell = null; +// +// // 设置字体 +// HSSFFont font = workbook.createFont(); +// font.setFontName("黑体"); //字体 +// font.setFontHeightInPoints((short) 12); +// // 设置单元格类型 +// HSSFCellStyle cellStyle = workbook.createCellStyle(); +// cellStyle.setFont(font); +// cellStyle.setAlignment(HorizontalAlignment.CENTER); //水平布局：居中 +// cellStyle.setWrapText(true); +// +// //设置表头 +// for (int i = 0; i < title.length; i++) { +// +// cell = row0.createCell(i); +// cell.setCellStyle(cellStyle); +// cell.setCellValue(title[i]); +// } +// +// //填充20行数据 +// for (int i = 0; i < usersList.size(); i++) { +// +// CaseUsers users = usersList.get(i); +// HSSFRow row = sheet.createRow(i + 1); +// HSSFCell cell1 = row.createCell(0); +// cell1.setCellStyle(cellStyle); +// cell1.setCellValue(i + 1); +// +// HSSFCell cell2 = row.createCell(1); +// cell2.setCellStyle(cellStyle); +// cell2.setCellValue(users.getUserName()); +// +// HSSFCell cell3 = row.createCell(2); +// cell3.setCellStyle(cellStyle); +// cell3.setCellValue(users.getUserNo()); +// +// HSSFCell cell4 = row.createCell(3); +// cell4.setCellStyle(cellStyle); +// cell4.setCellValue(users.getStoreCode()); +// +// HSSFCell cell5 = row.createCell(4); +// cell5.setCellStyle(cellStyle); +// cell5.setCellValue(users.getStoreName()); +// +// HSSFCell cell6 = row.createCell(5); +// cell6.setCellStyle(cellStyle); +// cell6.setCellValue(users.getCompanyCode()); +// +// HSSFCell cell7 = row.createCell(6); +// cell7.setCellStyle(cellStyle); +// cell7.setCellValue(users.getCompanyName()); +// +// HSSFCell cell8 = row.createCell(7); +// cell8.setCellStyle(cellStyle); +// +// int role = users.getRole(); +// +// switch (role) { +// +// case Constants.MOFANG_USER: +// +// cell8.setCellValue("店铺用户"); +// break; +// case Constants.WECHAT_USER: +// +// cell8.setCellValue("微信用户"); +// break; +// case Constants.HEAD_USER: +// +// cell8.setCellValue("总部用户"); +// break; +// case Constants.COMPANY_USER: +// +// cell8.setCellValue("店铺用户"); +// break; +// default: +// break; +// } +// } +// +// sheet.autoSizeColumn((short) 0); +// sheet.autoSizeColumn((short) 1); +// sheet.autoSizeColumn((short) 2); +// sheet.autoSizeColumn((short) 3); +// sheet.autoSizeColumn((short) 4); +// sheet.autoSizeColumn((short) 5); +// sheet.autoSizeColumn((short) 6); +// sheet.autoSizeColumn((short) 7); +// +// String fileName = System.currentTimeMillis() + ".xls"; +// String absPath = exportPath + fileName; +// String url = exportUrl + fileName; +// //保存到本地 +// File file = new File(absPath); +// FileOutputStream outputStream = null; +// try { +// outputStream = new FileOutputStream(file); +// workbook.write(outputStream); +// outputStream.flush(); +// outputStream.close(); +// } catch (FileNotFoundException e) { +// e.printStackTrace(); +// } catch (IOException e) { +// e.printStackTrace(); +// } +// //将Excel写入输出流中 +// return url; +// } } diff --git a/src/main/resources/application-production.yml b/src/main/resources/application-production.yml index e74f737..86821ff 100644 --- a/src/main/resources/application-production.yml +++ b/src/main/resources/application-production.yml @@ -1,5 +1,5 @@ server: - port: 8080 + port: 8888 spring: datasource: