mp2jpa

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -17,9 +17,11 @@ import com.dituhui.pea.order.service.DispatchService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.criteria.Predicate;
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -41,16 +43,19 @@ public class DispatchServiceImpl implements DispatchService {
 	private OrderInfoMPDao orderInfoMPDao;
 
 	@Autowired
-	private OrgTeamMPDao orgTeamMPDao;
+	private OrgTeamDao orgTeamDao;
 
 	@Autowired
 	private EngineerInfoMPDao engineerInfoMPDao;
 
 	@Autowired
-	private SkillInfoMPDao skillInfoMPDao;
+	private EngineerInfoDao engineerInfoDao;
 
 	@Autowired
-	private CapacityEngineerStatMPDao capacityEngineerStatMPDao;
+	private SkillInfoDao skillInfoDao;
+
+	@Autowired
+	private CapacityEngineerStatDao capacityEngineerStatDao;
 
 	@Transactional
 	@Override
@@ -58,7 +63,7 @@ public class DispatchServiceImpl implements DispatchService {
 		// 获取派工台订单列表
 
 		// 获取技能信息
-		HashMap<String, SkillInfo> skillInfo = this.querySkillInfo();
+		HashMap<String, SkillInfoEntity> skillInfo = this.querySkillInfo();
 
 		// 获取工单列表
 		List<OrderInfo> orders = this.queryOrders(reqDTO);
@@ -80,7 +85,7 @@ public class DispatchServiceImpl implements DispatchService {
 			item.setApplyNote(o.getApplyNote());
 
 			String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
-			SkillInfo skill = skillInfo.get(key);
+			SkillInfoEntity skill = skillInfo.get(key);
 			if (skill != null) {
 				item.setDuration(skill.getTakeTime());
 				item.setSkillCategory(skill.getSkillCategory());
@@ -125,7 +130,7 @@ public class DispatchServiceImpl implements DispatchService {
 		LocalDate date = TimeUtils.IsoDate2LocalDate(reqDTO.getDate());
 
 		// 获取技能信息
-		HashMap<String, SkillInfo> skillInfo = this.querySkillInfo();
+		HashMap<String, SkillInfoEntity> skillInfo = this.querySkillInfo();
 
 		// 获取teamIds
 		List<String> teamIds = this.queryOrgTeamIds(reqDTO.getLevelType(), reqDTO.getLevelValue(), reqDTO.getBranchIds(),
@@ -152,7 +157,7 @@ public class DispatchServiceImpl implements DispatchService {
 		Map<String, List<OrderInfo>> engineerOrders = this.queryEngineerOrders(engineerCodes, date);
 
 		// 获取技术员的容量
-		HashMap<String, CapacityEngineerStat> engineerCap = this.queryCapacityEngineerStat(engineerCodes, reqDTO.getDate());
+		HashMap<String, CapacityEngineerStatEntity> engineerCap = this.queryCapacityEngineerStat(engineerCodes, reqDTO.getDate());
 
 		// 获取技术员已指派单列表
 		List<DispatchEngineerOrderListResp.EngineerInfo> egs = new ArrayList<>();
@@ -175,7 +180,7 @@ public class DispatchServiceImpl implements DispatchService {
 				item.setApplyNote(o.getApplyNote());
 
 				String key = String.format("%s%s%s", o.getBrand(), o.getType(), o.getSkill());
-				SkillInfo skill = skillInfo.get(key);
+				SkillInfoEntity skill = skillInfo.get(key);
 				if (skill != null) {
 					item.setDuration(skill.getTakeTime());
 					item.setSkillCategory(skill.getSkillCategory());
@@ -213,7 +218,7 @@ public class DispatchServiceImpl implements DispatchService {
 			int capUsed = 0;
 			int capTotal = 0;
 			String capacityStatus = "less";
-			CapacityEngineerStat cap = engineerCap.get(e.getEngineerCode());
+			CapacityEngineerStatEntity cap = engineerCap.get(e.getEngineerCode());
 			if (cap != null) {
 				capUsed = cap.getCapUsed();
 				capTotal = cap.getCapTotal();
@@ -243,7 +248,7 @@ public class DispatchServiceImpl implements DispatchService {
 
 		LocalDate localDate = TimeUtils.IsoDate2LocalDate(date);
 
-		EngineerInfo engineer = engineerInfoMPDao.getByEngineerCode(engineerCode);
+		EngineerInfoEntity engineer = engineerInfoDao.getByEngineerCode(engineerCode);
 		if (engineer == null) {
 			throw new BusinessException("技术员不存在");
 		}
@@ -385,46 +390,56 @@ public class DispatchServiceImpl implements DispatchService {
 	}
 
 	private List<String> queryOrgTeamIds(String levelType, String levelIds, List<String> branchIds, List<String> groupIds, List<String> teamIds) {
-		LambdaQueryWrapper<OrgTeam> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(levelType.equals("cluster"), OrgTeam::getClusterId, levelIds);
-		lqw.eq(levelType.equals("branch"), OrgTeam::getBranchId, levelIds);
-		lqw.eq(levelType.equals("group"), OrgTeam::getGroupId, levelIds);
-		lqw.in(ListUtils.isNotEmpty(branchIds), OrgTeam::getBranchId, branchIds);
-		lqw.in(ListUtils.isNotEmpty(groupIds), OrgTeam::getGroupId, groupIds);
-		lqw.in(ListUtils.isNotEmpty(teamIds), OrgTeam::getTeamId, teamIds);
 
-		List<OrgTeam> teams = orgTeamMPDao.selectList(lqw);
-		return teams.stream().map(OrgTeam::getTeamId).collect(Collectors.toList());
+		Specification<OrgTeamEntity> specification = (root, query, criteriaBuilder) -> {
+			List<Predicate> predicates = new ArrayList<>();
+			if ("cluster".equals(levelType)) {
+				predicates.add(criteriaBuilder.in(root.get("clusterId")).value(levelIds));
+			} else if ("branch".equals(levelType)) {
+				predicates.add(criteriaBuilder.in(root.get("branchId")).value(levelIds));
+			} else if ("group".equals(levelType)) {
+				predicates.add(criteriaBuilder.in(root.get("groupId")).value(levelIds));
+			}
+			if (ListUtils.isNotEmpty(branchIds)) {
+				predicates.add(root.get("branchId").in(branchIds));
+			}
+			if (ListUtils.isNotEmpty(groupIds)) {
+				predicates.add(root.get("groupId").in(groupIds));
+			}
+			if (ListUtils.isNotEmpty(teamIds)) {
+				predicates.add(root.get("teamId").in(teamIds));
+			}
+			return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+		};
+		List<OrgTeamEntity> teams =  orgTeamDao.findAll(specification);
+		return teams.stream().map(OrgTeamEntity::getTeamId).collect(Collectors.toList());
 	}
 
 	private HashMap<String, Integer> querySkillTakeTime() {
 		HashMap<String, Integer> map = new HashMap<>();
-		List<SkillInfo> records = skillInfoMPDao.selectList(null);
-		for (SkillInfo r : records) {
+		List<SkillInfoEntity> records = skillInfoDao.findAll();
+		for (SkillInfoEntity r : records) {
 			String key = String.format("%s%s%s", r.getBrand(), r.getType(), r.getSkill());
 			map.put(key, r.getTakeTime());
 		}
 		return map;
 	}
 
-	private HashMap<String, SkillInfo> querySkillInfo() {
-		HashMap<String, SkillInfo> map = new HashMap<>();
-		List<SkillInfo> records = skillInfoMPDao.selectList(null);
-		for (SkillInfo r : records) {
+	private HashMap<String, SkillInfoEntity> querySkillInfo() {
+		HashMap<String, SkillInfoEntity> map = new HashMap<>();
+		List<SkillInfoEntity> records = skillInfoDao.findAll();
+		for (SkillInfoEntity r : records) {
 			String key = String.format("%s%s%s", r.getBrand(), r.getType(), r.getSkill());
 			map.put(key, r);
 		}
 		return map;
 	}
 
-	private HashMap<String, CapacityEngineerStat> queryCapacityEngineerStat(List<String> engineerCodes, String date) {
-		LambdaQueryWrapper<CapacityEngineerStat> lqw = new LambdaQueryWrapper<>();
-		lqw.eq(CapacityEngineerStat::getWorkday, date);
-		lqw.in(CapacityEngineerStat::getEngineerCode, engineerCodes);
-		List<CapacityEngineerStat> records = capacityEngineerStatMPDao.selectList(lqw);
+	private HashMap<String, CapacityEngineerStatEntity> queryCapacityEngineerStat(List<String> engineerCodes, String date) {
+		List<CapacityEngineerStatEntity> records = capacityEngineerStatDao.getByWorkdayAndEngineerCodeIn(date, engineerCodes);
 
-		HashMap<String, CapacityEngineerStat> map = new HashMap<>();
-		for (CapacityEngineerStat r : records) {
+		HashMap<String, CapacityEngineerStatEntity> map = new HashMap<>();
+		for (CapacityEngineerStatEntity r : records) {
 			map.put(r.getEngineerCode(), r);
 		}
 		return map;