Skip to content

cfld-liyeyun-admin
cfld-liyeyun-admin
Commit 5931182a authored by lixinglin's avatar lixinglin
Browse files
Options

bug fixed

parent 40664914
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 168 deletions
ruoyi-system/src/main/java/com/ruoyi/system/controller/ParkInfoController.java
View file @ 5931182a
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
View file @ 5931182a
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列表
*
*
* @param parkInfo parkinfo
* @return parkinfo集合
*/
public List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
List<ParkInfo> selectParkInfoList(ParkInfo parkInfo);
/**
* 新增parkinfo
*
*
* @param parkInfo parkinfo
* @return 结果
*/
public int insertParkInfo(ParkInfo parkInfo);
int insertParkInfo(ParkInfo parkInfo);
/**
* 修改parkinfo
*
*
* @param parkInfo parkinfo
* @return 结果
*/
public int updateParkInfo(ParkInfo parkInfo);
int updateParkInfo(ParkInfo parkInfo);
/**
* 作废其他用户数据
......@@ -51,23 +49,25 @@ 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
*
*
* @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
View file @ 5931182a
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
View file @ 5931182a
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);
......
ruoyi-system/src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
View file @ 5931182a
......@@ -5,108 +5,197 @@
<mapper namespace="com.ruoyi.system.mapper.ParkInfoMapper">
<resultMap type="ParkInfo" id="ParkInfoResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="groupId" column="group_id" />
<result property="groupName" column="group_name" />
<result property="zoneId" column="zone_id" />
<result property="zoneName" column="zone_name" />
<result property="levelCode" column="level_code" />
<result property="description" column="description" />
<result property="provinceCode" column="province_code" />
<result property="provinceName" column="province_name" />
<result property="cityCode" column="city_code" />
<result property="cityName" column="city_name" />
<result property="regionCode" column="region_code" />
<result property="regionName" column="region_name" />
<result property="address" column="address" />
<result property="coverArea" column="cover_area" />
<result property="floorArea" column="floor_area" />
<result property="plotRatio" column="plot_ratio" />
<result property="landProperty" column="land_property" />
<result property="ownershipProperty" column="ownership_property" />
<result property="productQuantity" column="product_quantity" />
<result property="rentalRate" column="rental_rate" />
<result property="contactPerson" column="contact_person" />
<result property="phone" column="phone" />
<result property="rentPrice" column="rent_price" />
<result property="propertyPrice" column="property_price" />
<result property="primaryIndustry" column="primary_industry" />
<result property="industryIds" column="industry_ids" />
<result property="investmentDirection" column="investment_direction" />
<result property="prohibitDirectory" column="prohibit_directory" />
<result property="prohibitDirectoryFile" column="prohibit_directory_file" />
<result property="investmentStrength" column="investment_strength" />
<result property="taxationStrength" column="taxation_strength" />
<result property="averageOutputValue" column="average_output_value" />
<result property="environmentalEquirements" column="environmental_equirements" />
<result property="valueAddedEnergy" column="value_added_energy" />
<result property="totalValueEnergy" column="total_value_energy" />
<result property="accessOther" column="access_other" />
<result property="environmentalIndicators" column="environmental_indicators" />
<result property="fireProtectionLevel" column="fire_protection_level" />
<result property="industrialServicePlatform" column="industrial_service_platform" />
<result property="voltageAndSubstation" column="voltage_and_substation" />
<result property="doubleCircuitElectricity" column="double_circuit_electricity" />
<result property="powerSupplyType" column="power_supply_type" />
<result property="electricityPrice" column="electricity_price" />
<result property="residentsWater" column="residents_water" />
<result property="industrialWater" column="industrial_water" />
<result property="businessServicesWater" column="business_services_water" />
<result property="gas" column="gas" />
<result property="steam" column="steam" />
<result property="residentsHeating" column="residents_heating" />
<result property="nresidentsHeating" column="nresidents_heating" />
<result property="restaurant" column="restaurant" />
<result property="apartment" column="apartment" />
<result property="convenienceStore" column="convenience_store" />
<result property="publicSpace" column="public_space" />
<result property="publicTransit" column="public_transit" />
<result property="parkingSpace" column="parking_space" />
<result property="chargingStation" column="charging_station" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="developmentZoneId" column="development_zone_id" />
<result property="developmentZoneName" column="development_zone_name" />
<result property="status" column="status" />
<result property="enterprise" column="enterprise" />
<result property="wenjuanxingid" column="wenjuanxingid" />
<result property="userId" column="user_id" />
<result property="submitTime" column="submit_time" />
<result property="enterpriseNumber" column="enterprise_number" />
<result property="isSystem" column="is_system" />
<result property="isHotPark" column="is_hot_park" />
<result property="imgUrl" column="img_url" />
<result property="levelName" column="level_name" />
<result property="mirrorId" column="mirror_id" />
<result property="highlights" column="highlights" />
<result property="investmentAmountTotal" column="investment_amount_total" />
<result property="buildingPeriod" column="building_period" />
<result property="rentSaleType" column="rent_sale_type" />
<result property="salePrice" column="sale_price" />
<result property="substationLevel" column="substation_level" />
<result property="industryResources" column="industry_resources" />
<result property="specialIndicators" column="special_indicators" />
<result property="isOtherRequirements" column="is_other_requirements" />
<result property="isHeating" column="is_heating" />
<result property="isSteam" column="is_steam" />
<result property="isNaturalGas" column="is_natural_gas" />
<result property="guildMeetingRoom" column="guild_meeting_room" />
<result property="lectureHall" column="lecture_hall" />
<result property="organization" column="organization" />
<result property="reason" column="reason" />
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="groupId" column="group_id"/>
<result property="groupName" column="group_name"/>
<result property="zoneId" column="zone_id"/>
<result property="zoneName" column="zone_name"/>
<result property="levelCode" column="level_code"/>
<result property="description" column="description"/>
<result property="provinceCode" column="province_code"/>
<result property="provinceName" column="province_name"/>
<result property="cityCode" column="city_code"/>
<result property="cityName" column="city_name"/>
<result property="regionCode" column="region_code"/>
<result property="regionName" column="region_name"/>
<result property="address" column="address"/>
<result property="coverArea" column="cover_area"/>
<result property="floorArea" column="floor_area"/>
<result property="plotRatio" column="plot_ratio"/>
<result property="landProperty" column="land_property"/>
<result property="ownershipProperty" column="ownership_property"/>
<result property="productQuantity" column="product_quantity"/>
<result property="rentalRate" column="rental_rate"/>
<result property="contactPerson" column="contact_person"/>
<result property="phone" column="phone"/>
<result property="rentPrice" column="rent_price"/>
<result property="propertyPrice" column="property_price"/>
<result property="primaryIndustry" column="primary_industry"/>
<result property="industryIds" column="industry_ids"/>
<result property="investmentDirection" column="investment_direction"/>
<result property="prohibitDirectory" column="prohibit_directory"/>
<result property="prohibitDirectoryFile" column="prohibit_directory_file"/>
<result property="investmentStrength" column="investment_strength"/>
<result property="taxationStrength" column="taxation_strength"/>
<result property="averageOutputValue" column="average_output_value"/>
<result property="environmentalEquirements" column="environmental_equirements"/>
<result property="valueAddedEnergy" column="value_added_energy"/>
<result property="totalValueEnergy" column="total_value_energy"/>
<result property="accessOther" column="access_other"/>
<result property="environmentalIndicators" column="environmental_indicators"/>
<result property="fireProtectionLevel" column="fire_protection_level"/>
<result property="industrialServicePlatform" column="industrial_service_platform"/>
<result property="voltageAndSubstation" column="voltage_and_substation"/>
<result property="doubleCircuitElectricity" column="double_circuit_electricity"/>
<result property="powerSupplyType" column="power_supply_type"/>
<result property="electricityPrice" column="electricity_price"/>
<result property="residentsWater" column="residents_water"/>
<result property="industrialWater" column="industrial_water"/>
<result property="businessServicesWater" column="business_services_water"/>
<result property="gas" column="gas"/>
<result property="steam" column="steam"/>
<result property="residentsHeating" column="residents_heating"/>
<result property="nresidentsHeating" column="nresidents_heating"/>
<result property="restaurant" column="restaurant"/>
<result property="apartment" column="apartment"/>
<result property="convenienceStore" column="convenience_store"/>
<result property="publicSpace" column="public_space"/>
<result property="publicTransit" column="public_transit"/>
<result property="parkingSpace" column="parking_space"/>
<result property="chargingStation" column="charging_station"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="developmentZoneId" column="development_zone_id"/>
<result property="developmentZoneName" column="development_zone_name"/>
<result property="status" column="status"/>
<result property="enterprise" column="enterprise"/>
<result property="wenjuanxingid" column="wenjuanxingid"/>
<result property="userId" column="user_id"/>
<result property="submitTime" column="submit_time"/>
<result property="enterpriseNumber" column="enterprise_number"/>
<result property="isSystem" column="is_system"/>
<result property="isHotPark" column="is_hot_park"/>
<result property="imgUrl" column="img_url"/>
<result property="levelName" column="level_name"/>
<result property="mirrorId" column="mirror_id"/>
<result property="highlights" column="highlights"/>
<result property="investmentAmountTotal" column="investment_amount_total"/>
<result property="buildingPeriod" column="building_period"/>
<result property="rentSaleType" column="rent_sale_type"/>
<result property="salePrice" column="sale_price"/>
<result property="substationLevel" column="substation_level"/>
<result property="industryResources" column="industry_resources"/>
<result property="specialIndicators" column="special_indicators"/>
<result property="isOtherRequirements" column="is_other_requirements"/>
<result property="isHeating" column="is_heating"/>
<result property="isSteam" column="is_steam"/>
<result property="isNaturalGas" column="is_natural_gas"/>
<result property="guildMeetingRoom" column="guild_meeting_room"/>
<result property="lectureHall" column="lecture_hall"/>
<result property="organization" column="organization"/>
<result property="reason" column="reason"/>
</resultMap>
<sql id="selectParkInfoVo">
select id, name, group_id, group_name, zone_id, zone_name, level_code, description, province_code, province_name, city_code, city_name, region_code, region_name, address, cover_area, floor_area, plot_ratio, land_property, ownership_property, product_quantity, rental_rate, contact_person, phone, rent_price, property_price, primary_industry, industry_ids, investment_direction, prohibit_directory, prohibit_directory_file, investment_strength, taxation_strength, average_output_value, environmental_equirements, value_added_energy, total_value_energy, access_other, environmental_indicators, fire_protection_level, industrial_service_platform, voltage_and_substation, double_circuit_electricity, power_supply_type, electricity_price, residents_water, industrial_water, business_services_water, gas, steam, residents_heating, nresidents_heating, restaurant, apartment, convenience_store, public_space, public_transit, parking_space, charging_station, create_time, update_time, development_zone_id, development_zone_name, status, enterprise, wenjuanxingid, user_id, submit_time, enterprise_number, is_system, is_hot_park, img_url, level_name, mirror_id, highlights, investment_amount_total, building_period, rent_sale_type, sale_price, substation_level, industry_resources, special_indicators, is_other_requirements, is_heating, is_steam, is_natural_gas, guild_meeting_room, lecture_hall, organization, reason from park_info
select id,
name,
group_id,
group_name,
zone_id,
zone_name,
level_code,
description,
province_code,
province_name,
city_code,
city_name,
region_code,
region_name,
address,
cover_area,
floor_area,
plot_ratio,
land_property,
ownership_property,
product_quantity,
rental_rate,
contact_person,
phone,
rent_price,
property_price,
primary_industry,
industry_ids,
investment_direction,
prohibit_directory,
prohibit_directory_file,
investment_strength,
taxation_strength,
average_output_value,
environmental_equirements,
value_added_energy,
total_value_energy,
access_other,
environmental_indicators,
fire_protection_level,
industrial_service_platform,
voltage_and_substation,
double_circuit_electricity,
power_supply_type,
electricity_price,
residents_water,
industrial_water,
business_services_water,
gas,
steam,
residents_heating,
nresidents_heating,
restaurant,
apartment,
convenience_store,
public_space,
public_transit,
parking_space,
charging_station,
create_time,
update_time,
development_zone_id,
development_zone_name,
status,
enterprise,
wenjuanxingid,
user_id,
submit_time,
enterprise_number,
is_system,
is_hot_park,
img_url,
level_name,
mirror_id,
highlights,
investment_amount_total,
building_period,
rent_sale_type,
sale_price,
substation_level,
industry_resources,
special_indicators,
is_other_requirements,
is_heating,
is_steam,
is_natural_gas,
guild_meeting_room,
lecture_hall,
organization,
reason
from park_info
</sql>
<select id="selectParkInfoList" parameterType="ParkInfo" resultMap="ParkInfoResult">
<include refid="selectParkInfoVo"/>
<sql id="where">
<where>
status != 9
1=1
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="groupId != null ">and group_id = #{groupId}</if>
<if test="groupName != null and groupName != ''">and group_name like concat('%', #{groupName}, '%')</if>
......@@ -206,7 +295,7 @@
<if test="developmentZoneName != null and developmentZoneName != ''">and development_zone_name like
concat('%', #{developmentZoneName}, '%')
</if>
<if test="status != null ">and status = #{status}</if>
<if test="enterprise != null and enterprise != ''">and enterprise = #{enterprise}</if>
<if test="wenjuanxingid != null ">and wenjuanxingid = #{wenjuanxingid}</if>
<if test="userId != null ">and user_id = #{userId}</if>
......@@ -217,6 +306,13 @@
<if test="imgUrl != null and imgUrl != ''">and img_url = #{imgUrl}</if>
<if test="mirrorId != null and mirrorId != ''">and mirror_id = #{mirrorId}</if>
</where>
</sql>
<select id="selectParkInfoList" parameterType="ParkInfo" resultMap="ParkInfoResult">
<include refid="selectParkInfoVo"/>
<include refid="where"></include>
and status != 9
</select>
<select id="selectParkInfoById" parameterType="Long" resultMap="ParkInfoResult">
......@@ -459,11 +555,11 @@
where id = #{id}
</update>
<select id="selectByStatus" parameterType="String" resultMap="ParkInfoResult">
<select id="selectExcludeByStatus" parameterType="ParkInfo" resultMap="ParkInfoResult">
<include refid="selectParkInfoVo"/>
where status !=${status}
<include refid="where"></include>
<if test="status != null ">and status != #{status}</if>
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment