Skip to content

A
amos-boot-biz
Commit 27697e1e authored by tangwei's avatar tangwei
Browse files
Options

怎加重点部位接口

parent 2d93a94a
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 25 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteDateDto.java 0 → 100644
View file @ 27697e1e
package com.yeejoin.amos.boot.module.common.api.dto;
import io.swagger.annotations.ApiModelProperty;
/**
* @description:
* @author: tw
* @createDate: 2021/9/17
*/
public class KeySiteDateDto {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "重点部位名称")
private String name;
@ApiModelProperty(value = "位置")
private String fireLocation;
@ApiModelProperty(value = "經度")
private String floorLongitude;
@ApiModelProperty(value = "緯度")
private String floorLatitude;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getFireLocation() {
return fireLocation;
}
public void setFireLocation(String fireLocation) {
this.fireLocation = fireLocation;
}
public String getFloorLongitude() {
return floorLongitude;
}
public void setFloorLongitude(String floorLongitude) {
this.floorLongitude = floorLongitude;
}
public String getFloorLatitude() {
return floorLatitude;
}
public void setFloorLatitude(String floorLatitude) {
this.floorLatitude = floorLatitude;
}
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/KeySite.java
View file @ 27697e1e
package com.yeejoin.amos.boot.module.common.api.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -137,4 +139,11 @@ public class KeySite extends BaseEntity {
@TableField("remark")
private String remark;
@TableField( "longitude")
private Double longitude;
@TableField("latitude")
private Double latitude;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/KeySiteMapper.java
View file @ 27697e1e
......@@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
......@@ -33,4 +34,7 @@ public List<KeySiteDto> getKeySiteList();
*/
public KeySiteDto getSequenceNbr(Long sequenceNbr);
public List<KeySiteDateDto> getKeySiteDate(Long id);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IKeySiteService.java
View file @ 27697e1e
package com.yeejoin.amos.boot.module.common.api.service;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
......@@ -64,4 +65,8 @@ public boolean saveExcel(List<KeySiteExcleDto> excelDtoList);
* @return
*/
public List<OrgMenuDto> getBuildAndKeyTree(Long sequenceNbr);
public List<KeySiteDateDto> getKeySiteDate(Long id);
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml
View file @ 27697e1e
......@@ -120,5 +120,20 @@
left join cb_org_usr cou on c.belong_id = cou.sequence_nbr
where c.is_delete = FALSE;
</select>
<select id="getKeySiteDate" resultType="com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto">
SELECT
c.sequence_nbr AS id,
c.`name` as name,
c.address_desc as fireLocation,
c.longitude as floorLongitude,
c.latitude AS floorLatitude
FROM cb_key_site c
where c.is_delete=FALSE
<if test="belongId != null and belongId!='-1' and belongId != -1">
AND c.`belong_id`= #{id}
</if>
</select>
</mapper>
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/NewsDate.java
View file @ 27697e1e
......@@ -7,37 +7,40 @@ package com.yeejoin.amos.boot.module.jcs.api.dto;
*/
public class NewsDate {
private Long id; // 物联警情id
private Double floorLongitude; // 建筑经度
private Double floorLatitude; // 建筑纬度
private String floorName; // 建筑名称
private Long id; // 物联警情id
private String contactUser;//联系人
private String contactPhone;//联系人电话
private String unitInvolvedId; // 事发单位
private String unitInvolvedName; // 事发单位名称
private Double longitude; // 建筑经度
private Double latitude; // 建筑纬度
private String address; // 地址
private String fireLocation;//火灾地址
private Double floorLongitude;//楼经度
private Double floorLatitude;//楼纬度
public Double getFloorLongitude() {
return floorLongitude;
public Long getId() {
return id;
}
public void setFloorLongitude(Double floorLongitude) {
this.floorLongitude = floorLongitude;
public void setId(Long id) {
this.id = id;
}
public Double getFloorLatitude() {
return floorLatitude;
public String getContactUser() {
return contactUser;
}
public void setFloorLatitude(Double floorLatitude) {
this.floorLatitude = floorLatitude;
public void setContactUser(String contactUser) {
this.contactUser = contactUser;
}
public String getFloorName() {
return floorName;
public String getContactPhone() {
return contactPhone;
}
public void setFloorName(String floorName) {
this.floorName = floorName;
public void setContactPhone(String contactPhone) {
this.contactPhone = contactPhone;
}
public String getUnitInvolvedId() {
......@@ -55,4 +58,52 @@ public class NewsDate {
public void setUnitInvolvedName(String unitInvolvedName) {
this.unitInvolvedName = unitInvolvedName;
}
public Double getLongitude() {
return longitude;
}
public void setLongitude(Double longitude) {
this.longitude = longitude;
}
public Double getLatitude() {
return latitude;
}
public void setLatitude(Double latitude) {
this.latitude = latitude;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getFireLocation() {
return fireLocation;
}
public void setFireLocation(String fireLocation) {
this.fireLocation = fireLocation;
}
public Double getFloorLongitude() {
return floorLongitude;
}
public void setFloorLongitude(Double floorLongitude) {
this.floorLongitude = floorLongitude;
}
public Double getFloorLatitude() {
return floorLatitude;
}
public void setFloorLatitude(Double floorLatitude) {
this.floorLatitude = floorLatitude;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java
View file @ 27697e1e
......@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDateDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.service.IKeySiteService;
......@@ -182,4 +183,17 @@ public class KeySiteController extends BaseController {
public ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long buildingId) {
return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildingId));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "部位", notes = "部位")
@GetMapping(value = "/getKeySiteDate")
public ResponseModel<List<KeySiteDateDto>> getKeySiteDate(@RequestParam Long id) {
return ResponseHelper.buildResponse(keySiteService.getKeySiteDate(id));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java
View file @ 27697e1e
......@@ -8,11 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto;
import com.yeejoin.amos.boot.module.common.api.dto.*;
import com.yeejoin.amos.boot.module.common.api.entity.KeySite;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
......@@ -309,5 +305,10 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
return list1;
}
@Override
public List<KeySiteDateDto> getKeySiteDate(Long id) {
return keySiteMapper.getKeySiteDate(id);
}
}
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 27697e1e
......@@ -596,4 +596,28 @@
<changeSet author="tw" id="2021-09-17-005">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_key_site" columnName="latitude"/>
</not>
</preConditions>
<comment>cb_key_site add column</comment>
<sql>
alter table `cb_key_site` add column `latitude` double(18, 14) NULL DEFAULT NULL ;
</sql>
</changeSet>
<changeSet author="tw" id="2021-09-17-006">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_key_site" columnName="longitude"/>
</not>
</preConditions>
<comment>cb_key_site add column</comment>
<sql>
alter table `cb_key_site` add column `longitude` double(18, 14) NULL DEFAULT NULL ;
</sql>
</changeSet>
</databaseChangeLog>
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