Skip to content

yangxiujun / paidan_demo

Go to a project
Commit f4c7eb5a by 丁伟峰
Options

DTO优化，在原先response的class内部使用static class的基础上，在每一个DTO文件中，统一定义Request，Result

1 parent 18a07ac6
Inline Side-by-side
Showing with 166 additions and 176 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/CapacityController.java
...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.controller; ...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException; import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO; import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.dituhui.pea.order.service.CapacityQueryService; import com.dituhui.pea.order.service.CapacityQueryService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -16,7 +16,7 @@ public class CapacityController { ...@@ -16,7 +16,7 @@ public class CapacityController {
private CapacityQueryService capacityQueryService; private CapacityQueryService capacityQueryService;
@GetMapping("/capacity/query") @GetMapping("/capacity/query")
public Result<?> capacityQuery(@Validated CapacityStatQueryReqDTO reqDTO) { public Result<?> capacityQuery(@Validated CapacityStatQueryDTO.Request reqDTO) {
Result<?> res = null; Result<?> res = null;
try { try {
res = capacityQueryService.getTeamStatData(reqDTO); res = capacityQueryService.getTeamStatData(reqDTO);
......
project-order/src/main/java/com/dituhui/pea/order/controller/OrderCreateController.java
...@@ -19,7 +19,7 @@ package com.dituhui.pea.order.controller; ...@@ -19,7 +19,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException; import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderCreateReqDTO; import com.dituhui.pea.order.dto.OrderCreateReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO; import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.service.OrderCreateService; import com.dituhui.pea.order.service.OrderCreateService;
import com.dituhui.pea.order.service.CapacityQueryService; import com.dituhui.pea.order.service.CapacityQueryService;
...@@ -60,10 +60,10 @@ public class OrderCreateController { ...@@ -60,10 +60,10 @@ public class OrderCreateController {
} }
@PostMapping("/order/service/capacity/query") @PostMapping("/order/service/capacity/query")
public Result<?> capacityQuery(@Validated @RequestBody CapacityOrderQueryReqDTO capacityQueryReqDTO) { public Result<?> capacityQuery(@Validated @RequestBody CapacityOrderQueryDTO.Request reqDTO) {
Result<?> res = null; Result<?> res = null;
try { try {
res = capacityQueryService.getOneCapacityData(capacityQueryReqDTO); res = capacityQueryService.getOneCapacityData(reqDTO);
} catch (BusinessException e) { } catch (BusinessException e) {
return Result.failed(e.getMessage()); return Result.failed(e.getMessage());
} }
......
project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.controller; ...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException; import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.OrderChangeListReqDTO; import com.dituhui.pea.order.dto.OrderChangeListDTO;
import com.dituhui.pea.order.service.WorkbenchService; import com.dituhui.pea.order.service.WorkbenchService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,7 +20,7 @@ public class WorkbenchController { ...@@ -20,7 +20,7 @@ public class WorkbenchController {
WorkbenchService workbenchService; WorkbenchService workbenchService;
@GetMapping("/workbench/serviceOrder/change/list") @GetMapping("/workbench/serviceOrder/change/list")
public Result<?> orderChangeList(@Validated OrderChangeListReqDTO reqDTO) { public Result<?> orderChangeList(@Validated OrderChangeListDTO.Request reqDTO) {
Result<?> res = null; Result<?> res = null;
try { try {
res = workbenchService.getOrderChangeList(reqDTO); res = workbenchService.getOrderChangeList(reqDTO);
......
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryDTO.java
...@@ -3,17 +3,40 @@ package com.dituhui.pea.order.dto; ...@@ -3,17 +3,40 @@ package com.dituhui.pea.order.dto;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Data
@Accessors(chain = true)
public class CapacityOrderQueryRespDTO {
private String startDate;
private String endDate;
private String remark;
private List<LegendDTO> legend;
private List<CalendarDTO> calendar;
public class CapacityOrderQueryDTO {
@Data
public static class Request {
@NotNull(message = "location不能为空")
private String location;
private String address;
@NotNull(message = "brand不能为空")
private String brand;
@NotNull(message = "type不能为空")
private String type;
@NotNull(message = "skill不能为空")
private String skill;
@NotNull(message = "startDate不能为空")
private String startDate;
@NotNull(message = "endDate不能为空")
private String endDate;
}
@Data
@Accessors(chain = true)
public static class Result {
private String startDate;
private String endDate;
private String remark;
private List<LegendDTO> legend;
private List<CalendarDTO> calendar;
}
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityOrderQueryReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class CapacityOrderQueryReqDTO {
@NotNull(message = "location不能为空")
private String location;
private String address;
@NotNull(message = "brand不能为空")
private String brand;
@NotNull(message = "type不能为空")
private String type;
@NotNull(message = "skill不能为空")
private String skill;
@NotNull(message = "startDate不能为空")
private String startDate;
@NotNull(message = "endDate不能为空")
private String endDate;
}
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java
package com.dituhui.pea.order.dto; package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
...@@ -7,18 +8,43 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; ...@@ -7,18 +8,43 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@lombok.Data public class CapacityStatQueryDTO {
@Accessors(chain = true)
public class CapacityStatQueryRespDTO { @lombok.Data
private List<?> content; public static class Request {
private String levelType; @NotBlank
private long pageCurrent; private String startDate;
private long pages;
private long pageSize; @NotBlank
private long total; private String endDate;
/**
* cluster/branch/group
*/
@NotBlank
private String levelType;
/**
* clusterId/branchId/groupId
*/
@NotBlank
private String levelValue;
private Integer page = OrderConfig.DEFAULT_PAGE_INDEX;
private Integer size = OrderConfig.DEFAULT_PAGE_SIZE;
}
@lombok.Data
@Accessors(chain = true)
public static class Result {
private List<?> content;
private String levelType;
private long pageCurrent;
private long pages;
private long pageSize;
private long total;
}
@lombok.Data @lombok.Data
@Accessors(chain = true) @Accessors(chain = true)
...@@ -44,5 +70,3 @@ public class CapacityStatQueryRespDTO { ...@@ -44,5 +70,3 @@ public class CapacityStatQueryRespDTO {
} }
} }
} }
project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
@lombok.Data
public class CapacityStatQueryReqDTO {
@NotBlank
private String startDate;
@NotBlank
private String endDate;
/**
* cluster/branch/group
*/
@NotBlank
private String levelType;
/**
* clusterId/branchId/groupId
*/
@NotBlank
private String levelValue;
private Integer page = OrderConfig.DEFAULT_PAGE_INDEX;
private Integer size = OrderConfig.DEFAULT_PAGE_SIZE;
}
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListDTO.java
package com.dituhui.pea.order.dto; package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
...@@ -7,17 +8,45 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; ...@@ -7,17 +8,45 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@lombok.Data
@Accessors(chain = true) public class OrderChangeListDTO {
public class OrderChangeListRespDTO {
private List<?> content; @lombok.Data
private long pageCurrent; public static class Request {
private long pages; /**
private long pageSize; * 查询范围：root/cluster/branch/group
private long total; */
private String levelType;
/**
* levelType对应的id值
*/
private String levelValue;
private int page = OrderConfig.DEFAULT_PAGE_INDEX;
private int size = OrderConfig.DEFAULT_PAGE_SIZE;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate date = LocalDate.now();
/**
* 排序
*/
private String sort;
}
@lombok.Data
@Accessors(chain = true)
public static class Result {
private List<?> content;
private long pageCurrent;
private long pages;
private long pageSize;
private long total;
}
@lombok.Data @lombok.Data
@Accessors(chain = true) @Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/dto/OrderChangeListReqDTO.java deleted 100644 → 0
package com.dituhui.pea.order.dto;
import com.dituhui.pea.order.config.OrderConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import java.time.LocalDate;
@lombok.Data
public class OrderChangeListReqDTO {
/**
* 查询范围：root/cluster/branch/group
*/
private String levelType;
/**
* levelType对应的id值
*/
private String levelValue;
private int page = OrderConfig.DEFAULT_PAGE_INDEX;
private int size = OrderConfig.DEFAULT_PAGE_SIZE;
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate date = LocalDate.now();
/**
* 排序
*/
private String sort;
}
project-order/src/main/java/com/dituhui/pea/order/dto/PubParameterRespDTO.java → project-order/src/main/java/com/dituhui/pea/order/dto/PubParameterDTO.java
...@@ -4,9 +4,12 @@ import lombok.experimental.Accessors; ...@@ -4,9 +4,12 @@ import lombok.experimental.Accessors;
import java.util.List; import java.util.List;
@lombok.Data public class PubParameterDTO {
public class PubParameterRespDTO {
private List<?> enums; @lombok.Data
public static class Result {
private List<?> enums;
}
@lombok.Data @lombok.Data
@Accessors(chain = true) @Accessors(chain = true)
......
project-order/src/main/java/com/dituhui/pea/order/service/CapacityQueryService.java
package com.dituhui.pea.order.service; package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO; import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO; import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
public interface CapacityQueryService { public interface CapacityQueryService {
...@@ -13,7 +13,7 @@ public interface CapacityQueryService { ...@@ -13,7 +13,7 @@ public interface CapacityQueryService {
* @return * @return
* @throws JsonProcessingException * @throws JsonProcessingException
*/ */
Result<?> getOneCapacityData(CapacityOrderQueryReqDTO capacityQueryReqDTO); Result<?> getOneCapacityData(CapacityOrderQueryDTO.Request capacityQueryReqDTO);
Result<?> getTeamStatData(CapacityStatQueryReqDTO capacityStatQueryReqDTO); Result<?> getTeamStatData(CapacityStatQueryDTO.Request capacityStatQueryReqDTO);
} }
project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
package com.dituhui.pea.order.service; package com.dituhui.pea.order.service;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dto.EngineersGanttReqDTO; import com.dituhui.pea.order.dto.OrderChangeListDTO;
import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
public interface WorkbenchService { public interface WorkbenchService {
Result<?> getOrderChangeList(OrderChangeListReqDTO orderChangeListReqDTO); Result<?> getOrderChangeList(OrderChangeListDTO.Request orderChangeListReqDTO);
} }
project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
...@@ -3,10 +3,8 @@ package com.dituhui.pea.order.service.impl; ...@@ -3,10 +3,8 @@ package com.dituhui.pea.order.service.impl;
import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.*; import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO; import com.dituhui.pea.order.dto.CapacityOrderQueryDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryRespDTO; import com.dituhui.pea.order.dto.CapacityStatQueryDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryRespDTO;
import com.dituhui.pea.order.entity.*; import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.CapacityQueryService; import com.dituhui.pea.order.service.CapacityQueryService;
import com.dituhui.pea.order.service.CommonService; import com.dituhui.pea.order.service.CommonService;
...@@ -54,30 +52,30 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -54,30 +52,30 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
private OrgBranchDao orgBranchDao; private OrgBranchDao orgBranchDao;
@Override @Override
public Result<?> getOneCapacityData(CapacityOrderQueryReqDTO reqDTO) { public Result<?> getOneCapacityData(CapacityOrderQueryDTO.Request reqDTO) {
// 单条容量查询 // 单条容量查询
log.info("===> getOneCapacityData()"); log.info("===> getOneCapacityData()");
String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill()); String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill());
String teamId = commonService.getTeamIdByInput(reqDTO.getLocation(), reqDTO.getAddress(), layer); String teamId = commonService.getTeamIdByInput(reqDTO.getLocation(), reqDTO.getAddress(), layer);
log.info("teamId[{}]layer[{}]", teamId, layer); log.info("teamId[{}]layer[{}]", teamId, layer);
CapacityOrderQueryRespDTO capacityQueryRespDTO = new CapacityOrderQueryRespDTO(); CapacityOrderQueryDTO.Result rs = new CapacityOrderQueryDTO.Result();
capacityQueryRespDTO.setStartDate(reqDTO.getStartDate()).setEndDate(reqDTO.getEndDate()); rs.setStartDate(reqDTO.getStartDate()).setEndDate(reqDTO.getEndDate());
capacityQueryRespDTO.setCalendar(getTeamCapacityByLayerAndDays(teamId, layer, reqDTO.getStartDate(), reqDTO.getEndDate())); rs.setCalendar(getTeamCapacityByLayerAndDays(teamId, layer, reqDTO.getStartDate(), reqDTO.getEndDate()));
capacityQueryRespDTO.setLegend(getLengends()); rs.setLegend(getLengends());
capacityQueryRespDTO.setRemark(String.format("%s-%s", teamId, layer)); rs.setRemark(String.format("%s-%s", teamId, layer));
return Result.success(capacityQueryRespDTO); return Result.success(rs);
} }
private List<CapacityOrderQueryRespDTO.LegendDTO> getLengends() { private List<CapacityOrderQueryDTO.LegendDTO> getLengends() {
List<CapacityOrderQueryRespDTO.LegendDTO> legends = new ArrayList<>(); List<CapacityOrderQueryDTO.LegendDTO> legends = new ArrayList<>();
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(1).setMemo("剩余30%以上")); legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(1).setMemo("剩余30%以上"));
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(2).setMemo("剩余60%以上")); legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(2).setMemo("剩余60%以上"));
legends.add(new CapacityOrderQueryRespDTO.LegendDTO().setType(3).setMemo("剩余30%以内")); legends.add(new CapacityOrderQueryDTO.LegendDTO().setType(3).setMemo("剩余30%以内"));
return legends; return legends;
} }
@Override @Override
public Result<?> getTeamStatData(CapacityStatQueryReqDTO reqDTO) { public Result<?> getTeamStatData(CapacityStatQueryDTO.Request reqDTO) {
// 根据大区/分部/分站查询，分别返回分部/分站/工作队的容量 // 根据大区/分部/分站查询，分别返回分部/分站/工作队的容量
Page<?> stats = null; Page<?> stats = null;
Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize()); Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
...@@ -105,13 +103,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -105,13 +103,13 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
log.info("levelType: {} ==> teamIds: {}", levelType, teamIds); log.info("levelType: {} ==> teamIds: {}", levelType, teamIds);
stats = capacityTeamStatDao.findByTeamIdsAndWorkdayBetween(teamIds, reqDTO.getStartDate(), reqDTO.getEndDate(), pageable); stats = capacityTeamStatDao.findByTeamIdsAndWorkdayBetween(teamIds, reqDTO.getStartDate(), reqDTO.getEndDate(), pageable);
} }
CapacityStatQueryRespDTO data = new CapacityStatQueryRespDTO(); CapacityStatQueryDTO.Result rs = new CapacityStatQueryDTO.Result();
data.setLevelType(levelType); rs.setLevelType(levelType);
data.setTotal(stats.getTotalElements()).setPages(stats.getTotalPages()).setPageSize(pageable.getPageSize()).setPageCurrent(stats.getNumber()); rs.setTotal(stats.getTotalElements()).setPages(stats.getTotalPages()).setPageSize(pageable.getPageSize()).setPageCurrent(stats.getNumber());
List<CapacityStatQueryRespDTO.Content> contents = new ArrayList<>(); List<CapacityStatQueryDTO.Content> contents = new ArrayList<>();
for (Object item : stats.getContent()) { for (Object item : stats.getContent()) {
CapacityStatQueryRespDTO.Content content = new CapacityStatQueryRespDTO.Content(); CapacityStatQueryDTO.Content content = new CapacityStatQueryDTO.Content();
if (item instanceof CapacityOrgStatEntity) { if (item instanceof CapacityOrgStatEntity) {
// cluster/branch查询，都是capacity_org_stat // cluster/branch查询，都是capacity_org_stat
CapacityOrgStatEntity e = (CapacityOrgStatEntity) item; CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
...@@ -133,10 +131,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -133,10 +131,10 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
contents.add(content); contents.add(content);
} }
contents.stream().sorted( contents.stream().sorted(
Comparator.comparing(CapacityStatQueryRespDTO.Content::getDate)).collect(Collectors.toList()); Comparator.comparing(CapacityStatQueryDTO.Content::getDate)).collect(Collectors.toList());
data.setContent(contents); rs.setContent(contents);
return Result.success(data); return Result.success(rs);
} }
private int getSpanType(int capLeft, int capTotal) { private int getSpanType(int capLeft, int capTotal) {
...@@ -176,23 +174,23 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -176,23 +174,23 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
* @param endDate * @param endDate
* @return * @return
*/ */
private List<CapacityOrderQueryRespDTO.CalendarDTO> getTeamCapacityByLayerAndDays(String teamId, String layer, String beginDate, String endDate) { private List<CapacityOrderQueryDTO.CalendarDTO> getTeamCapacityByLayerAndDays(String teamId, String layer, String beginDate, String endDate) {
log.info("==> getTimeRangeByTeamSkill({}, {}, {}, {})", teamId, layer, beginDate, endDate); log.info("==> getTimeRangeByTeamSkill({}, {}, {}, {})", teamId, layer, beginDate, endDate);
Map<String, CapacityOrderQueryRespDTO.CalendarDTO> dayMaps = new HashMap<>(); Map<String, CapacityOrderQueryDTO.CalendarDTO> dayMaps = new HashMap<>();
List<CapacityTeamStatEntity> capacityTeamStatEntityList = capacityTeamStatDao.findAllByTeamIdAndLayerAndWorkdayBetween(teamId, layer, beginDate, endDate); List<CapacityTeamStatEntity> capacityTeamStatEntityList = capacityTeamStatDao.findAllByTeamIdAndLayerAndWorkdayBetween(teamId, layer, beginDate, endDate);
for (CapacityTeamStatEntity e : capacityTeamStatEntityList) { for (CapacityTeamStatEntity e : capacityTeamStatEntityList) {
log.info("CapacityTeamStatEntity ==> {}", e); log.info("CapacityTeamStatEntity ==> {}", e);
CapacityOrderQueryRespDTO.TimeDTO timeDTO = new CapacityOrderQueryRespDTO.TimeDTO(); CapacityOrderQueryDTO.TimeDTO timeDTO = new CapacityOrderQueryDTO.TimeDTO();
timeDTO.setType(getSpanType(e.getCapLeft(), e.getCapTotal())); timeDTO.setType(getSpanType(e.getCapLeft(), e.getCapTotal()));
Object[] timeSpans = getTimeSpanInfo(e.getWorkday(), e.getTimeSpan(), e.getTimeSpanDetail()); Object[] timeSpans = getTimeSpanInfo(e.getWorkday(), e.getTimeSpan(), e.getTimeSpanDetail());
timeDTO.setText((String) timeSpans[0]); timeDTO.setText((String) timeSpans[0]);
timeDTO.setBegin((String) timeSpans[1]); timeDTO.setBegin((String) timeSpans[1]);
timeDTO.setEnd((String) timeSpans[2]); timeDTO.setEnd((String) timeSpans[2]);
CapacityOrderQueryRespDTO.CalendarDTO calendarDTO = null; CapacityOrderQueryDTO.CalendarDTO calendarDTO = null;
if (dayMaps.containsKey(e.getWorkday())) { if (dayMaps.containsKey(e.getWorkday())) {
calendarDTO = dayMaps.get(e.getWorkday()); calendarDTO = dayMaps.get(e.getWorkday());
} else { } else {
calendarDTO = new CapacityOrderQueryRespDTO.CalendarDTO(); calendarDTO = new CapacityOrderQueryDTO.CalendarDTO();
calendarDTO.setDate(e.getWorkday()).setWeek(getWeekday(e.getWorkday())); calendarDTO.setDate(e.getWorkday()).setWeek(getWeekday(e.getWorkday()));
calendarDTO.setTimes(new ArrayList<>()); calendarDTO.setTimes(new ArrayList<>());
} }
...@@ -200,7 +198,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -200,7 +198,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
dayMaps.put(e.getWorkday(), calendarDTO); dayMaps.put(e.getWorkday(), calendarDTO);
} }
return new ArrayList<>(dayMaps.values()).stream() return new ArrayList<>(dayMaps.values()).stream()
.sorted(Comparator.comparing(CapacityOrderQueryRespDTO.CalendarDTO::getDate)).collect(Collectors.toList()); .sorted(Comparator.comparing(CapacityOrderQueryDTO.CalendarDTO::getDate)).collect(Collectors.toList());
} }
private String getWeekday(String day) { private String getWeekday(String day) {
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/PublicServiceImpl.java
...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.service.impl; ...@@ -2,7 +2,7 @@ package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.PubParamsDao; import com.dituhui.pea.order.dao.PubParamsDao;
import com.dituhui.pea.order.dto.PubParameterRespDTO; import com.dituhui.pea.order.dto.PubParameterDTO;
import com.dituhui.pea.order.entity.PubParamsEntity; import com.dituhui.pea.order.entity.PubParamsEntity;
import com.dituhui.pea.order.service.PublicService; import com.dituhui.pea.order.service.PublicService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -22,24 +22,24 @@ public class PublicServiceImpl implements PublicService { ...@@ -22,24 +22,24 @@ public class PublicServiceImpl implements PublicService {
@Override @Override
public Result<?> getPublicParameter() { public Result<?> getPublicParameter() {
List<PubParameterRespDTO.Enum> enums = new ArrayList<>(); List<PubParameterDTO.Enum> enums = new ArrayList<>();
HashMap<String, String> mapping = getMapping(); HashMap<String, String> mapping = getMapping();
for (String k : mapping.keySet()) { for (String k : mapping.keySet()) {
List<?> items = pubParamsDao.findByBiztype(k); List<?> items = pubParamsDao.findByBiztype(k);
if (!items.isEmpty()) { if (!items.isEmpty()) {
PubParameterRespDTO.Enum anEnum = new PubParameterRespDTO.Enum().setName(k).setDescription(mapping.get(k)); PubParameterDTO.Enum anEnum = new PubParameterDTO.Enum().setName(k).setDescription(mapping.get(k));
List<PubParameterRespDTO.Item> items2 = new ArrayList<>(); List<PubParameterDTO.Item> items2 = new ArrayList<>();
for (Object e : items) { for (Object e : items) {
PubParamsEntity param = (PubParamsEntity) e; PubParamsEntity param = (PubParamsEntity) e;
items2.add(new PubParameterRespDTO.Item().setLabel(param.getDescription()).setValue(param.getPvalue())); items2.add(new PubParameterDTO.Item().setLabel(param.getDescription()).setValue(param.getPvalue()));
} }
anEnum.setItems(items2); anEnum.setItems(items2);
enums.add(anEnum); enums.add(anEnum);
} }
} }
PubParameterRespDTO data = new PubParameterRespDTO(); PubParameterDTO.Result rs = new PubParameterDTO.Result();
data.setEnums(enums); rs.setEnums(enums);
return Result.success(data); return Result.success(rs);
} }
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
...@@ -2,8 +2,7 @@ package com.dituhui.pea.order.service.impl; ...@@ -2,8 +2,7 @@ package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.order.dao.*; import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.OrderChangeListReqDTO; import com.dituhui.pea.order.dto.OrderChangeListDTO;
import com.dituhui.pea.order.dto.OrderChangeListRespDTO;
import com.dituhui.pea.order.entity.OrderChangeEntity; import com.dituhui.pea.order.entity.OrderChangeEntity;
import com.dituhui.pea.order.entity.OrderRequestEntity; import com.dituhui.pea.order.entity.OrderRequestEntity;
import com.dituhui.pea.order.service.WorkbenchService; import com.dituhui.pea.order.service.WorkbenchService;
...@@ -37,7 +36,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -37,7 +36,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
private OrderEventDao orderEventDao; private OrderEventDao orderEventDao;
@Override @Override
public Result<?> getOrderChangeList(OrderChangeListReqDTO reqDTO) { public Result<?> getOrderChangeList(OrderChangeListDTO.Request reqDTO) {
Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize()); Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
Page<?> changes; Page<?> changes;
String levelType = reqDTO.getLevelType(); String levelType = reqDTO.getLevelType();
...@@ -49,10 +48,10 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -49,10 +48,10 @@ public class WorkbenchServiceImpl implements WorkbenchService {
} else { } else {
changes = orderEventDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable); changes = orderEventDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
} }
List<OrderChangeListRespDTO.Content> contents = new ArrayList<>(); List<OrderChangeListDTO.Content> contents = new ArrayList<>();
for (Object e1 : changes.getContent()) { for (Object e1 : changes.getContent()) {
OrderChangeEntity e = (OrderChangeEntity) e1; OrderChangeEntity e = (OrderChangeEntity) e1;
OrderChangeListRespDTO.Content content = new OrderChangeListRespDTO.Content(); OrderChangeListDTO.Content content = new OrderChangeListDTO.Content();
OrderRequestEntity orderRequestEntity = orderRequestDao.getByOrderId(e.getOrderId()); OrderRequestEntity orderRequestEntity = orderRequestDao.getByOrderId(e.getOrderId());
content.setOrderId(e.getOrderId()) content.setOrderId(e.getOrderId())
.setCustomerName(orderRequestEntity.getName()) .setCustomerName(orderRequestEntity.getName())
...@@ -62,11 +61,11 @@ public class WorkbenchServiceImpl implements WorkbenchService { ...@@ -62,11 +61,11 @@ public class WorkbenchServiceImpl implements WorkbenchService {
.setUpdateTime(e.getUpdateTime()); .setUpdateTime(e.getUpdateTime());
contents.add(content); contents.add(content);
} }
OrderChangeListRespDTO respDTO = new OrderChangeListRespDTO(); OrderChangeListDTO.Result rs = new OrderChangeListDTO.Result();
respDTO.setTotal(changes.getTotalElements()) rs.setTotal(changes.getTotalElements())
.setPages(changes.getTotalPages()) .setPages(changes.getTotalPages())
.setPageSize(changes.getSize()) .setPageSize(changes.getSize())
.setContent(contents); .setContent(contents);
return Result.success(respDTO); return Result.success(rs);
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!