Skip to content

A
amos-boot-biz
Commit 48a01860 authored by wujiang's avatar wujiang
Browse files
Options

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

parents e09f18ba 0669edd0
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 12 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/DataDictionary.java
View file @ 48a01860
...@@ -42,6 +42,9 @@ public class DataDictionary extends BaseEntity { ...@@ -42,6 +42,9 @@ public class DataDictionary extends BaseEntity {
@ApiModelProperty(value = "排序字段") @ApiModelProperty(value = "排序字段")
private int sortNum; private int sortNum;
@ApiModelProperty(value = "扩展字段")
private String extend;
@ApiModelProperty(value = "对应消防专家的数量，仅适应与消防资源专家领域树结构的展示") @ApiModelProperty(value = "对应消防专家的数量，仅适应与消防资源专家领域树结构的展示")
@TableField(exist = false) @TableField(exist = false)
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java
View file @ 48a01860
...@@ -39,10 +39,10 @@ public class RegUnitInfoDto extends BaseDto { ...@@ -39,10 +39,10 @@ public class RegUnitInfoDto extends BaseDto {
private String unitCodeTypeName; private String unitCodeTypeName;
@ApiModelProperty(value = "单位类型") @ApiModelProperty(value = "单位类型")
private String unitType; private List<String> unitTypeList;
@ApiModelProperty(value = "单位类型code") @ApiModelProperty(value = "单位类型code")
private String unitTypeCode; private List<String> unitTypeCodeList;
@ApiModelProperty(value = "管辖机构") @ApiModelProperty(value = "管辖机构")
private String managementUnit; private String managementUnit;
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java
View file @ 48a01860
...@@ -99,6 +99,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -99,6 +99,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
model.setUnitCodeType("1060"); model.setUnitCodeType("1060");
model.setUnitCodeTypeName("营业执照"); model.setUnitCodeTypeName("营业执照");
Bean.copyExistPropertis(model, regUnitInfo); Bean.copyExistPropertis(model, regUnitInfo);
regUnitInfo.setUnitType(StringUtils.join(model.getUnitTypeList(),","));
regUnitInfo.setUnitTypeCode(StringUtils.join(model.getUnitTypeCodeList(),","));
// 1.插入单位注册许可信息表：tz_base_unit_licence // 1.插入单位注册许可信息表：tz_base_unit_licence
List<BaseUnitLicenceDto> unitLicenceDtos = model.getUnitLicences(); List<BaseUnitLicenceDto> unitLicenceDtos = model.getUnitLicences();
List<BaseUnitLicence> baseUnitLicences = unitLicenceDtos.stream().map(s -> { List<BaseUnitLicence> baseUnitLicences = unitLicenceDtos.stream().map(s -> {
...@@ -161,7 +163,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -161,7 +163,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
// 2.填充数据 // 2.填充数据
TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo(); TzBaseEnterpriseInfo baseEnterpriseInfo = new TzBaseEnterpriseInfo();
baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName()); baseEnterpriseInfo.setUseUnitCertificate(regUnitInfo.getUnitCodeTypeName());
baseEnterpriseInfo.setUnitType(regUnitInfo.getUnitType()); baseEnterpriseInfo.setUnitType(StringUtils.join(regUnitInfo.getUnitTypeList(),"#"));
baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode()); baseEnterpriseInfo.setUseCode(regUnitInfo.getUnitCode());
baseEnterpriseInfo.setUseUnit(regUnitInfo.getName()); baseEnterpriseInfo.setUseUnit(regUnitInfo.getName());
baseEnterpriseInfo.setProvince(regUnitInfo.getProvince()); baseEnterpriseInfo.setProvince(regUnitInfo.getProvince());
...@@ -353,18 +355,24 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI ...@@ -353,18 +355,24 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
agencyUserModel.setMobile(adminTel); agencyUserModel.setMobile(adminTel);
String unitTypeCode = regUnitInfo.getUnitTypeCode(); String unitTypeCode = regUnitInfo.getUnitTypeCode();
// 根据unitTypeCode 获取应用和角色 数据字典配置 // 根据unitTypeCode 获取应用和角色 数据字典配置
DataDictionary unitType = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, unitTypeCode)); String[] units = unitTypeCode.split(",");
String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
String[] appCodes = appCode.split(",");
Set<String> appCodesSet = new HashSet<>(); Set<String> appCodesSet = new HashSet<>();
Collections.addAll(appCodesSet, appCodes);
Map<Long, List<Long>> roleSeqMap = new HashMap<>(); Map<Long, List<Long>> roleSeqMap = new HashMap<>();
roleNameSet.add(unitType.getName());
userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
Map<Long, List<RoleModel>> orgRoles = new HashMap<>(); Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
orgRoles.put(companyInfo.getSequenceNbr(), userRoleList); for(String TypeCode: units) {
DataDictionary unitType = iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, TypeCode));
String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
String[] appCodes = appCode.split(",");
Collections.addAll(appCodesSet, appCodes);
roleNameSet.add(unitType.getName());
userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName())).collect(Collectors.toList());
for(RoleModel roleModel : allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getExtend())).collect(Collectors.toList())){
userRoleList.add(roleModel);
}
userRoleList.forEach(r -> roleIds.add(r.getSequenceNbr()));
roleSeqMap.put(companyInfo.getSequenceNbr(), roleIds);
orgRoles.put(companyInfo.getSequenceNbr(), userRoleList);
}
agencyUserModel.setAppCodes(new ArrayList<>(appCodesSet)); agencyUserModel.setAppCodes(new ArrayList<>(appCodesSet));
agencyUserModel.setOrgRoles(orgRoles); agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap); agencyUserModel.setOrgRoleSeqs(roleSeqMap);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/db/changelog/tzs-1.0.0.1.xml
View file @ 48a01860
...@@ -903,5 +903,27 @@ ...@@ -903,5 +903,27 @@
REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1201', '1201', '生产单位(设计、制造、安装、改造、维修单位)', 'zslx', NULL, NULL, NULL, NULL, NULL, b'0', '1'); REPLACE INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES ('1201', '1201', '生产单位(设计、制造、安装、改造、维修单位)', 'zslx', NULL, NULL, NULL, NULL, NULL, b'0', '1');
</sql> </sql>
</changeSet> </changeSet>
<changeSet id="1660546840856-16" author="zhangyingbin">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_data_dictionary" columnName="extend"/>
</not>
</preConditions>
<comment>字典表结构调整</comment>
<sql>
ALTER TABLE `cb_data_dictionary` add column `extend` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '扩展列';
</sql>
</changeSet>
<changeSet id="1660546840856-17" author="zhangyingbin">
<comment>字典表数据调整</comment>
<sql>
UPDATE `cb_data_dictionary` SET `code` = '1229', `name` = '设计制造单位', `type` = 'UNIT_TYPE_NEW_OLD', `type_desc` = 'studio_normalapp_3663181,studio_normalapp_3654033,studio_normalapp_3404492,studio_normalapp_3404491', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = NULL WHERE `sequence_nbr` = 1229;
UPDATE `cb_data_dictionary` SET `code` = '1230', `name` = '生产单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1230;
UPDATE `cb_data_dictionary` SET `code` = '1231', `name` = '充装单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1231;
UPDATE `cb_data_dictionary` SET `code` = '1232', `name` = '使用单位', `type` = 'UNIT_TYPE_NEW', `type_desc` = 'studio_normalapp_3684596,studio_normalapp_3654033', `parent` = NULL, `rec_user_name` = NULL, `rec_user_id` = NULL, `rec_date` = NULL, `is_delete` = b'0', `sort_num` = 1, `extend` = 'Safety_Supervision_Rectify_Report' WHERE `sequence_nbr` = 1232;
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
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