Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 503c2be2 by yangxiujun
Options

fix:修改上传

1 parent 9562cedc
Inline Side-by-side
Showing with 34 additions and 16 deletions
project-order/pom.xml
...@@ -141,11 +141,6 @@ ...@@ -141,11 +141,6 @@
</dependency> </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
project-order/src/main/java/com/dituhui/pea/order/controller/FileController.java
...@@ -101,6 +101,11 @@ public class FileController { ...@@ -101,6 +101,11 @@ public class FileController {
throw new BusinessException("用户未登录"); throw new BusinessException("用户未登录");
} }
FileRateDTO rate = orderCreateService.getsuccessRate(token); FileRateDTO rate = orderCreateService.getsuccessRate(token);
if (rate != null && (rate.getSuccessCount() == rate.getTotalCount())){
//上传成功，删除上传的进度条
orderCreateService.delRate(token);
}
if (rate == null) { if (rate == null) {
rate = new FileRateDTO(); rate = new FileRateDTO();
rate.setRate("100%"); rate.setRate("100%");
...@@ -112,7 +117,7 @@ public class FileController { ...@@ -112,7 +117,7 @@ public class FileController {
/** /**
* 订单批量模版下载 * 订单批量模版下载
* *
* @param response * @param
*/ */
@GetMapping(value = "/file/downOrder") @GetMapping(value = "/file/downOrder")
public ResponseEntity<byte[]> downOrderTemplate() { public ResponseEntity<byte[]> downOrderTemplate() {
...@@ -127,7 +132,7 @@ public class FileController { ...@@ -127,7 +132,7 @@ public class FileController {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
EasyExcel.write(outputStream, OrderInfoExcelDTO.class) EasyExcel.write(outputStream, OrderInfoExcelDTO.class)
//不设置字体 .registerWriteHandler(ExcelUtil.getDefaultWriteHandler()) .registerWriteHandler(ExcelUtil.getDefaultWriteHandler())
.registerConverter(new DateStringConverter()) .registerConverter(new DateStringConverter())
.registerConverter(new BigDecimalStringConverter()) .registerConverter(new BigDecimalStringConverter())
.sheet("工单列表").doWrite(arrayList); .sheet("工单列表").doWrite(arrayList);
......
project-order/src/main/java/com/dituhui/pea/order/feign/ISaaSRemoteService.java
...@@ -7,7 +7,7 @@ import com.dituhui.pea.pojo.saas.req.AdministrativeDistrictReq; ...@@ -7,7 +7,7 @@ import com.dituhui.pea.pojo.saas.req.AdministrativeDistrictReq;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@FeignClient(url = "${SaaS.url}", name = "saasService") @FeignClient(url = "${SaaS.urlBack}", name = "saasService")
public interface ISaaSRemoteService { public interface ISaaSRemoteService {
@PostMapping("/v1/bsh/area/add") @PostMapping("/v1/bsh/area/add")
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java
...@@ -228,7 +228,7 @@ public class FendanServiceImpl implements FendanService { ...@@ -228,7 +228,7 @@ public class FendanServiceImpl implements FendanService {
@Override @Override
public Result<OrgTeamInfo> fendanToGroupCapacity(OrderDTO.OrderCreateRequest request, Integer isDate, LocalDate targetDate, LocalTime startTime, LocalTime endTime) { public Result<OrgTeamInfo> fendanToGroupCapacity(OrderDTO.OrderCreateRequest request, Integer isDate, LocalDate targetDate, LocalTime startTime, LocalTime endTime) {
List<OrgGroupInfo> orgGroupTeamInfos = new ArrayList<>(); List<OrgGroupInfo> orgGroupTeamInfos = new ArrayList<>();
String peaBrand = fixBrand(request.getBrand()); String peaBrand = request.getBrand();
SkillInfoEntity skillInfo = skillInfoDao.getByBrandAndTypeAndSkill(peaBrand, request.getProductType(), request.getServiceType()); SkillInfoEntity skillInfo = skillInfoDao.getByBrandAndTypeAndSkill(peaBrand, request.getProductType(), request.getServiceType());
if (ObjectUtil.isNull(skillInfo)) { if (ObjectUtil.isNull(skillInfo)) {
return Result.failed(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS); return Result.failed(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS);
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java
...@@ -137,6 +137,11 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -137,6 +137,11 @@ public class OrderCreateServiceImpl implements OrderCreateService {
return tokenCount.get(token); return tokenCount.get(token);
} }
public static void delRate(String token) {
//上传成功，删除上传的进度条
tokenCount.remove(token);
}
private List<LabelValueDTO> getPriorities() { private List<LabelValueDTO> getPriorities() {
String[] priorities = {"紧急", "正常"}; String[] priorities = {"紧急", "正常"};
List<LabelValueDTO> listPriorities = new ArrayList<>(); List<LabelValueDTO> listPriorities = new ArrayList<>();
...@@ -275,9 +280,10 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -275,9 +280,10 @@ public class OrderCreateServiceImpl implements OrderCreateService {
} }
fileRateDTO.setTotalCount(cachedDataList.size()); fileRateDTO.setTotalCount(cachedDataList.size());
tokenCount.put(token,fileRateDTO); tokenCount.put(token,fileRateDTO);
try {
for (OrderInfoExcelDTO req : cachedDataList) { for (OrderInfoExcelDTO req : cachedDataList) {
OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId()); OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
String peaBrand = CommonUtil.fixBrand(req.getBrand()); String peaBrand = req.getBrand();
if (ObjectUtil.isNotNull(byOrderId)) { if (ObjectUtil.isNotNull(byOrderId)) {
OrderInfoErrorExcelDTO orderInfoError = new OrderInfoErrorExcelDTO(); OrderInfoErrorExcelDTO orderInfoError = new OrderInfoErrorExcelDTO();
BeanUtil.copyProperties(req, orderInfoError); BeanUtil.copyProperties(req, orderInfoError);
...@@ -356,7 +362,18 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -356,7 +362,18 @@ public class OrderCreateServiceImpl implements OrderCreateService {
request.setLocation(location); request.setLocation(location);
// 分单处理 // 分单处理
Result<OrgTeamInfo> fendanResult = fendanService.fendanToGroupCapacity(request, 2, entity.getExpectTimeBegin().toLocalDate(), entity.getExpectTimeBegin().toLocalTime(), entity.getExpectTimeEnd().toLocalTime()); Result<OrgTeamInfo> fendanResult = null;
try {
fendanResult = fendanService.fendanToGroupCapacity(request, 2, entity.getExpectTimeBegin().toLocalDate(), entity.getExpectTimeBegin().toLocalTime(), entity.getExpectTimeEnd().toLocalTime());
} catch (Exception e) {
OrderInfoErrorExcelDTO orderInfoError = new OrderInfoErrorExcelDTO();
BeanUtil.copyProperties(req, orderInfoError);
orderInfoError.setError("地址解析失败");
errorList.add(orderInfoError);
fileRateDTO.setErrorCount((fileRateDTO.getErrorCount() == null ? 0 : fileRateDTO.getErrorCount() )+1);
tokenCount.put(token,fileRateDTO);
continue;
}
if (fendanResult.getCode().equals(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS.getCode())) { if (fendanResult.getCode().equals(StatusCodeEnum.ORDER_SKILL_NOT_EXISTS.getCode())) {
OrderInfoErrorExcelDTO orderInfoError = new OrderInfoErrorExcelDTO(); OrderInfoErrorExcelDTO orderInfoError = new OrderInfoErrorExcelDTO();
BeanUtil.copyProperties(req, orderInfoError); BeanUtil.copyProperties(req, orderInfoError);
...@@ -450,19 +467,19 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -450,19 +467,19 @@ public class OrderCreateServiceImpl implements OrderCreateService {
fileRateDTO.setSuccessCount((fileRateDTO.getSuccessCount() == null ? 0 : fileRateDTO.getSuccessCount() )+1); fileRateDTO.setSuccessCount((fileRateDTO.getSuccessCount() == null ? 0 : fileRateDTO.getSuccessCount() )+1);
tokenCount.put(token,fileRateDTO); tokenCount.put(token,fileRateDTO);
try { try {
Thread.sleep(1000*20); Thread.sleep(1000*5);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
if (successCount == cachedDataList.size()) { } catch (Exception e) {
//上传成功，删除上传的进度条
tokenCount.remove(token); tokenCount.remove(token);
throw new BusinessException("订单上传异常");
} }
if (errorList.size() > 0) { if (errorList.size() > 0) {
tokenCount.remove(token);
if (errorList != null && errorList.size() > 0) { if (errorList != null && errorList.size() > 0) {
try { try {
......
project-order/src/main/resources/application.yaml
...@@ -62,6 +62,7 @@ sentry: ...@@ -62,6 +62,7 @@ sentry:
exception-resolver-order: -2147483647 exception-resolver-order: -2147483647
SaaS: SaaS:
urlBack: http://119.3.39.114:8034
url: http://119.3.39.114:8100 url: http://119.3.39.114:8100
ak: 216d013687ba46f5ad990e9380ec56c6 ak: 216d013687ba46f5ad990e9380ec56c6
userAccount: 1YL+MfLj/Oy70Dvbvn3mYg== userAccount: 1YL+MfLj/Oy70Dvbvn3mYg==
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!