Skip to content

yangxiujun / paidan_demo

Go to a project
Commit a44aca0c by wangli
Options

mp2jpa

1 parent 15683bbc
Inline Side-by-side
Showing with 12 additions and 23 deletions
project-order/src/main/java/com/dituhui/pea/order/dao/MapLayerCustomizeDao.java
package com.dituhui.pea.order.dao; package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.MapBlockInfoEntity;
import com.dituhui.pea.order.entity.MapLayerCustomizeEntity; import com.dituhui.pea.order.entity.MapLayerCustomizeEntity;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
......
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessLayerServiceImpl.java
package com.dituhui.pea.order.service.impl; package com.dituhui.pea.order.service.impl;
import com.alibaba.nacos.common.utils.CollectionUtils; import com.alibaba.nacos.common.utils.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.common.ResultEnum; import com.dituhui.pea.common.ResultEnum;
...@@ -14,7 +13,6 @@ import com.dituhui.pea.order.feign.ISaaSRemoteService; ...@@ -14,7 +13,6 @@ import com.dituhui.pea.order.feign.ISaaSRemoteService;
import com.dituhui.pea.order.service.BusinessLayerService; import com.dituhui.pea.order.service.BusinessLayerService;
import com.dituhui.pea.order.utils.TypeUtils; import com.dituhui.pea.order.utils.TypeUtils;
import com.google.gson.internal.LinkedTreeMap; import com.google.gson.internal.LinkedTreeMap;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -40,7 +38,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -40,7 +38,7 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
@Autowired @Autowired
private MapLayerCustomizeDao mapLayerCustomizeDao; private MapLayerCustomizeDao mapLayerCustomizeDao;
@Autowired @Autowired
private MapLayerCustomizeSkillMPDao mapLayerCustomizeSkillMPDao; private MapLayerCustomizeSkillDao mapLayerCustomizeSkillDao;
@Autowired @Autowired
private OrgGroupDao orgGroupDao; private OrgGroupDao orgGroupDao;
@Autowired @Autowired
...@@ -134,9 +132,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -134,9 +132,9 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
} }
// 获取技能code列表 // 获取技能code列表
List<MapLayerCustomizeSkill> skills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId); List<MapLayerCustomizeSkillEntity> skills = mapLayerCustomizeSkillDao.findByLayerId(layerId);
List<String> skillCodes = skills.stream().filter(s -> s.getStatus() == 1).map( List<String> skillCodes = skills.stream().filter(s -> s.getStatus() == 1).map(
MapLayerCustomizeSkill::getSkillCode).collect(Collectors.toList()); MapLayerCustomizeSkillEntity::getSkillCode).collect(Collectors.toList());
// 获取branchName // 获取branchName
String branchName = ""; String branchName = "";
...@@ -243,37 +241,29 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -243,37 +241,29 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
// 更新技能信息 // 更新技能信息
// 更新状态为0 // 更新状态为0
LambdaUpdateWrapper<MapLayerCustomizeSkill> wrapper = new LambdaUpdateWrapper<>(); mapLayerCustomizeSkillDao.updateStatusByLayerId(0, layerId);
wrapper.set(MapLayerCustomizeSkill::getStatus, 0);
wrapper.eq(MapLayerCustomizeSkill::getLayerId, layerId);
mapLayerCustomizeSkillMPDao.update(null, wrapper);
List<MapLayerCustomizeSkill> skills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId); List<MapLayerCustomizeSkillEntity> skills = mapLayerCustomizeSkillDao.findByLayerId(layerId);
Set<String> db = skills.stream().map(MapLayerCustomizeSkill::getSkillCode).collect(Collectors.toSet()); Set<String> db = skills.stream().map(MapLayerCustomizeSkillEntity::getSkillCode).collect(Collectors.toSet());
// 需要更新为有效的 // 需要更新为有效的
Set<String> updates = new HashSet<>(db); Set<String> updates = new HashSet<>(db);
updates.retainAll(skillCodes); updates.retainAll(skillCodes);
if(!updates.isEmpty()) { if (!updates.isEmpty()) {
mapLayerCustomizeSkillDao.updateStatusByLayerIdAndSkillCodeIn(1, layerId, new ArrayList<>(updates));
LambdaUpdateWrapper<MapLayerCustomizeSkill> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(MapLayerCustomizeSkill::getStatus, 1);
updateWrapper.eq(MapLayerCustomizeSkill::getLayerId, layerId);
updateWrapper.in(MapLayerCustomizeSkill::getSkillCode, new ArrayList<>(updates));
mapLayerCustomizeSkillMPDao.update(null, updateWrapper);
} }
// 需要新增插入的 // 需要新增插入的
Set<String> adds = new HashSet<>(skillCodes); Set<String> adds = new HashSet<>(skillCodes);
adds.removeAll(db); adds.removeAll(db);
for (String skillCode : adds) { for (String skillCode : adds) {
MapLayerCustomizeSkill c = new MapLayerCustomizeSkill(); MapLayerCustomizeSkillEntity c = new MapLayerCustomizeSkillEntity();
c.setLayerId(layerId); c.setLayerId(layerId);
c.setSkillCode(skillCode); c.setSkillCode(skillCode);
c.setStatus(1); c.setStatus(1);
c.setMemo(""); c.setMemo("");
c.setCreateTime(LocalDateTime.now()); c.setCreateTime(LocalDateTime.now());
mapLayerCustomizeSkillMPDao.insert(c); entityManager.persist(c);
} }
} }
...@@ -284,8 +274,8 @@ public class BusinessLayerServiceImpl implements BusinessLayerService { ...@@ -284,8 +274,8 @@ public class BusinessLayerServiceImpl implements BusinessLayerService {
Map<String, String> skillMap = skills.stream().collect(Collectors.toMap( Map<String, String> skillMap = skills.stream().collect(Collectors.toMap(
SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkill)); SkillInfoEntity::getSkillCode, SkillInfoEntity::getSkill));
List<MapLayerCustomizeSkill> laySkills = mapLayerCustomizeSkillMPDao.selectByLayerId(layerId); List<MapLayerCustomizeSkillEntity> laySkills = mapLayerCustomizeSkillDao.findByLayerId(layerId);
for (MapLayerCustomizeSkill s : laySkills) { for (MapLayerCustomizeSkillEntity s : laySkills) {
if (s.getStatus() == 0) { if (s.getStatus() == 0) {
continue; continue;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!