Skip to content

A
amos-boot-biz
Commit 3ab529cd authored by chenhao's avatar chenhao
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents 7959d8e8 1ca3c709
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 2 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ 3ab529cd
package com.yeejoin.equipmanage.service.impl; package com.yeejoin.equipmanage.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -14,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -14,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -186,6 +188,20 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe ...@@ -186,6 +188,20 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
} }
} }
//2.更新Detail表 //2.更新Detail表
if (StringUtils.isNotEmpty(equipmentDetail.getArea())) {
String[] addressData = equipmentDetail.getArea().split("@address@");
if (addressData.length > 1) {
equipmentDetail.setArea(addressData[0]);
JSONObject langLatObj = JSON.parseObject(addressData[1]);
if (StringUtils.isNotEmpty(langLatObj.getString("longitude"))) {
equipmentDetail.setLongitude(Double.valueOf(langLatObj.getString("longitude")));
}
if (StringUtils.isNotEmpty(langLatObj.getString("latitude"))) {
equipmentDetail.setLatitude(Double.valueOf(langLatObj.getString("latitude")));
}
}
}
equipmentDetailMapper.updateById(equipmentDetail); equipmentDetailMapper.updateById(equipmentDetail);
//3.保存图片 //3.保存图片
iUploadFileService.remove(new QueryWrapper<UploadFile>().eq("object_type", BillContentEnum.ZB.getKey()) iUploadFileService.remove(new QueryWrapper<UploadFile>().eq("object_type", BillContentEnum.ZB.getKey())
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ 3ab529cd
...@@ -541,7 +541,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -541,7 +541,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsParams.put("callTimeStr", calledRo.getCallTimeStr()); smsParams.put("callTimeStr", calledRo.getCallTimeStr());
smsParams.put("address", calledRo.getAddress()); smsParams.put("address", calledRo.getAddress());
smsParams.put("fireLocation", calledRo.getFireLocation()); smsParams.put("fireLocation", calledRo.getFireLocation());
smsParams.put("endTimeStr", alertCalled.getUpdateTime() != null ? DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : ""); smsParams.put("endTimeStr", !ValidationUtil.isEmpty(alertCalled.getUpdateTime()) ? DateUtils.convertDateToString(alertCalled.getUpdateTime(),DateUtils.DATE_TIME_PATTERN) : "");
smsParams.put("burningMaterial", calledRo.getBurningMaterial()); smsParams.put("burningMaterial", calledRo.getBurningMaterial());
smsParams.put("fireSituation", calledRo.getFireSituation()); smsParams.put("fireSituation", calledRo.getFireSituation());
smsParams.put("trappedNum", calledRo.getTrappedNum()); smsParams.put("trappedNum", calledRo.getTrappedNum());
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ 3ab529cd
...@@ -2642,6 +2642,25 @@ ...@@ -2642,6 +2642,25 @@
ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度' ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度'
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ltw" id="2022-03-01">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group_column"/>
</preConditions>
<comment>插入动态表单数据 wl_form_group_column</comment>
<sql>
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000308', 'longitude', '经度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000309', 'longitude', '经度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000310', 'longitude', '经度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000311', 'longitude', '经度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000312', 'longitude', '经度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000313', 'latitude', '纬度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000314', 'latitude', '纬度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000315', 'latitude', '纬度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000316', 'latitude', '纬度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000317', 'latitude', '纬度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000318', 'address', '地址', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:01:04');
</sql>
</changeSet>
......
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