Skip to content

C
customer-service
Commit 946f37ec authored by suntao's avatar suntao
Browse files
Options

查询小曼工单

parent d6515d4e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 616 deletions
src/main/java/cn/quantgroup/customer/rest/WorkOrderRest.java
View file @ 946f37ec
......@@ -3,7 +3,6 @@ package cn.quantgroup.customer.rest;
import cn.quantgroup.customer.model.workorder.WorkOrderStatus;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IWorkOrderService;
import cn.quantgroup.customer.util.poi.ReaderTest;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -11,7 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
/**
* @description: 工单查询
......@@ -39,19 +37,4 @@ public class WorkOrderRest {
}
@GetMapping("upload")
public JsonResult upload() throws Exception {
ReaderTest readerTest = new ReaderTest();
readerTest.read();
workOrderService.importData(readerTest.getList());
return JsonResult.buildSuccessResult("success", null);
}
public static void main(String[] args) throws IOException {
}
}
src/main/java/cn/quantgroup/customer/service/IWorkOrderService.java
View file @ 946f37ec
......@@ -5,7 +5,6 @@ import cn.quantgroup.customer.model.workorder.WorkOrderVO;
import cn.quantgroup.customer.rest.vo.JsonResult;
import org.springframework.data.domain.Page;
import java.util.List;
/**
* @description:
......@@ -15,7 +14,5 @@ import java.util.List;
public interface IWorkOrderService {
void importData(List<WorkOrderVO> list);
JsonResult<Page<WorkOrderVO>> queryWorkOrder(Integer pageNumber, Integer pageSize, String phone, WorkOrderStatus status);
}
src/main/java/cn/quantgroup/customer/service/impl/WorkOrderServiceImpl.java
View file @ 946f37ec
......@@ -3,7 +3,6 @@ package cn.quantgroup.customer.service.impl;
import cn.quantgroup.customer.entity.WorkOrder;
import cn.quantgroup.customer.model.workorder.WorkOrderVO;
import cn.quantgroup.customer.model.workorder.WorkOrderStatus;
import cn.quantgroup.customer.model.workorder.WorlOrderPriority;
import cn.quantgroup.customer.repo.WorkOrderRepo;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IWorkOrderService;
......@@ -32,57 +31,11 @@ public class WorkOrderServiceImpl implements IWorkOrderService {
@Autowired
private WorkOrderRepo workOrderRepo;
@Override
public void importData(List<WorkOrderVO> list) {
int pageSize = 10000;
// 总页数
int pages = list.size() / pageSize;
int mo = list.size() % pageSize;
if (mo > 0) {
pages++;
}
for (int currentPage = 0; currentPage < pages; currentPage++) {
List<WorkOrder> workOrders = new ArrayList<>();
for (int i = currentPage * pageSize; i < Math.min(list.size(), (currentPage + 1) * pageSize); i++) {
// 0=> [0,10000)
// 1=> [10000,20000)
final WorkOrderVO woe = list.get(i);
WorkOrder workOrder = new WorkOrder();
workOrder.setWorkOrderId(Long.valueOf(woe.getWorkOrderId()));
workOrder.setUserName(woe.getUserName());
workOrder.setPhone(woe.getPhone());
workOrder.setSubject(woe.getSubject());
workOrder.setFrom(woe.getFrom());
workOrder.setType1(woe.getType1());
workOrder.setType2(woe.getType2());
workOrder.setType3(woe.getType3());
workOrder.setPriority(WorlOrderPriority.getWorlOrderPriority(woe.getPriority()));
workOrder.setStatus(WorkOrderStatus.getWorkOrderStatus(woe.getStatus()));
workOrder.setCreateUsername(woe.getCreateUsername());
workOrder.setOpUsername(woe.getOpUsername());
workOrder.setDurationTimes(Integer.valueOf(woe.getDurationTimes()));
workOrder.setDuration(Integer.valueOf(woe.getDuration()));
workOrder.setCreatedAt(DateUtil.stringToTimestamp(woe.getCreatedAt()));
workOrder.setOpAt(DateUtil.stringToTimestamp(woe.getOpAt()));
workOrder.setUpdatedAt(DateUtil.getCurrentTimestamp());
workOrder.setRemark(woe.getRemark());
workOrders.add(workOrder);
}
workOrderRepo.save(workOrders);
}
log.info("导入完成");
}
@Override
public JsonResult<Page<WorkOrderVO>> queryWorkOrder(Integer pageNumber, Integer pageSize, String phone, WorkOrderStatus status) {
Page<WorkOrder> page = workOrderRepo.findAll((root, criteriaQuery, criteriaBuilder) -> {
List<Predicate> predicates = new ArrayList<>();
// 指定渠道号
//
if (Objects.nonNull(status)) {
predicates.add(criteriaBuilder.equal(root.get("status"), status.ordinal()));
}
......
src/main/java/cn/quantgroup/customer/util/poi/CsvReader.java deleted 100644 → 0
View file @ d6515d4e
package cn.quantgroup.customer.util.poi;
import cn.quantgroup.customer.model.workorder.WorkOrderVO;
import cn.quantgroup.customer.util.JSONTools;
import com.opencsv.CSVReader;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
/**
* @description:
* @author:tao
* @create: 2020-08-14 14:17
*/
public class CsvReader {
public static void main(String[] args) throws IOException {
try {
DataInputStream in = new DataInputStream(new FileInputStream(new File("/Users/simon/Downloads/2.csv")));
CSVReader csvReader = new CSVReader(new InputStreamReader(in, "UTF-8"));
String[] strs;
// while ((strs = csvReader.readNext()) != null) {
// System.out.println(Arrays.deepToString(strs));
//}
List<WorkOrderVO> list = new ArrayList<>();
WorkOrderVO workOrderVO = null;
while ((strs = csvReader.readNext()) != null) {
System.out.println(JSONTools.serialize(strs));
// workOrderExcel = new WorkOrderExcel();
// workOrderExcel.setWorkOrderId(strs[0]);
// workOrderExcel.setDurationTimes(strs[1]);
// workOrderExcel.setUserName(strs[2]);
// workOrderExcel.setPhone(strs[3]);
// workOrderExcel.setSubject(strs[4]);
// workOrderExcel.setFrom(strs[5]);
// workOrderExcel.setType1(strs[6]);
// workOrderExcel.setType2(strs[7]);
// workOrderExcel.setType3(strs[8]);
// workOrderExcel.setPriority(strs[9]);
// workOrderExcel.setCreateUsername(strs[10]);
// workOrderExcel.setCreatedAt(strs[11]);
// workOrderExcel.setOpUsername(strs[12]);
// workOrderExcel.setDuration(strs[13]);
// workOrderExcel.setStatus(strs[14]);
// workOrderExcel.setOpAt(strs[15]);
// workOrderExcel.setRemark(strs[16]);
// list.add(workOrderExcel);
}
// System.out.println(JSONTools.serialize(list.get(0)));
// System.out.println(JSONTools.serialize(list.get(1)));
// System.out.println(JSONTools.serialize(list.get(list.size() - 2)));
// System.out.println(JSONTools.serialize(list.get(list.size() - 1)));
csvReader.close();
} catch (Exception e) {
e.printStackTrace();
}
// List<String> list = FileUtils.readLines(new File("/Users/simon/Downloads/2.csv"));
//
// System.out.println(list.get(0));
// System.out.println(list.get(1));
// System.out.println(list.get(2));
// System.out.println(list.get(3));
// System.out.println(list.get(list.size() - 1));
// System.out.println(list.get(list.size() - 2));
}
}
src/main/java/cn/quantgroup/customer/util/poi/Reader.java deleted 100644 → 0
View file @ d6515d4e
package cn.quantgroup.customer.util.poi;
import java.util.List;
/**
* @description:
* @author:tao
* @create: 2020-08-14 11:37
*/
public interface Reader {
/**
* 数据放回接口
*
* @param filePath 文件路径
* @param sheetName sheet名称
* @param sheetIndex sheet序号
* @param curRow 行号
* @param cellList 一行的所有单元格字段
*/
void read(String filePath, String sheetName, int sheetIndex, int curRow, List<String> cellList);
}
src/main/java/cn/quantgroup/customer/util/poi/ReaderTest.java deleted 100644 → 0
View file @ d6515d4e
package cn.quantgroup.customer.util.poi;
import cn.quantgroup.customer.model.workorder.WorkOrderVO;
import cn.quantgroup.customer.util.JSONTools;
import lombok.Getter;
import java.util.ArrayList;
import java.util.List;
/**
* @author y
* @create 2018-01-19 0:13
* @desc
**/
public class ReaderTest implements Reader {
private final static String filePath = "/Users/simon/Downloads/1.xlsx";
// private final static String filePath = "/Users/simon/Downloads/work_order_created.xlsx";
private WorkOrderVO workOrderVO = null;
@Getter
private List<WorkOrderVO> list = new ArrayList<>();
public void read() throws Exception {
long start = System.currentTimeMillis();
XlsxReader excelXlsxReader = new XlsxReader(this);
int totalRows = excelXlsxReader.process(filePath);
System.out.println("总行数：" + totalRows +",耗时:" + (System.currentTimeMillis() - start));
System.out.println(JSONTools.serialize(list.get(0)));
System.out.println(JSONTools.serialize(list.get(list.size()-1)));
}
@Override
public void read(String filePath, String sheetName, int sheetIndex, int curRow, List<String> cellList) {
workOrderVO = new WorkOrderVO();
workOrderVO.setWorkOrderId(cellList.get(0));
workOrderVO.setDurationTimes(cellList.get(1));
workOrderVO.setUserName(cellList.get(2));
workOrderVO.setPhone(cellList.get(3));
workOrderVO.setSubject(cellList.get(4));
workOrderVO.setFrom(cellList.get(5));
workOrderVO.setType1(cellList.get(6));
workOrderVO.setType2(cellList.get(7));
workOrderVO.setType3(cellList.get(8));
workOrderVO.setPriority(cellList.get(9));
workOrderVO.setCreateUsername(cellList.get(10));
workOrderVO.setCreatedAt(cellList.get(11));
workOrderVO.setOpUsername(cellList.get(12));
workOrderVO.setDuration(cellList.get(13));
workOrderVO.setStatus(cellList.get(14));
workOrderVO.setOpAt(cellList.get(15));
workOrderVO.setRemark(cellList.get(16));
list.add(workOrderVO);
}
}
src/test/xiaoman/WorkOrderTest.java
View file @ 946f37ec
package xiaoman;
import cn.quantgroup.customer.Bootstrap;
import cn.quantgroup.customer.model.workorder.WorkOrderStatus;
import cn.quantgroup.customer.model.workorder.WorkOrderVO;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IWorkOrderService;
import cn.quantgroup.customer.util.JSONTools;
import cn.quantgroup.customer.util.poi.ReaderTest;
import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
......@@ -31,21 +31,10 @@ public class WorkOrderTest {
@Autowired
private IWorkOrderService workOrderService;
/**
* 导入数据
* @throws Exception
*/
@Test
public void workOrderTest() throws Exception {
ReaderTest readerTest = new ReaderTest();
readerTest.read();
workOrderService.importData(readerTest.getList());
}
@Test
public void queryPage() {
JsonResult<Page<WorkOrderVO>> pageJsonResult = workOrderService.queryWorkOrder(1, 2, null, null);
JsonResult<Page<WorkOrderVO>> pageJsonResult = workOrderService.queryWorkOrder(0, 10, "", WorkOrderStatus.CREATED);
System.out.println(JSONTools.serialize(pageJsonResult));
}
......
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