Skip to content

A
amos-boot-biz
Commit 1ca3c709 authored by tangwei's avatar tangwei
Browse files
Options

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

parents f720ed5c 6f80f074
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 5 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 1ca3c709
......@@ -117,9 +117,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Value("${auth-key-org-user:org_user_info}")
private String authKey;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
OrgUsrServiceImpl iOrgUsrService;
public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
......@@ -444,8 +444,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
if (null != result1.getResult()) {
t.put("amosOrgCode", result1.getResult().getRealName());
}
String chargePersonId = iOrgUsrService.getIdNumberByAmosId(t.get("amosOrgId").toString());
t.put("chargePersonId", chargePersonId);
String chargePersonId = iOrgUsrService.getIdNumberByAmosId(t.get("amosOrgId").toString());
t.put("chargePersonId", chargePersonId);
} else {
t.put("chargePersonId", null);
}
});
......
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 @ 1ca3c709
......@@ -541,7 +541,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsParams.put("callTimeStr", calledRo.getCallTimeStr());
smsParams.put("address", calledRo.getAddress());
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("fireSituation", calledRo.getFireSituation());
smsParams.put("trappedNum", calledRo.getTrappedNum());
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ 1ca3c709
......@@ -2642,6 +2642,25 @@
ALTER TABLE `wl_equipment_detail` ADD COLUMN `latitude` double(18,14) DEFAULT NULL COMMENT '纬度'
</sql>
</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