bug fixed

ruoyi-system/src/main/java/com/ruoyi/system/controller/ParkInfoController.java

 package com.ruoyi.system.controller;
 
-import java.util.List;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.VO.ParkInfoAllVO;
-import com.ruoyi.system.domain.ParkInfoVO;
+import com.ruoyi.system.domain.ParkInfo;
 import com.ruoyi.system.enums.ParkInfoStatusEnum;
+import com.ruoyi.system.service.IParkInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.ParkInfo;
-import com.ruoyi.system.service.IParkInfoService;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * parkinfoController
@@ -54,7 +49,8 @@ public class ParkInfoController extends BaseController {
         List<ParkInfo> list;
         startPage();
         if (status == null) {
-            list = parkInfoService.selectByStatus(ParkInfoStatusEnum.DRAFT.getCode()+"");
+            parkInfo.setStatus(ParkInfoStatusEnum.DRAFT.getCode());
+            list = parkInfoService.selectExcludeByStatus(parkInfo);
         } else {
             list = parkInfoService.selectParkInfoList(parkInfo);
         }
@@ -147,7 +143,6 @@ public class ParkInfoController extends BaseController {
     }
 
 
-
     @GetMapping("/detail/{parkId}")
     public String detail(@PathVariable("parkId") Long parkId, ModelMap mmap) {
         ParkInfoAllVO parkInfoAllVO = parkInfoService.detail(parkId);

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ParkInfoMapper.java

 package com.ruoyi.system.mapper;
 
+import com.ruoyi.system.domain.ParkInfo;
+
 import java.util.List;
 import java.util.Map;
 
-import com.ruoyi.system.domain.ParkInfo;
-
 /**
  * parkinfoMapper接口
  *
  * @author ruoyi
- * @date 2023-09-24
  */
-public interface ParkInfoMapper 
-{
+public interface ParkInfoMapper {
     /**
      * 查询parkinfo
      *
      * @param id parkinfo主键
      * @return parkinfo
      */
-    public ParkInfo selectParkInfoById(Long id);
+    ParkInfo selectParkInfoById(Long id);
 
     /**
      * 查询parkinfo列表
@@ -27,7 +25,7 @@ public interface ParkInfoMapper
      * @param parkInfo parkinfo
      * @return parkinfo集合
      */
-    public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
+    List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
 
     /**
      * 新增parkinfo
@@ -35,7 +33,7 @@ public interface ParkInfoMapper
      * @param parkInfo parkinfo
      * @return 结果
      */
-    public int insertParkInfo(ParkInfo parkInfo);
+    int insertParkInfo(ParkInfo parkInfo);
 
     /**
      * 修改parkinfo
@@ -43,7 +41,7 @@ public interface ParkInfoMapper
      * @param parkInfo parkinfo
      * @return 结果
      */
-    public int updateParkInfo(ParkInfo parkInfo);
+    int updateParkInfo(ParkInfo parkInfo);
 
     /**
      * 作废其他用户数据
@@ -51,15 +49,17 @@ public interface ParkInfoMapper
      * @param Long mirrorId
      * @return 结果
      */
-    public int updateOtherUserParkInfo(Map<String,Long> map);
-    public List<ParkInfo> selectByStatus(String status);
+    int updateOtherUserParkInfo(Map<String, Long> map);
+
+    List<ParkInfo> selectExcludeByStatus(ParkInfo parkInfo);
+
     /**
      * 删除parkinfo
      *
      * @param id parkinfo主键
      * @return 结果
      */
-    public int deleteParkInfoById(Long id);
+    int deleteParkInfoById(Long id);
 
     /**
      * 批量删除parkinfo
@@ -67,7 +67,7 @@ public interface ParkInfoMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteParkInfoByIds(String[] ids);
+    int deleteParkInfoByIds(String[] ids);
 
     /**
      * 批量删除parkinfo，逻辑删除，更改为9作废状态
@@ -75,6 +75,6 @@ public interface ParkInfoMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteParkInfoStatusByIds(String[] ids);
+    int deleteParkInfoStatusByIds(String[] ids);
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IParkInfoService.java

 package com.ruoyi.system.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.ruoyi.system.VO.ParkInfoAllVO;
 import com.ruoyi.system.domain.ParkInfo;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * parkinfoService接口
@@ -31,7 +29,7 @@ public interface IParkInfoService {
      */
     public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
 
-    public List<ParkInfo> selectByStatus(String status);
+    public List<ParkInfo> selectExcludeByStatus(ParkInfo parkInfo);
 
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java

 package com.ruoyi.system.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.VO.ParkInfoAllVO;
 import com.ruoyi.system.domain.*;
-import com.ruoyi.system.enums.CarouselTypeEnum;
 import com.ruoyi.system.enums.FileSourceObjectTypeEnum;
 import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.enums.SysCollectionTypeEnum;
 import com.ruoyi.system.mapper.*;
-import org.springframework.beans.BeanUtils;
+import com.ruoyi.system.service.IParkInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.service.IParkInfoService;
-import com.ruoyi.common.core.text.Convert;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * parkinfoService业务层处理
  *
  * @author ruoyi
- * @date 2023-09-24
  */
 @Service
 public class ParkInfoServiceImpl implements IParkInfoService {
@@ -34,9 +30,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     @Autowired
     private SysCollectionMapper sysCollectionMapper;
 
-    @Autowired
-    private ParkTrafficInfoMapper parkTrafficInfoMapper;
-
     @Autowired
     private ParkInvestmentDirectionInfoMapper parkInvestmentDirectionInfoMapper;
 
@@ -78,9 +71,9 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     }
 
     @Override
-    public List<ParkInfo> selectByStatus(String status) {
+    public List<ParkInfo> selectExcludeByStatus(ParkInfo parkInfo) {
 
-        return parkInfoMapper.selectByStatus(status);
+        return parkInfoMapper.selectExcludeByStatus(parkInfo);
     }
 
 
@@ -196,12 +189,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
         ParkInfo parkInfo = parkInfoMapper.selectParkInfoById(parkId);
         parkInfoAllVO.setParkInfo(parkInfo);
 
-//        private ParkInvestmentDirectionInfoMapper parkInvestmentDirectionInfoMapper;
-//        private ParkPolicyInfoMapper parkPolicyInfoMapper;
-//        private ParkResourcesInfoMapper parkResourcesInfoMapper;
-//        private ParkSewageInfoMapper parkSewageInfoMapper;
-//        private FileSourceMapper fileSourceMapper;
-//        private SysCarouselInfoMapper sysCarouselInfoMapper;
         ParkInvestmentDirectionInfo parkInvestmentDirectionInfo = new ParkInvestmentDirectionInfo();
         parkInvestmentDirectionInfo.setParkId(parkId);
         List<ParkInvestmentDirectionInfo> parkInvestmentDirectionInfos = parkInvestmentDirectionInfoMapper.selectParkInvestmentDirectionInfoList(parkInvestmentDirectionInfo);
@@ -228,9 +215,7 @@ public class ParkInfoServiceImpl implements IParkInfoService {
         List<FileSource> fileSourcesPolicy = fileSourceMapper.selectFileSourceList(fileSource);
         parkInfoAllVO.setFileSourcesPolicy(fileSourcesPolicy);
 
-        FileSource fileSource1 = new FileSource();
-        fileSource1.setObjectId(parkId);
-        fileSource1.setObjectType(FileSourceObjectTypeEnum.PARK_PROHIBITED.getCode());
+
         List<FileSource> fileSourcesProhibited = fileSourceMapper.selectFileSourceList(fileSource);
         parkInfoAllVO.setFileSourcesProhibited(fileSourcesProhibited);