Skip to content

A
amos-boot-biz
Commit 5deddf69 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 ecaca9ba 2f13824e
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 42 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java
View file @ 5deddf69
package com.yeejoin.amos.boot.module.common.biz.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.biz.common.controller.DataDictionaryController;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.Menu;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -71,6 +75,9 @@ import io.swagger.annotations.ApiOperation;
public class OrgUsrController extends BaseController {
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
@Autowired
OrgUsrServiceImpl iOrgUsrService;
@Autowired
......@@ -83,6 +90,9 @@ public class OrgUsrController extends BaseController {
FireTeamMapper fireTeamMapper;
@Autowired
OrgUsrMapper orgUsrMapper;
@Autowired
EmqKeeper emqKeeper;
@Value("${jcs.company.topic.delete:jcs/company/topic/delete}")
private String airportDeleteTopic;
......@@ -90,6 +100,12 @@ public class OrgUsrController extends BaseController {
@Autowired
EquipFeignClient equipFeignClient;
@Autowired
DataDictionaryController dataDictionaryController;
@Value("special-dept")
String deptKey;
@Value("special-deptType")
String deptTypeKey;
/**
* 新增单位信息
*
......@@ -742,15 +758,36 @@ public class OrgUsrController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "根据机构类型(逗号分割),机构编码获取列表不分页", notes = "根据机构类型(逗号分割),机构编码获取列表不分页")
@GetMapping(value = "/{authKey}/listWithAuth")
public ResponseModel<List<OrgUsr>> getListWithAuth(@RequestParam(required = false) String orgTypes,
@PathVariable String authKey) {
@PathVariable String authKey) throws Exception {
ReginParams reginParams = getSelectedOrgInfo();
ReginParams.PersonIdentity personIdentity = reginParams.getPersonIdentity();
String bizOrgCode = personIdentity.getBizOrgCode();
//拿到数据字典中存储的 特殊类型 特殊部门
QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", "SpecialType").or().eq("type", "SpecialDepartment");
Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
List<String> objects = new ArrayList<>();
list.stream().forEach(e->objects.add(e.getName()));
//判断当前登录人权限是否处于特殊类型
if (objects.contains(authKey)){
//判断当前登录人部门是否处于特殊部门
if (objects.contains(personIdentity.getCompanyId())) {
LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OrgUsr::getParentId,personIdentity.getCompanyId());
wrapper.eq(BaseEntity::getIsDelete,false);
OrgUsr orgUsr = orgUsrMapper.selectOne(wrapper);
personIdentity.setBizOrgCode(orgUsr.getBizOrgCode() != null? orgUsr.getBizOrgCode() : personIdentity.getBizOrgCode());
}
}
// 权限处理
PermissionInterceptorContext.setDataAuthRule(authKey);
return ResponseHelper.buildResponse(iOrgUsrService.getListByBizOrgTypeCode(orgTypes, bizOrgCode));
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{authKey}/treeWithAuth", method = RequestMethod.GET)
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.0.1.xml
View file @ 5deddf69
......@@ -2733,5 +2733,33 @@
</sql>
</changeSet>
<changeSet author="chenzhao" id="2022-04-14-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</comment>
<sql>
INSERT INTO wl_form_group (`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674824, '储罐', 'r_tank', 'room', 'edit,delete,room_add', 258105, '2022-04-14 10:15:10');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2022-04-14-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</comment>
<sql>
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000334, 'company_code', '单位编码', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000335, 'tank_code', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000336, 'tank_name', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000337, 'storage_name', '储存物名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000338, 'storage_nature', '储存物性质', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000339, 'storage_form', '储存物形式', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000340, 'storage_capacity', '储存容量', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000341, 'storage_plan_name', '储罐区平面图名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000342, 'storage_plan', '储罐区平面图图纸', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
INSERT INTO `xiy_safety_business_v3.0.1_20100712`.`wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES (133000000343, 'fire_situation', '消防设施情况', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805, '2022-04-18 11:29:34');
</sql>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 5deddf69
......@@ -2874,43 +2874,6 @@
</sql>
</changeSet>
<changeSet author="chenzhao" id="2022-04-14-1">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</comment>
<sql>
INSERT INTO wl_form_group (`id`, `group_name`, `group_code`, `group_type`, `allow_operation`, `creator_id`, `create_date`) VALUES (132828674824, '储罐', 'r_tank', 'room', 'edit,delete,room_add', 258105, '2022-04-14 10:15:10');
</sql>
</changeSet>
<changeSet author="chenzhao" id="2022-04-14-2">
<preConditions onFail="MARK_RAN">
<tableExists tableName="wl_form_group"/>
</preConditions>
<comment>add data wl_form_group</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`) VALUES (133000000329, 'company_code', '单位编码', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000330, 'tank_code', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000321, 'tank_name', '储罐编号', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000322, 'storage_name', '储存物名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000323, 'storage_nature', '储存物性质', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000324, 'storage_form', '储存物形式', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000325, 'storage_capacity', '储存容量', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000326, 'storage_plan_name', '储罐区平面图名称', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000327, 'storage_plan', '储罐区平面图图纸', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
INSERT INTO `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000328, 'fire_situation', '消防设施情况', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
</sql>
</changeSet>
</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