feat:新增标注返回groupid,标注属性保存
This commit is contained in:
parent
3b89fd90dd
commit
b6777f4776
|
|
@ -1,5 +1,7 @@
|
||||||
package com.ruoyi.airline.controller.convert;
|
package com.ruoyi.airline.controller.convert;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.ruoyi.airline.api.domain.AirlineMarkerVO;
|
import com.ruoyi.airline.api.domain.AirlineMarkerVO;
|
||||||
import com.ruoyi.airline.service.dto.AirlineMarkerDTO;
|
import com.ruoyi.airline.service.dto.AirlineMarkerDTO;
|
||||||
import com.ruoyi.common.core.utils.BaseConvert;
|
import com.ruoyi.common.core.utils.BaseConvert;
|
||||||
|
|
@ -14,6 +16,7 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public class AirlineMarkerControllerConvert extends BaseConvert<AirlineMarkerDTO, AirlineMarkerVO>
|
public class AirlineMarkerControllerConvert extends BaseConvert<AirlineMarkerDTO, AirlineMarkerVO>
|
||||||
{
|
{
|
||||||
|
private static final ObjectMapper objectMapper = new ObjectMapper();
|
||||||
private static final AirlineMarkerControllerConvert INSTANCE = new AirlineMarkerControllerConvert();
|
private static final AirlineMarkerControllerConvert INSTANCE = new AirlineMarkerControllerConvert();
|
||||||
|
|
||||||
private AirlineMarkerControllerConvert() {
|
private AirlineMarkerControllerConvert() {
|
||||||
|
|
@ -72,7 +75,15 @@ public class AirlineMarkerControllerConvert extends BaseConvert<AirlineMarkerDTO
|
||||||
dto.setColor(vo.getColor());
|
dto.setColor(vo.getColor());
|
||||||
dto.setIcon(vo.getIcon());
|
dto.setIcon(vo.getIcon());
|
||||||
dto.setFontSize(vo.getFontSize());
|
dto.setFontSize(vo.getFontSize());
|
||||||
dto.setCoordinates(vo.getCoordinates());
|
|
||||||
|
if (vo.getCoordinates() != null) {
|
||||||
|
try {
|
||||||
|
dto.setCoordinates(objectMapper.writeValueAsString(vo.getCoordinates()));
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
dto.setCoordinates(null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dto.setDescription(vo.getDescription());
|
dto.setDescription(vo.getDescription());
|
||||||
dto.setGroupId(vo.getGroupId());
|
dto.setGroupId(vo.getGroupId());
|
||||||
dto.setCreateBy(vo.getCreateBy());
|
dto.setCreateBy(vo.getCreateBy());
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
public class AirlineMarkerServiceConvert extends BaseConvert<AirlineMarker, AirlineMarkerDTO>
|
public class AirlineMarkerServiceConvert extends BaseConvert<AirlineMarker, AirlineMarkerDTO>
|
||||||
{
|
{
|
||||||
|
|
||||||
private static final AirlineMarkerServiceConvert INSTANCE = new AirlineMarkerServiceConvert();
|
private static final AirlineMarkerServiceConvert INSTANCE = new AirlineMarkerServiceConvert();
|
||||||
|
|
||||||
private AirlineMarkerServiceConvert() {
|
private AirlineMarkerServiceConvert() {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue