Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-region-outline
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-region-outline
Commits
3dbb0732
Commit
3dbb0732
authored
Jan 02, 2024
by
zhouxudong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
地图
parent
758ac69b
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
229 additions
and
63 deletions
+229
-63
DevelopmentInfoController.java
...dle/development/controller/DevelopmentInfoController.java
+8
-1
DevelopmentMapDto.java
...m/lyy/admin/moudle/development/dto/DevelopmentMapDto.java
+56
-0
DevelopmentInfoService.java
...in/moudle/development/service/DevelopmentInfoService.java
+9
-0
DevelopmentInfoServiceImpl.java
.../development/service/impl/DevelopmentInfoServiceImpl.java
+12
-0
DevelopmentMapDetails.java
...yy/admin/moudle/development/vo/DevelopmentMapDetails.java
+68
-0
DevelopmentMapVo.java
...com/lyy/admin/moudle/development/vo/DevelopmentMapVo.java
+39
-0
HomePageController.java
.../admin/moudle/homepage/controller/HomePageController.java
+0
-4
RegionGeoEntity.java
...a/com/lyy/admin/moudle/system/entity/RegionGeoEntity.java
+23
-32
RegionGeoMapper.java
...a/com/lyy/admin/moudle/system/mapper/RegionGeoMapper.java
+2
-2
SysAreaCodeService.java
...m/lyy/admin/moudle/system/service/SysAreaCodeService.java
+2
-2
SysAreaCodeServiceImpl.java
...in/moudle/system/service/impl/SysAreaCodeServiceImpl.java
+3
-3
RegionGeoMapper.xml
src/main/resources/mapper/system/RegionGeoMapper.xml
+7
-0
SysAreaCodeMapper.xml
src/main/resources/mapper/system/SysAreaCodeMapper.xml
+0
-19
No files found.
src/main/java/com/lyy/admin/moudle/development/controller/DevelopmentInfoController.java
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
development
.
controller
;
package
com
.
lyy
.
admin
.
moudle
.
development
.
controller
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.lyy.admin.moudle.development.dto.DevelopmentMapDto
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO
;
import
com.lyy.admin.common.anno.EncryptBusiness
;
import
com.lyy.admin.common.anno.EncryptBusiness
;
import
com.lyy.admin.common.page.TableDataInfo
;
import
com.lyy.admin.common.page.TableDataInfo
;
import
com.lyy.admin.moudle.development.vo.DevelopmentMapVo
;
import
com.lyy.admin.moudle.other.controller.BaseController
;
import
com.lyy.admin.moudle.other.controller.BaseController
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
...
@@ -111,6 +113,11 @@ public class DevelopmentInfoController extends BaseController {
...
@@ -111,6 +113,11 @@ public class DevelopmentInfoController extends BaseController {
public
boolean
deleteDevelopmentInfo
(
@PathVariable
Integer
id
){
public
boolean
deleteDevelopmentInfo
(
@PathVariable
Integer
id
){
return
developmentInfoSerivce
.
removeById
(
id
);
return
developmentInfoSerivce
.
removeById
(
id
);
}
}
@PostMapping
(
"/map"
)
@ResponseBody
@ApiOperation
(
value
=
"地图信息"
)
public
List
<
DevelopmentMapVo
>
map
(
@RequestBody
DevelopmentMapDto
developmentMapDto
){
return
this
.
developmentInfoSerivce
.
map
(
developmentMapDto
);
}
}
}
src/main/java/com/lyy/admin/moudle/development/dto/DevelopmentMapDto.java
0 → 100644
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
development
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.*
;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2023/12/29 11:15
* @Description: 地图页面开发区信息
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
public
class
DevelopmentMapDto
{
//关键字名称
@ApiModelProperty
(
value
=
"关键字名称"
)
private
String
name
;
//级别
@ApiModelProperty
(
value
=
"级别"
)
private
Integer
level
;
//经度
@ApiModelProperty
(
value
=
"经度"
)
private
Double
lon
;
//纬度
@ApiModelProperty
(
value
=
"纬度"
)
private
Double
lat
;
//类型
@ApiModelProperty
(
value
=
"类型"
)
private
String
type
;
//所选择的地理位置级别
//private Integer mapLevel;
//所选择的地理位置编码
@ApiModelProperty
(
value
=
"省份编码"
)
private
String
provinceCode
;
@ApiModelProperty
(
value
=
"城市编码"
)
private
String
cityCode
;
@ApiModelProperty
(
value
=
"区县编码"
)
private
String
regionCode
;
//面积
@ApiModelProperty
(
value
=
"面积"
)
private
String
area
;
//行业
@ApiModelProperty
(
value
=
"行业"
)
private
Integer
profession
;
// @ApiModelProperty(value = "面积上限(单位:㎡)")
@ApiModelProperty
(
hidden
=
true
)
private
Double
planAreaUp
;
// @ApiModelProperty(value = "面积下限(单位:㎡)")
@ApiModelProperty
(
hidden
=
true
)
private
Double
planAreaUnder
;
}
src/main/java/com/lyy/admin/moudle/development/service/DevelopmentInfoService.java
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
development
.
service
;
package
com
.
lyy
.
admin
.
moudle
.
development
.
service
;
import
com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.lyy.admin.moudle.development.dto.DevelopmentMapDto
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfoAuthenticationParam
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfoAuthenticationParam
;
...
@@ -9,6 +10,7 @@ import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
...
@@ -9,6 +10,7 @@ import com.lyy.admin.moudle.development.entity.DevelopmentInfoParam;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentMapVo
;
import
java.util.List
;
import
java.util.List
;
...
@@ -45,4 +47,11 @@ public interface DevelopmentInfoService extends IService<DevelopmentInfo> {
...
@@ -45,4 +47,11 @@ public interface DevelopmentInfoService extends IService<DevelopmentInfo> {
* @return: java.util.List<java.lang.String>
* @return: java.util.List<java.lang.String>
*/
*/
public
List
<
String
>
investmentDirection
(
Integer
developmentId
);
public
List
<
String
>
investmentDirection
(
Integer
developmentId
);
/**
* @description: 地图信息
* @date: 2024/1/2 14:31
* @param: [developmentMapDto]
* @return: java.util.List<com.lyy.admin.moudle.development.vo.DevelopmentMapVo>
**/
List
<
DevelopmentMapVo
>
map
(
DevelopmentMapDto
developmentMapDto
);
}
}
src/main/java/com/lyy/admin/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @
3dbb0732
...
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.lyy.admin.common.utils.BusinessService
;
import
com.lyy.admin.common.utils.BusinessService
;
import
com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.lyy.admin.moudle.development.dto.DevelopmentMapDto
;
import
com.lyy.admin.moudle.development.vo.*
;
import
com.lyy.admin.moudle.development.vo.*
;
import
com.lyy.admin.moudle.other.entity.FileSource
;
import
com.lyy.admin.moudle.other.entity.FileSource
;
import
com.lyy.admin.enumerate.*
;
import
com.lyy.admin.enumerate.*
;
...
@@ -696,6 +697,17 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
...
@@ -696,6 +697,17 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
}
return
result
;
return
result
;
}
}
/**
* @description: 地图信息
* @date: 2024/1/2 14:31
* @param: [developmentMapDto]
* @return: java.util.List<com.lyy.admin.moudle.development.vo.DevelopmentMapVo>
**/
@Override
public
List
<
DevelopmentMapVo
>
map
(
DevelopmentMapDto
developmentMapDto
)
{
return
null
;
}
@Resource
@Resource
BusinessService
businessService
;
BusinessService
businessService
;
@Override
@Override
...
...
src/main/java/com/lyy/admin/moudle/development/vo/DevelopmentMapDetails.java
0 → 100644
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
development
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.*
;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2024/1/2 9:45
* @Description:
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel
(
value
=
"地图返回信息"
)
public
class
DevelopmentMapDetails
{
private
Integer
id
;
private
String
businessId
;
private
String
imgUrl
;
/**
* 省code
*/
@ApiModelProperty
(
value
=
"省code"
)
private
String
provinceCode
;
/**
* 省
*/
@ApiModelProperty
(
value
=
"省"
)
private
String
provinceName
;
/**
* 市code
*/
@ApiModelProperty
(
value
=
"市code"
)
private
String
cityCode
;
/**
* 市
*/
@ApiModelProperty
(
value
=
"市"
)
private
String
cityName
;
/**
* 区/县code
*/
@ApiModelProperty
(
value
=
"区/县code"
)
private
String
regionCode
;
/**
* 区/县
*/
@ApiModelProperty
(
value
=
"区/县"
)
private
String
regionName
;
/**
* 片区级别
*/
@ApiModelProperty
(
value
=
"片区级别"
)
private
String
levelCode
;
@ApiModelProperty
(
value
=
"片区级别名称"
)
private
String
levelName
;
@ApiModelProperty
(
value
=
"区域面积(规划面积)(单位:㎡)"
)
private
String
planArea
;
}
src/main/java/com/lyy/admin/moudle/development/vo/DevelopmentMapVo.java
0 → 100644
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
development
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.*
;
import
java.util.List
;
/**
* @Author:zhouxudong
* @version: 1.0
* @Date: 2024/1/2 9:36
* @Description: 地图返回信息
*/
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@ToString
@ApiModel
(
value
=
"地图返回信息"
)
public
class
DevelopmentMapVo
{
//数量
@ApiModelProperty
(
value
=
"数量"
)
private
int
num
;
//地理位置名称
@ApiModelProperty
(
value
=
"地理位置名称"
)
private
String
name
;
//地理位置编码
@ApiModelProperty
(
value
=
"地理位置编码"
)
private
Integer
code
;
//经度
@ApiModelProperty
(
value
=
"经度"
)
private
Double
lon
;
//纬度
@ApiModelProperty
(
value
=
"纬度"
)
private
Double
lat
;
@ApiModelProperty
(
value
=
"列表详情"
)
private
List
<
DevelopmentMapDetails
>
detailsList
;
}
src/main/java/com/lyy/admin/moudle/homepage/controller/HomePageController.java
View file @
3dbb0732
...
@@ -25,7 +25,6 @@ import com.lyy.admin.moudle.megalopolis.service.MegalopolisCityInfoService;
...
@@ -25,7 +25,6 @@ import com.lyy.admin.moudle.megalopolis.service.MegalopolisCityInfoService;
import
com.lyy.admin.moudle.megalopolis.service.MegalopolisInfoService
;
import
com.lyy.admin.moudle.megalopolis.service.MegalopolisInfoService
;
import
com.lyy.admin.moudle.homepage.service.HomepageService
;
import
com.lyy.admin.moudle.homepage.service.HomepageService
;
import
com.lyy.admin.moudle.park.service.ParkInfoService
;
import
com.lyy.admin.moudle.park.service.ParkInfoService
;
import
com.lyy.admin.moudle.system.service.SysAreaCodeService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -67,9 +66,6 @@ public class HomePageController extends BaseController {
...
@@ -67,9 +66,6 @@ public class HomePageController extends BaseController {
// @Autowired
// @Autowired
// SysCarouselInfoService sysCarouselInfoService;
// SysCarouselInfoService sysCarouselInfoService;
@Autowired
SysAreaCodeService
sysAreaCodeService
;
@Autowired
@Autowired
RegionTargetInfoService
regionTargetInfoService
;
RegionTargetInfoService
regionTargetInfoService
;
...
...
src/main/java/com/lyy/admin/moudle/system/entity/
SysAreaCode
.java
→
src/main/java/com/lyy/admin/moudle/system/entity/
RegionGeoEntity
.java
View file @
3dbb0732
...
@@ -5,41 +5,33 @@ import com.baomidou.mybatisplus.annotation.TableField;
...
@@ -5,41 +5,33 @@ import com.baomidou.mybatisplus.annotation.TableField;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
*
* @Author:zhouxudong
* @TableName sys_area_code
* @version: 1.0
* @Date: 2023/12/29 10:21
* @Description: 地理位置表
*/
*/
@TableName
(
value
=
"
sys_area_code
"
)
@TableName
(
value
=
"
region_boundary_geo
"
)
@Data
@Data
public
class
SysAreaCode
implements
Serializable
{
public
class
RegionGeoEntity
implements
Serializable
{
/**
private
static
final
long
serialVersionUID
=
1L
;
* 区划代码
*/
@TableId
@TableId
private
Long
code
;
@ApiModelProperty
(
value
=
"主键id"
)
private
int
id
;
/**
@ApiModelProperty
(
value
=
"父id"
)
* 名称
private
int
pid
;
*/
@ApiModelProperty
(
value
=
"等级"
)
private
int
deep
;
@ApiModelProperty
(
value
=
"名字"
)
private
String
name
;
private
String
name
;
@ApiModelProperty
(
value
=
"全称"
)
/**
private
String
extPath
;
* 级别1-5,省市县镇村
@ApiModelProperty
(
value
=
"经纬度"
)
*/
private
String
geo
;
private
Integer
level
;
@ApiModelProperty
(
value
=
"地图位置经纬度"
)
private
String
polygon
;
/**
}
* 父级区划代码
*/
private
Long
pcode
;
/**
* 城乡分类
*/
private
Integer
category
;
@TableField
(
exist
=
false
)
private
static
final
long
serialVersionUID
=
1L
;
}
\ No newline at end of file
src/main/java/com/lyy/admin/moudle/system/mapper/
SysAreaCode
Mapper.java
→
src/main/java/com/lyy/admin/moudle/system/mapper/
RegionGeo
Mapper.java
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
system
.
mapper
;
package
com
.
lyy
.
admin
.
moudle
.
system
.
mapper
;
import
com.lyy.admin.moudle.system.entity.
SysAreaCode
;
import
com.lyy.admin.moudle.system.entity.
RegionGeoEntity
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
/**
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @createDate 2023-09-14 09:26:05
* @createDate 2023-09-14 09:26:05
* @Entity com.lyy.admin.moudle.system.entity.SysAreaCode
* @Entity com.lyy.admin.moudle.system.entity.SysAreaCode
*/
*/
public
interface
SysAreaCodeMapper
extends
BaseMapper
<
SysAreaCode
>
{
public
interface
RegionGeoMapper
extends
BaseMapper
<
RegionGeoEntity
>
{
}
}
...
...
src/main/java/com/lyy/admin/moudle/system/service/SysAreaCodeService.java
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
system
.
service
;
package
com
.
lyy
.
admin
.
moudle
.
system
.
service
;
import
com.lyy.admin.moudle.system.entity.SysAreaCode
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.lyy.admin.moudle.system.entity.RegionGeoEntity
;
/**
/**
* @author 26996
* @author 26996
* @description 针对表【sys_area_code】的数据库操作Service
* @description 针对表【sys_area_code】的数据库操作Service
* @createDate 2023-09-14 09:26:05
* @createDate 2023-09-14 09:26:05
*/
*/
public
interface
SysAreaCodeService
extends
IService
<
SysAreaCode
>
{
public
interface
SysAreaCodeService
extends
IService
<
RegionGeoEntity
>
{
}
}
src/main/java/com/lyy/admin/moudle/system/service/impl/SysAreaCodeServiceImpl.java
View file @
3dbb0732
package
com
.
lyy
.
admin
.
moudle
.
system
.
service
.
impl
;
package
com
.
lyy
.
admin
.
moudle
.
system
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.lyy.admin.moudle.system.entity.
SysAreaCode
;
import
com.lyy.admin.moudle.system.entity.
RegionGeoEntity
;
import
com.lyy.admin.moudle.system.service.SysAreaCodeService
;
import
com.lyy.admin.moudle.system.service.SysAreaCodeService
;
import
com.lyy.admin.moudle.system.mapper.
SysAreaCode
Mapper
;
import
com.lyy.admin.moudle.system.mapper.
RegionGeo
Mapper
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
/**
/**
...
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
...
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* @createDate 2023-09-14 09:26:05
* @createDate 2023-09-14 09:26:05
*/
*/
@Service
@Service
public
class
SysAreaCodeServiceImpl
extends
ServiceImpl
<
SysAreaCodeMapper
,
SysAreaCode
>
public
class
SysAreaCodeServiceImpl
extends
ServiceImpl
<
RegionGeoMapper
,
RegionGeoEntity
>
implements
SysAreaCodeService
{
implements
SysAreaCodeService
{
}
}
...
...
src/main/resources/mapper/system/RegionGeoMapper.xml
0 → 100644
View file @
3dbb0732
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.lyy.admin.moudle.system.mapper.RegionGeoMapper"
>
</mapper>
src/main/resources/mapper/system/SysAreaCodeMapper.xml
deleted
100644 → 0
View file @
758ac69b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.lyy.admin.moudle.system.mapper.SysAreaCodeMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.lyy.admin.moudle.system.entity.SysAreaCode"
>
<id
property=
"code"
column=
"code"
jdbcType=
"BIGINT"
/>
<result
property=
"name"
column=
"name"
jdbcType=
"VARCHAR"
/>
<result
property=
"level"
column=
"level"
jdbcType=
"TINYINT"
/>
<result
property=
"pcode"
column=
"pcode"
jdbcType=
"BIGINT"
/>
<result
property=
"category"
column=
"category"
jdbcType=
"INTEGER"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
code,name,level,
pcode,category
</sql>
</mapper>
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