From 199f8433202944e1adf8d0246023cbb117b6c560 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sun, 24 Nov 2024 14:23:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=A6?= =?UTF-8?q?=E6=A0=A1=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eve/service/impl/SchoolServiceImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/service/impl/SchoolServiceImpl.java b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/service/impl/SchoolServiceImpl.java index 6410c6f5..c7f8d709 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/service/impl/SchoolServiceImpl.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/service/impl/SchoolServiceImpl.java @@ -14,7 +14,6 @@ import com.skyeye.common.util.mybatisplus.MybatisPlusUtil; import com.skyeye.eve.dao.SchoolDao; import com.skyeye.eve.entity.School; import com.skyeye.eve.service.SchoolService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,12 +31,16 @@ import java.util.Map; @SkyeyeService(name = "学校管理", groupName = "学校管理") public class SchoolServiceImpl extends SkyeyeBusinessServiceImpl implements SchoolService { - /** - * 获取所有学校列表展示为下拉选择框 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ + @Override + public void updatePrepose(School entity) { + School school = selectById(entity.getId()); + entity.setBackground(school.getBackground()); + entity.setNeLongitude(school.getNeLongitude()); + entity.setNeLatitude(school.getNeLatitude()); + entity.setSwLongitude(school.getSwLongitude()); + entity.setSwLatitude(school.getSwLatitude()); + } + @Override public void queryAllSchoolList(InputObject inputObject, OutputObject outputObject) { List schoolList = list(); @@ -51,7 +54,7 @@ public class SchoolServiceImpl extends SkyeyeBusinessServiceImpl updateWrapper = new UpdateWrapper<>(); updateWrapper.eq(CommonConstants.ID, map.get("id").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(School::getBackground), map.get("background").toString()); - updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLongitude),map.get("neLongitude").toString()); + updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLongitude), map.get("neLongitude").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(School::getNeLatitude), map.get("neLatitude").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(School::getSwLongitude), map.get("swLongitude").toString()); updateWrapper.set(MybatisPlusUtil.toColumns(School::getSwLatitude), map.get("swLatitude").toString()); From ca655bdc0c03bc1531636faf45ec0ebf3e03bca0 Mon Sep 17 00:00:00 2001 From: lqy <3431632001@qq,com> Date: Sun, 24 Nov 2024 14:41:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9C=B0=E7=82=B9?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E5=AD=A6=E6=A0=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E7=BB=8F=E7=BA=AC=E5=BA=A6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/skyeye/eve/entity/School.java | 8 ++++---- .../com/skyeye/school/building/entity/TeachBuilding.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java index 28dfbe5a..0945bca8 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/eve/entity/School.java @@ -42,19 +42,19 @@ public class School extends AreaGeneralInfo { @TableField(value = "ne_longitude") @ApiModelProperty(value = "东北经度") - private Float neLongitude; + private String neLongitude; @TableField(value = "ne_latitude") @ApiModelProperty(value = "东北纬度") - private Float neLatitude; + private String neLatitude; @TableField(value = "sw_longitude") @ApiModelProperty(value = "西南经度") - private Float swLongitude; + private String swLongitude; @TableField(value = "sw_latitude") @ApiModelProperty(value = "西南纬度") - private Float swLatitude; + private String swLatitude; @TableField(value = "background") @ApiModelProperty(value = "学校背景图") diff --git a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java index dc21ac6f..ef43a625 100644 --- a/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java +++ b/skyeye-school/school-pro/src/main/java/com/skyeye/school/building/entity/TeachBuilding.java @@ -49,11 +49,11 @@ public class TeachBuilding extends AreaGeneralInfo { @TableField("longitude") @ApiModelProperty(value = "经度",required = "required") - private Float longitude; + private String longitude; @TableField("latitude") @ApiModelProperty(value = "纬度",required = "required") - private Float latitude; + private String latitude; @TableField("logo") @ApiModelProperty(value = "地点logo" ,required = "required")