From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
index ebde9cc..a53c178 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java
@@ -1,5 +1,13 @@
package com.panzhihua.service_community.service.impl;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,19 +24,14 @@
import com.panzhihua.service_community.model.dos.ComActWorkGuideDO;
import com.panzhihua.service_community.model.dos.ComActWorkGuideMaterialDO;
import com.panzhihua.service_community.service.ComActWorkGuideService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
/**
* @auther llming
* @describe 办事指南
*/
@Service
-public class ComActWorkGuideServiceImpl extends ServiceImpl<ComActWorkGuideDAO, ComActWorkGuideDO> implements ComActWorkGuideService {
+public class ComActWorkGuideServiceImpl extends ServiceImpl<ComActWorkGuideDAO, ComActWorkGuideDO>
+ implements ComActWorkGuideService {
static String AK = "W3x8DhCWKc2UFIwYgclpRBdL6BeGLLQt"; // 百度地图密钥
@Resource
ComActWorkGuideMaterialDAO workGuideMaterialDAO;
@@ -41,7 +44,7 @@
BeanUtils.copyProperties(workGuideDTO, comActWorkGuideDO);
comActWorkGuideDO.setCreateBy(userId);
this.baseMapper.insert(comActWorkGuideDO);
- //保存办事指南材料
+ // 保存办事指南材料
workGuideDTO.getMaterials().forEach(material -> {
ComActWorkGuideMaterialDO workGuideMaterialDO = new ComActWorkGuideMaterialDO();
workGuideMaterialDO.setMaterialName(material.getMaterialName());
@@ -63,33 +66,33 @@
BeanUtils.copyProperties(workGuideDTO, workGuideDO);
workGuideDO.setUpdateBy(userId);
this.baseMapper.updateById(workGuideDO);
- if (workGuideDTO.getMaterials().size() == 0) {//若编辑材料为null,执行删除操作
+ if (workGuideDTO.getMaterials().size() == 0) {// 若编辑材料为null,执行删除操作
workGuideMaterialDAO.delete(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
+ .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideDTO.getId()));
+ } else {// 若材料不为空，但是少了数据条数，也要执行删除
+ List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
+ workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
.eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideDTO.getId()));
- } else {//若材料不为空，但是少了数据条数，也要执行删除
- List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
- .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideDTO.getId()));
- //1、筛选vo里面和db里，需要删除的材料数据
- List<Long> voMaterialIds = workGuideDTO.getMaterials().stream()
- .filter(materialVo -> materialVo.getId() != null)
- .map(ComActWorkGuideMaterialVO::getId)
- .collect(Collectors.toList());
+ // 1、筛选vo里面和db里，需要删除的材料数据
+ List<Long> voMaterialIds =
+ workGuideDTO.getMaterials().stream().filter(materialVo -> materialVo.getId() != null)
+ .map(ComActWorkGuideMaterialVO::getId).collect(Collectors.toList());
List<Long> deleteMaterialIds = workGuideMaterialDOS.stream()
- .filter(workGuideMaterialDO -> !voMaterialIds.contains(workGuideMaterialDO.getId()))
- .map(ComActWorkGuideMaterialDO::getId)
- .collect(Collectors.toList());
+ .filter(workGuideMaterialDO -> !voMaterialIds.contains(workGuideMaterialDO.getId()))
+ .map(ComActWorkGuideMaterialDO::getId).collect(Collectors.toList());
if (deleteMaterialIds.size() != 0) {
workGuideMaterialDAO.deleteBatchIds(deleteMaterialIds);
}
workGuideDTO.getMaterials().forEach(materialsVO -> {
if (materialsVO.getId() != null && materialsVO.getId() != 0L) {
- ComActWorkGuideMaterialDO workGuideMaterialDO1 = workGuideMaterialDOS.stream().filter(workGuideMaterialDO -> workGuideMaterialDO.getId()
- .equals(materialsVO.getId())).findFirst().orElse(null);
- if (workGuideMaterialDO1 != null) {//2、如果db有,执行编辑
+ ComActWorkGuideMaterialDO workGuideMaterialDO1 = workGuideMaterialDOS.stream()
+ .filter(workGuideMaterialDO -> workGuideMaterialDO.getId().equals(materialsVO.getId()))
+ .findFirst().orElse(null);
+ if (workGuideMaterialDO1 != null) {// 2、如果db有,执行编辑
workGuideMaterialDO1.setMaterialName(materialsVO.getMaterialName());
workGuideMaterialDAO.updateById(workGuideMaterialDO1);
}
- } else {//3、如果db没有，执行新增
+ } else {// 3、如果db没有，执行新增
ComActWorkGuideMaterialDO newWorkGuideMaterialDO = new ComActWorkGuideMaterialDO();
newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
@@ -101,22 +104,23 @@
}
@Override
- public R detailWorkGuide(Long workGuideId, Long conmunityId) {
+ public R detailWorkGuide(Long workGuideId, Long communityId) {
ComActWorkGuideDO workGuideDO = this.baseMapper.selectById(workGuideId);
if (workGuideDO == null) {
return R.fail("Id有误！");
}
ComActWorkGuideVO vo = new ComActWorkGuideVO();
BeanUtils.copyProperties(workGuideDO, vo);
- ComActDO comActDO = comActDAO.selectById(conmunityId);
- if (comActDO != null){
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ if (comActDO != null) {
vo.setAddress(comActDO.getAddress());
vo.setPhone(comActDO.getContactsPhone());
vo.setLon(comActDO.getLng());
vo.setLat(comActDO.getLat());
}
- List<ComActWorkGuideMaterialDO> workGuideMaterialDOS = workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
+ List<ComActWorkGuideMaterialDO> workGuideMaterialDOS =
+ workGuideMaterialDAO.selectList(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
.eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
workGuideMaterialDOS.forEach(workGuideMaterialDO -> {
ComActWorkGuideMaterialVO workGuideMaterialVO = new ComActWorkGuideMaterialVO();
@@ -148,7 +152,7 @@
public R delectWorkGuide(Long workGuideId) {
this.baseMapper.deleteById(workGuideId);
workGuideMaterialDAO.delete(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
- .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
+ .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
return R.ok();
}
}
--
Gitblit v1.7.1