From 2e64c232ab6b51b2cecf1ee96e1e9b709234f326 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 21 八月 2021 16:35:14 +0800
Subject: [PATCH] 随手拍改版接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
index 8fe2a79..3ff3c4b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructOtherBuildServiceImpl.java
@@ -1,5 +1,6 @@
 package com.panzhihua.service_community.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,10 +62,10 @@
     @Override
     public R listBuildType() {
         List<ComMngStructBuildTypeVO>comMngStructBuildTypeVOS=new ArrayList<>();
-        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(null);
+        List<ComMngStructBuildTypeDO> comMngStructBuildTypeDOS = comMngStructBuildTypeDAO.selectList(new LambdaQueryWrapper<>());
         if (!ObjectUtils.isEmpty(comMngStructBuildTypeDOS)) {
-            ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
             comMngStructBuildTypeDOS.forEach(comMngStructBuildTypeDO -> {
+                ComMngStructBuildTypeVO comMngStructBuildTypeVO=new ComMngStructBuildTypeVO();
                 BeanUtils.copyProperties(comMngStructBuildTypeDO,comMngStructBuildTypeVO);
                 comMngStructBuildTypeVOS.add(comMngStructBuildTypeVO);
             });
@@ -135,7 +136,9 @@
         buildTypdIds.forEach(aLong -> {
             if (!collect.contains(aLong)) {
                 ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(aLong);
-                throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+                if (!ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+                    throw new ServiceException(comMngStructBuildTypeDO.getName()+"已经在使用无法删除");
+                }
             }
         });
          comMngStructBuildTypeDAO.delete(new QueryWrapper<ComMngStructBuildTypeDO>().lambda().eq(ComMngStructBuildTypeDO::getCommunityId, communityId));
@@ -151,4 +154,64 @@
         });
         return R.ok();
     }
+
+    /**
+     * 其他建筑详情
+     *
+     * @param id 主键id
+     * @return 建筑内容
+     */
+    @Override
+    public R detailOtherbuild(Long id) {
+        ComMngStructOtherBuildDO comMngStructOtherBuildDO = comMngStructOtherBuildDAO.selectById(id);
+        if (ObjectUtils.isEmpty(comMngStructOtherBuildDO)) {
+            return R.fail("建筑不存在");
+        }
+        Long typeId = comMngStructOtherBuildDO.getTypeId();
+        ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId);
+        if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+            return R.fail("建筑类型不存在");
+        }
+        ComMngStructOtherBuildVO comMngStructOtherBuildVO=new ComMngStructOtherBuildVO();
+        BeanUtils.copyProperties(comMngStructOtherBuildDO,comMngStructOtherBuildVO);
+        comMngStructOtherBuildVO.setBuileTypeName(comMngStructBuildTypeDO.getName());
+        return R.ok(comMngStructOtherBuildVO);
+    }
+
+    /**
+     * 编辑其他建筑
+     *
+     * @param comMngStructOtherBuildVO 编辑内容
+     * @return 编辑结果
+     */
+    @Override
+    public R putOtherbuild(ComMngStructOtherBuildVO comMngStructOtherBuildVO) {
+        Long typeId = comMngStructOtherBuildVO.getTypeId();
+        ComMngStructBuildTypeDO comMngStructBuildTypeDO = comMngStructBuildTypeDAO.selectById(typeId);
+        if (ObjectUtils.isEmpty(comMngStructBuildTypeDO)) {
+            return R.fail("建筑类型不存在");
+        }
+        ComMngStructOtherBuildDO comMngStructOtherBuildDO=new ComMngStructOtherBuildDO();
+        BeanUtils.copyProperties(comMngStructOtherBuildVO,comMngStructOtherBuildDO);
+        int update = comMngStructOtherBuildDAO.updateById(comMngStructOtherBuildDO);
+        if (update>0) {
+            return R.ok("编辑成功过");
+        }
+        return R.fail("编辑失败");
+    }
+
+    /**
+     * 删除其他建筑
+     *
+     * @param id 主键
+     * @return 删除结果
+     */
+    @Override
+    public R deleteOtherbuild(Long id) {
+        int delete = comMngStructOtherBuildDAO.deleteById(id);
+        if (delete>0) {
+            return R.ok();
+        }
+        return R.fail("删除失败");
+    }
 }

--
Gitblit v1.7.1