新增国标字段
This commit is contained in:
parent
3451de9605
commit
89756f2f9d
@ -23,6 +23,16 @@ public class GridDTO extends GridRelationDTO {
|
|||||||
private String fillColor;
|
private String fillColor;
|
||||||
@ApiModelProperty(name = "gridName", value = "网格名称")
|
@ApiModelProperty(name = "gridName", value = "网格名称")
|
||||||
private String gridName;
|
private String gridName;
|
||||||
|
@ApiModelProperty(name = "bGId", value = "单元网格标识码")
|
||||||
|
private String bGId;
|
||||||
|
@ApiModelProperty(name = "bGSqua", value = "面积")
|
||||||
|
private Integer bGSqua;
|
||||||
|
@ApiModelProperty(name = "oRDate", value = "单元网格划分的初始时间")
|
||||||
|
private String oRDate;
|
||||||
|
@ApiModelProperty(name = "cHDate", value = "单元网格发生变更或不再使用的时间")
|
||||||
|
private String cHDate;
|
||||||
|
@ApiModelProperty(name = "note", value = "备注")
|
||||||
|
private String note;
|
||||||
@ApiModelProperty(name = "relationIdArray", value = "关联ID列表")
|
@ApiModelProperty(name = "relationIdArray", value = "关联ID列表")
|
||||||
private List<String> relationIdArray;
|
private List<String> relationIdArray;
|
||||||
@ApiModelProperty(name = "pointArray", value = "网格点列表")
|
@ApiModelProperty(name = "pointArray", value = "网格点列表")
|
||||||
|
@ -6,8 +6,13 @@
|
|||||||
|
|
||||||
<resultMap id="gridDTO" type="ink.wgink.module.map.pojo.dto.grid.GridDTO">
|
<resultMap id="gridDTO" type="ink.wgink.module.map.pojo.dto.grid.GridDTO">
|
||||||
<id column="grid_id" property="gridId"/>
|
<id column="grid_id" property="gridId"/>
|
||||||
<result column="fill_color" property="fillColor"/>
|
|
||||||
<result column="grid_name" property="gridName"/>
|
<result column="grid_name" property="gridName"/>
|
||||||
|
<result column="fill_color" property="fillColor"/>
|
||||||
|
<result column="b_g_id" property="bGId"/>
|
||||||
|
<result column="b_g_squa" property="bGSqua"/>
|
||||||
|
<result column="o_r_date" property="oRDate"/>
|
||||||
|
<result column="c_h_date" property="cHDate"/>
|
||||||
|
<result column="note" property="note"/>
|
||||||
<result column="relation_id" property="relationId"/>
|
<result column="relation_id" property="relationId"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
@ -17,6 +22,11 @@
|
|||||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
|
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
`grid_id` char(36) NOT NULL,
|
`grid_id` char(36) NOT NULL,
|
||||||
`grid_name` varchar(255) NOT NULL,
|
`grid_name` varchar(255) NOT NULL,
|
||||||
|
`b_g_id` char(15) NOT NULL COMMENT '单元网格标识码',
|
||||||
|
`b_g_squa` int(11) NOT NULL COMMENT '面积',
|
||||||
|
`o_r_date` date NOT NULL COMMENT '单元网格划分的初始时间',
|
||||||
|
`c_h_date` date COMMENT '单元网格发生变更或不再使用的时间',
|
||||||
|
`note` varchar(100) '备注',
|
||||||
`fill_color` varchar(7) NOT NULL DEFAULT '#000000' COMMENT '颜色',
|
`fill_color` varchar(7) NOT NULL DEFAULT '#000000' COMMENT '颜色',
|
||||||
`gmt_create` datetime DEFAULT NULL,
|
`gmt_create` datetime DEFAULT NULL,
|
||||||
`creator` char(36) DEFAULT NULL,
|
`creator` char(36) DEFAULT NULL,
|
||||||
@ -33,6 +43,11 @@
|
|||||||
INSERT INTO map_grid(
|
INSERT INTO map_grid(
|
||||||
grid_id,
|
grid_id,
|
||||||
grid_name,
|
grid_name,
|
||||||
|
b_g_id,
|
||||||
|
b_g_squa,
|
||||||
|
o_r_date,
|
||||||
|
c_h_date,
|
||||||
|
note,
|
||||||
fill_color,
|
fill_color,
|
||||||
gmt_create,
|
gmt_create,
|
||||||
creator,
|
creator,
|
||||||
@ -42,6 +57,11 @@
|
|||||||
) VALUES(
|
) VALUES(
|
||||||
#{gridId},
|
#{gridId},
|
||||||
#{gridName},
|
#{gridName},
|
||||||
|
#{bGId},
|
||||||
|
#{bGSqua},
|
||||||
|
#{oRDate},
|
||||||
|
#{cHDate},
|
||||||
|
#{note},
|
||||||
#{fillColor},
|
#{fillColor},
|
||||||
#{gmtCreate},
|
#{gmtCreate},
|
||||||
#{creator},
|
#{creator},
|
||||||
@ -67,30 +87,16 @@
|
|||||||
</if>
|
</if>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<!-- 获取网格列表(通过关联ID) -->
|
|
||||||
<select id="listGridByRelationId" parameterType="java.lang.String" resultMap="gridDTO" useCache="true">
|
|
||||||
SELECT
|
|
||||||
t1.grid_id,
|
|
||||||
t1.fill_color,
|
|
||||||
t1.grid_name,
|
|
||||||
t2.relation_id
|
|
||||||
FROM
|
|
||||||
map_grid t1
|
|
||||||
LEFT JOIN
|
|
||||||
map_grid_relation t2
|
|
||||||
ON
|
|
||||||
t1.grid_id = t2.grid_id
|
|
||||||
WHERE
|
|
||||||
t1.is_delete = 0
|
|
||||||
AND
|
|
||||||
t2.relation_id = #{_parameter}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
<!-- 网格列表 -->
|
<!-- 网格列表 -->
|
||||||
<select id="list" parameterType="map" resultMap="gridDTO" useCache="true">
|
<select id="list" parameterType="map" resultMap="gridDTO" useCache="true">
|
||||||
SELECT
|
SELECT
|
||||||
t1.grid_id,
|
t1.grid_id,
|
||||||
t1.fill_color,
|
t1.fill_color,
|
||||||
|
t1.b_g_id,
|
||||||
|
t1.b_g_squa,
|
||||||
|
t1.o_r_date,
|
||||||
|
t1.c_h_date,
|
||||||
|
t1.note,
|
||||||
t1.grid_name
|
t1.grid_name
|
||||||
FROM
|
FROM
|
||||||
map_grid t1
|
map_grid t1
|
||||||
@ -110,6 +116,11 @@
|
|||||||
SELECT
|
SELECT
|
||||||
t1.grid_id,
|
t1.grid_id,
|
||||||
t1.fill_color,
|
t1.fill_color,
|
||||||
|
t1.b_g_id,
|
||||||
|
t1.b_g_squa,
|
||||||
|
t1.o_r_date,
|
||||||
|
t1.c_h_date,
|
||||||
|
t1.note,
|
||||||
t1.grid_name
|
t1.grid_name
|
||||||
FROM
|
FROM
|
||||||
map_grid t1
|
map_grid t1
|
||||||
@ -125,6 +136,10 @@
|
|||||||
GROUP BY
|
GROUP BY
|
||||||
t1.grid_id,
|
t1.grid_id,
|
||||||
t1.fill_color,
|
t1.fill_color,
|
||||||
|
t1.b_g_id,
|
||||||
|
t1.b_g_squa,
|
||||||
|
t1.o_r_date,
|
||||||
|
t1.c_h_date,
|
||||||
t1.grid_name
|
t1.grid_name
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user