diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java index bd8510e..c623d9a 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenControllerP2.java @@ -214,6 +214,7 @@ public class BigScreenControllerP2 { ; List list = survEnterpriseInfoService.list(wraps); + list.forEach(item->item.setEntLonglat(item.getEntLong()+","+item.getEntLat())); result.setResult(list); result.setSuccess(true); } catch (Exception e) { diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvEnterpriseInfoController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvEnterpriseInfoController.java index 23dfdf7..d049ed6 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvEnterpriseInfoController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvEnterpriseInfoController.java @@ -78,6 +78,13 @@ public class SurvEnterpriseInfoController extends JeecgController list = enterpriseInfoService.list(wraps); + list.forEach(item->item.setEntLonglat(item.getEntLong()+","+item.getEntLat())); result.setResult(list); result.setSuccess(true); } catch (Exception e) { diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvEnterpriseInfo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvEnterpriseInfo.java index 9541a64..872ac51 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvEnterpriseInfo.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvEnterpriseInfo.java @@ -1,9 +1,6 @@ package org.jeecg.common.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -109,4 +106,7 @@ public class SurvEnterpriseInfo implements Serializable { /** 是否启用 */ @ApiModelProperty(name = "是否启用",notes = "") private Integer isEnable ; + + @TableField(exist = false) + private String entLonglat ; }