Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-liyeyun-admin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cfld-backend
cfld-liyeyun-admin
Commits
5931182a
Commit
5931182a
authored
Nov 17, 2023
by
lixinglin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
40664914
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
69 deletions
+47
-69
ParkInfoController.java
.../java/com/ruoyi/system/controller/ParkInfoController.java
+13
-18
ParkInfoMapper.java
...src/main/java/com/ruoyi/system/mapper/ParkInfoMapper.java
+21
-21
IParkInfoService.java
.../main/java/com/ruoyi/system/service/IParkInfoService.java
+4
-6
ParkInfoServiceImpl.java
...va/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
+9
-24
ParkInfoMapper.xml
...tem/src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
+0
-0
No files found.
ruoyi-system/src/main/java/com/ruoyi/system/controller/ParkInfoController.java
View file @
5931182a
package
com
.
ruoyi
.
system
.
controller
;
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.VO.ParkInfoAllVO
;
import
com.ruoyi.system.domain.ParkInfo
VO
;
import
com.ruoyi.system.domain.ParkInfo
;
import
com.ruoyi.system.enums.ParkInfoStatusEnum
;
import
com.ruoyi.system.enums.ParkInfoStatusEnum
;
import
com.ruoyi.system.service.IParkInfoService
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
java.util.List
;
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
;
/**
/**
* parkinfoController
* parkinfoController
...
@@ -54,7 +49,8 @@ public class ParkInfoController extends BaseController {
...
@@ -54,7 +49,8 @@ public class ParkInfoController extends BaseController {
List
<
ParkInfo
>
list
;
List
<
ParkInfo
>
list
;
startPage
();
startPage
();
if
(
status
==
null
)
{
if
(
status
==
null
)
{
list
=
parkInfoService
.
selectByStatus
(
ParkInfoStatusEnum
.
DRAFT
.
getCode
()+
""
);
parkInfo
.
setStatus
(
ParkInfoStatusEnum
.
DRAFT
.
getCode
());
list
=
parkInfoService
.
selectExcludeByStatus
(
parkInfo
);
}
else
{
}
else
{
list
=
parkInfoService
.
selectParkInfoList
(
parkInfo
);
list
=
parkInfoService
.
selectParkInfoList
(
parkInfo
);
}
}
...
@@ -147,7 +143,6 @@ public class ParkInfoController extends BaseController {
...
@@ -147,7 +143,6 @@ public class ParkInfoController extends BaseController {
}
}
@GetMapping
(
"/detail/{parkId}"
)
@GetMapping
(
"/detail/{parkId}"
)
public
String
detail
(
@PathVariable
(
"parkId"
)
Long
parkId
,
ModelMap
mmap
)
{
public
String
detail
(
@PathVariable
(
"parkId"
)
Long
parkId
,
ModelMap
mmap
)
{
ParkInfoAllVO
parkInfoAllVO
=
parkInfoService
.
detail
(
parkId
);
ParkInfoAllVO
parkInfoAllVO
=
parkInfoService
.
detail
(
parkId
);
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ParkInfoMapper.java
View file @
5931182a
package
com
.
ruoyi
.
system
.
mapper
;
package
com
.
ruoyi
.
system
.
mapper
;
import
com.ruoyi.system.domain.ParkInfo
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
com.ruoyi.system.domain.ParkInfo
;
/**
/**
* parkinfoMapper接口
* parkinfoMapper接口
*
*
* @author ruoyi
* @author ruoyi
* @date 2023-09-24
*/
*/
public
interface
ParkInfoMapper
public
interface
ParkInfoMapper
{
{
/**
/**
* 查询parkinfo
* 查询parkinfo
*
*
* @param id parkinfo主键
* @param id parkinfo主键
* @return parkinfo
* @return parkinfo
*/
*/
public
ParkInfo
selectParkInfoById
(
Long
id
);
ParkInfo
selectParkInfoById
(
Long
id
);
/**
/**
* 查询parkinfo列表
* 查询parkinfo列表
*
*
* @param parkInfo parkinfo
* @param parkInfo parkinfo
* @return parkinfo集合
* @return parkinfo集合
*/
*/
public
List
<
ParkInfo
>
selectParkInfoList
(
ParkInfo
parkInfo
);
List
<
ParkInfo
>
selectParkInfoList
(
ParkInfo
parkInfo
);
/**
/**
* 新增parkinfo
* 新增parkinfo
*
*
* @param parkInfo parkinfo
* @param parkInfo parkinfo
* @return 结果
* @return 结果
*/
*/
public
int
insertParkInfo
(
ParkInfo
parkInfo
);
int
insertParkInfo
(
ParkInfo
parkInfo
);
/**
/**
* 修改parkinfo
* 修改parkinfo
*
*
* @param parkInfo parkinfo
* @param parkInfo parkinfo
* @return 结果
* @return 结果
*/
*/
public
int
updateParkInfo
(
ParkInfo
parkInfo
);
int
updateParkInfo
(
ParkInfo
parkInfo
);
/**
/**
* 作废其他用户数据
* 作废其他用户数据
...
@@ -51,23 +49,25 @@ public interface ParkInfoMapper
...
@@ -51,23 +49,25 @@ public interface ParkInfoMapper
* @param Long mirrorId
* @param Long mirrorId
* @return 结果
* @return 结果
*/
*/
public
int
updateOtherUserParkInfo
(
Map
<
String
,
Long
>
map
);
int
updateOtherUserParkInfo
(
Map
<
String
,
Long
>
map
);
public
List
<
ParkInfo
>
selectByStatus
(
String
status
);
List
<
ParkInfo
>
selectExcludeByStatus
(
ParkInfo
parkInfo
);
/**
/**
* 删除parkinfo
* 删除parkinfo
*
*
* @param id parkinfo主键
* @param id parkinfo主键
* @return 结果
* @return 结果
*/
*/
public
int
deleteParkInfoById
(
Long
id
);
int
deleteParkInfoById
(
Long
id
);
/**
/**
* 批量删除parkinfo
* 批量删除parkinfo
*
*
* @param ids 需要删除的数据主键集合
* @param ids 需要删除的数据主键集合
* @return 结果
* @return 结果
*/
*/
public
int
deleteParkInfoByIds
(
String
[]
ids
);
int
deleteParkInfoByIds
(
String
[]
ids
);
/**
/**
* 批量删除parkinfo,逻辑删除,更改为9作废状态
* 批量删除parkinfo,逻辑删除,更改为9作废状态
...
@@ -75,6 +75,6 @@ public interface ParkInfoMapper
...
@@ -75,6 +75,6 @@ public interface ParkInfoMapper
* @param ids 需要删除的数据主键集合
* @param ids 需要删除的数据主键集合
* @return 结果
* @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
;
package
com
.
ruoyi
.
system
.
service
;
import
java.util.List
;
import
java.util.Map
;
import
com.ruoyi.system.VO.ParkInfoAllVO
;
import
com.ruoyi.system.VO.ParkInfoAllVO
;
import
com.ruoyi.system.domain.ParkInfo
;
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接口
* parkinfoService接口
...
@@ -31,7 +29,7 @@ public interface IParkInfoService {
...
@@ -31,7 +29,7 @@ public interface IParkInfoService {
*/
*/
public
List
<
ParkInfo
>
selectParkInfoList
(
ParkInfo
parkInfo
);
public
List
<
ParkInfo
>
selectParkInfoList
(
ParkInfo
parkInfo
);
public
List
<
ParkInfo
>
select
ByStatus
(
String
status
);
public
List
<
ParkInfo
>
select
ExcludeByStatus
(
ParkInfo
parkInfo
);
/**
/**
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ParkInfoServiceImpl.java
View file @
5931182a
package
com
.
ruoyi
.
system
.
service
.
impl
;
package
com
.
ruoyi
.
system
.
service
.
impl
;
import
java.util.List
;
import
com.ruoyi.common.core.text.Convert
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.system.VO.ParkInfoAllVO
;
import
com.ruoyi.system.VO.ParkInfoAllVO
;
import
com.ruoyi.system.domain.*
;
import
com.ruoyi.system.domain.*
;
import
com.ruoyi.system.enums.CarouselTypeEnum
;
import
com.ruoyi.system.enums.FileSourceObjectTypeEnum
;
import
com.ruoyi.system.enums.FileSourceObjectTypeEnum
;
import
com.ruoyi.system.enums.ParkInfoStatusEnum
;
import
com.ruoyi.system.enums.ParkInfoStatusEnum
;
import
com.ruoyi.system.enums.SysCollectionTypeEnum
;
import
com.ruoyi.system.enums.SysCollectionTypeEnum
;
import
com.ruoyi.system.mapper.*
;
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.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
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
org.springframework.transaction.annotation.Transactional
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* parkinfoService业务层处理
* parkinfoService业务层处理
*
*
* @author ruoyi
* @author ruoyi
* @date 2023-09-24
*/
*/
@Service
@Service
public
class
ParkInfoServiceImpl
implements
IParkInfoService
{
public
class
ParkInfoServiceImpl
implements
IParkInfoService
{
...
@@ -34,9 +30,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
...
@@ -34,9 +30,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
@Autowired
@Autowired
private
SysCollectionMapper
sysCollectionMapper
;
private
SysCollectionMapper
sysCollectionMapper
;
@Autowired
private
ParkTrafficInfoMapper
parkTrafficInfoMapper
;
@Autowired
@Autowired
private
ParkInvestmentDirectionInfoMapper
parkInvestmentDirectionInfoMapper
;
private
ParkInvestmentDirectionInfoMapper
parkInvestmentDirectionInfoMapper
;
...
@@ -78,9 +71,9 @@ public class ParkInfoServiceImpl implements IParkInfoService {
...
@@ -78,9 +71,9 @@ public class ParkInfoServiceImpl implements IParkInfoService {
}
}
@Override
@Override
public
List
<
ParkInfo
>
select
ByStatus
(
String
status
)
{
public
List
<
ParkInfo
>
select
ExcludeByStatus
(
ParkInfo
parkInfo
)
{
return
parkInfoMapper
.
select
ByStatus
(
status
);
return
parkInfoMapper
.
select
ExcludeByStatus
(
parkInfo
);
}
}
...
@@ -196,12 +189,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
...
@@ -196,12 +189,6 @@ public class ParkInfoServiceImpl implements IParkInfoService {
ParkInfo
parkInfo
=
parkInfoMapper
.
selectParkInfoById
(
parkId
);
ParkInfo
parkInfo
=
parkInfoMapper
.
selectParkInfoById
(
parkId
);
parkInfoAllVO
.
setParkInfo
(
parkInfo
);
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
parkInvestmentDirectionInfo
=
new
ParkInvestmentDirectionInfo
();
parkInvestmentDirectionInfo
.
setParkId
(
parkId
);
parkInvestmentDirectionInfo
.
setParkId
(
parkId
);
List
<
ParkInvestmentDirectionInfo
>
parkInvestmentDirectionInfos
=
parkInvestmentDirectionInfoMapper
.
selectParkInvestmentDirectionInfoList
(
parkInvestmentDirectionInfo
);
List
<
ParkInvestmentDirectionInfo
>
parkInvestmentDirectionInfos
=
parkInvestmentDirectionInfoMapper
.
selectParkInvestmentDirectionInfoList
(
parkInvestmentDirectionInfo
);
...
@@ -228,9 +215,7 @@ public class ParkInfoServiceImpl implements IParkInfoService {
...
@@ -228,9 +215,7 @@ public class ParkInfoServiceImpl implements IParkInfoService {
List
<
FileSource
>
fileSourcesPolicy
=
fileSourceMapper
.
selectFileSourceList
(
fileSource
);
List
<
FileSource
>
fileSourcesPolicy
=
fileSourceMapper
.
selectFileSourceList
(
fileSource
);
parkInfoAllVO
.
setFileSourcesPolicy
(
fileSourcesPolicy
);
parkInfoAllVO
.
setFileSourcesPolicy
(
fileSourcesPolicy
);
FileSource
fileSource1
=
new
FileSource
();
fileSource1
.
setObjectId
(
parkId
);
fileSource1
.
setObjectType
(
FileSourceObjectTypeEnum
.
PARK_PROHIBITED
.
getCode
());
List
<
FileSource
>
fileSourcesProhibited
=
fileSourceMapper
.
selectFileSourceList
(
fileSource
);
List
<
FileSource
>
fileSourcesProhibited
=
fileSourceMapper
.
selectFileSourceList
(
fileSource
);
parkInfoAllVO
.
setFileSourcesProhibited
(
fileSourcesProhibited
);
parkInfoAllVO
.
setFileSourcesProhibited
(
fileSourcesProhibited
);
...
...
ruoyi-system/src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
View file @
5931182a
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment