//立业云后台提交

ruoyi-system/src/main/java/com/ruoyi/system/VO/ParkInfoAllVO.java

+package com.ruoyi.system.VO;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.system.domain.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+@Data
+public class ParkInfoAllVO implements Serializable {
+
+    private ParkInfo parkInfo;
+
+    private List<ParkInvestmentDirectionInfo> parkInvestmentDirectionInfos;
+
+    private List<ParkPolicyInfo> parkPolicyInfos;
+
+    private List<ParkResourcesInfo> parkResourcesInfos;
+
+    private List<ParkSewageInfo> parkSewageInfos;
+
+    private List<FileSource> fileSourcesPolicy;
+
+    private List<FileSource> fileSourcesProhibited;
+
+    private List<SysCarouselInfo> sysCarouselInfos;
+
+
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -2,6 +2,7 @@ package com.ruoyi.system.controller;
 
 import java.util.List;
 
+import com.ruoyi.system.VO.ParkInfoAllVO;
 import com.ruoyi.system.domain.ParkInfoVO;
 import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -146,4 +147,12 @@ public class ParkInfoController extends BaseController {
     }
 
 
+
+    @GetMapping("/detail/{parkId}")
+    public String detail(@PathVariable("parkId") Long parkId, ModelMap mmap) {
+        ParkInfoAllVO parkInfoAllVO = parkInfoService.detail(parkId);
+        mmap.put("parkInfoAllVO", parkInfoAllVO);
+        return prefix + "/detail";
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ParkPolicyInfo.java

@@ -26,6 +26,10 @@ public class ParkPolicyInfo extends BaseEntity
     @Excel(name = "政策类型")
     private String type;
 
+    /** 政策类型 */
+    @Excel(name = "政策名称")
+    private String name;
+
     /** 政策内容 */
     @Excel(name = "政策内容")
     private String content;
@@ -106,6 +110,14 @@ public class ParkPolicyInfo extends BaseEntity
         return file3;
     }
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -116,6 +128,7 @@ public class ParkPolicyInfo extends BaseEntity
             .append("file1", getFile1())
             .append("file2", getFile2())
             .append("file3", getFile3())
+            .append("name", getName())
             .toString();
     }
 }

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

@@ -3,7 +3,10 @@ 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;
 
 /**
  * parkinfoService接口
@@ -79,4 +82,7 @@ public interface IParkInfoService {
      * @return 结果
      */
     public int deleteParkInfoById(Long id);
+
+    public ParkInfoAllVO detail(Long parkId);
+
 }

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

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 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;
@@ -33,6 +34,27 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     @Autowired
     private SysCollectionMapper sysCollectionMapper;
 
+    @Autowired
+    private ParkTrafficInfoMapper parkTrafficInfoMapper;
+
+    @Autowired
+    private ParkInvestmentDirectionInfoMapper parkInvestmentDirectionInfoMapper;
+
+    @Autowired
+    private ParkPolicyInfoMapper parkPolicyInfoMapper;
+
+    @Autowired
+    private ParkResourcesInfoMapper parkResourcesInfoMapper;
+
+    @Autowired
+    private ParkSewageInfoMapper parkSewageInfoMapper;
+
+    @Autowired
+    private FileSourceMapper fileSourceMapper;
+
+    @Autowired
+    private SysCarouselInfoMapper sysCarouselInfoMapper;
+
     /**
      * 查询parkinfo
      *
@@ -167,4 +189,57 @@ public class ParkInfoServiceImpl implements IParkInfoService {
     public int deleteParkInfoById(Long id) {
         return parkInfoMapper.deleteParkInfoById(id);
     }
+
+    @Override
+    public ParkInfoAllVO detail(Long parkId){
+        ParkInfoAllVO parkInfoAllVO = new ParkInfoAllVO();
+        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);
+        parkInfoAllVO.setParkInvestmentDirectionInfos(parkInvestmentDirectionInfos);
+
+        ParkPolicyInfo parkPolicyInfo = new ParkPolicyInfo();
+        parkPolicyInfo.setParkId(parkId);
+        List<ParkPolicyInfo> parkPolicyInfos = parkPolicyInfoMapper.selectParkPolicyInfoList(parkPolicyInfo);
+        parkInfoAllVO.setParkPolicyInfos(parkPolicyInfos);
+
+        ParkResourcesInfo parkResourcesInfo = new ParkResourcesInfo();
+        parkResourcesInfo.setParkId(parkId);
+        List<ParkResourcesInfo> parkResourcesInfos = parkResourcesInfoMapper.selectParkResourcesInfoList(parkResourcesInfo);
+        parkInfoAllVO.setParkResourcesInfos(parkResourcesInfos);
+
+        ParkSewageInfo parkSewageInfo = new ParkSewageInfo();
+        parkSewageInfo.setParkId(parkId);
+        List<ParkSewageInfo> parkSewageInfos = parkSewageInfoMapper.selectParkSewageInfoList(parkSewageInfo);
+        parkInfoAllVO.setParkSewageInfos(parkSewageInfos);
+
+        FileSource fileSource = new FileSource();
+        fileSource.setObjectId(parkId);
+        fileSource.setObjectType(FileSourceObjectTypeEnum.PARK.getCode());
+        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);
+
+        SysCarouselInfo sysCarouselInfo = new SysCarouselInfo();
+        sysCarouselInfo.setAssociationId(parkId);
+        sysCarouselInfo.setType(SysCollectionTypeEnum.YUANUQU.getCode());
+        List<SysCarouselInfo> sysCarouselInfos = sysCarouselInfoMapper.selectSysCarouselInfoList(sysCarouselInfo);
+        parkInfoAllVO.setSysCarouselInfos(sysCarouselInfos);
+
+        return parkInfoAllVO;
+    }
 }

ruoyi-system/src/main/resources/mapper/parkinfo/ParkPolicyInfoMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectParkPolicyInfoVo">
-        select id, park_id, type, content, file1, file2, file3 from park_policy_info
+        select id, park_id, type,name, content, file1, file2, file3 from park_policy_info
     </sql>
 
     <select id="selectParkPolicyInfoList" parameterType="ParkPolicyInfo" resultMap="ParkPolicyInfoResult">

ruoyi-system/src/main/resources/templates/parkInfo/info/info.html

@@ -389,6 +389,7 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         let id = row.id;
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.modal.openTab(\'详情信息\',\'/parkInfo/info/detail/' + id + '\')"><i class="fa fa-edit"></i>详情信息</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" style="margin-top:5px"  href="javascript:void(0)" onclick="$.operate.edit(\'' + id + '\')"><i class="fa fa-edit"></i>编辑园区详情</a> ');
                         actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'区位交通信息\',\'/parkinfo/traffic?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑区位交通信息</a> ');
                         actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" style="margin-top:5px" href="javascript:void(0)" onclick="$.modal.openTab(\'污水处理能力\',\'/parkinfo/sewage?parkId=' + id + '\')"><i class="fa fa-edit"></i>编辑污水处理能力</a>  <br>');