人员管理页面相关接口修改、平台包升级版本

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -8,12 +8,15 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -309,7 +312,14 @@ public class DataDictionaryController extends BaseController {
 		Collection<DataDictionary> list = null;
 		List<Menu> menus = null;
 		if ("YJLDDW".equals(type)) {
-			list = dataDictionaryMapper.getNoInLinkUnit();
+
+			String bizOrgCode = "";
+			ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+			if (null != reginParam) {
+				bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+			}
+
+			list = dataDictionaryMapper.getNoInLinkUnit(bizOrgCode);
 			// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
 			// kongfm 2021-09-08
 			// 数据字典还原 by kongfm 2021-09-09
@@ -399,4 +409,13 @@ public class DataDictionaryController extends BaseController {
 	}
 
 
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getUserGroupByType")
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型type查询字典列表", notes = "根据字典类型type查询字典列表")
+	public ResponseModel<List<DataDictionary>> getUserGroupByType(@RequestParam(value = "type") String type){
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+		return ResponseHelper.buildResponse(list);
+	}
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * 数据字典 Mapper 接口
@@ -21,7 +22,7 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
     * 获取包含联动单位的联动单位树信息
     * @return
     */
-   public List<DataDictionary>  getNoInLinkUnit();
+   public List<DataDictionary>  getNoInLinkUnit(@Param("bizOrgCode") String bizOrgCode);
 
 	/**
 	 * 根据code值查询

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -44,6 +44,7 @@ GROUP BY
 		FROM
 		cb_linkage_unit
 		WHERE is_delete = 0
+		and biz_org_code like concat(#{bizOrgCode}, '%')
 		GROUP BY
 		emergency_linkage_unit_code
 		) elink ON elink.emergency_linkage_unit_code = cbb.`code`

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/PeopleInfoDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
 import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAgencyUser;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsrAgencyUser.java

@@ -3,10 +3,13 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 单位人员平台人员关系表
  *
@@ -64,4 +67,10 @@ public class OrgUsrAgencyUser extends BaseEntity {
     @TableField(exist = false)
     private String upAmosUser;
 
+    @TableField(exist = false)
+    private List<String> groupIdsCode;
+
+    @TableField(exist = false)
+    private List<DataDictionary> dataDictionaryList;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireExpertsController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,10 +12,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 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.DateUtils;
-import com.yeejoin.amos.boot.biz.common.utils.Menu;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.biz.common.utils.*;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -23,11 +21,13 @@ import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -181,6 +181,13 @@ public class FireExpertsController extends BaseController {
     public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "current") int current,
                                                              @RequestParam(value = "size") int size,
                                                              FireExpertsDto fireExpertsDto) throws Exception {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if ( null == reginParam || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode())) {
+            return ResponseHelper.buildResponse(null);
+        }
+
+        fireExpertsDto.setBizOrgCode(reginParam.getPersonIdentity().getBizOrgCode());
+
         Page<FireExpertsDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
@@ -233,6 +240,13 @@ public class FireExpertsController extends BaseController {
 //        queryWrapper.eq("type", type);
 //        queryWrapper.orderByAsc("sort_num");
 
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if ( null == reginParam || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode())) {
+            return ResponseHelper.buildResponse(null);
+        }
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+        }
         Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount(bizOrgCode);
         list.forEach(i->{
         	i.setName(i.getName()+" ("+i.getCount()+")");

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/LinkageUnitController.java

@@ -2,7 +2,10 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.List;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import org.apache.commons.lang3.ObjectUtils;
@@ -17,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -53,6 +57,9 @@ public class LinkageUnitController extends BaseController {
     @Autowired
     private OrgUsrMapper orgUsrMapper;
 
+    @Autowired
+    RedisUtils redisUtils;
+
     /**
      * 新增联动单位
      *
@@ -148,12 +155,19 @@ public class LinkageUnitController extends BaseController {
             (value = "size") int size, String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode,
                                                             @RequestParam(required = false) String bizOrgCode,
                                                             @RequestParam(required = false) String companyCode) {
-        if (StringUtils.isNotEmpty(companyCode)) {
+        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if ( null == reginParam || StringUtils.isEmpty(reginParam.getPersonIdentity().getBizOrgCode())) {
+            return ResponseHelper.buildResponse(null);
+        }
+        if (StringUtils.isNotEmpty(companyCode) && StringUtils.isEmpty(bizOrgCode)) {
             OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
             if (ObjectUtils.isNotEmpty(orgUsr)) {
                 bizOrgCode = orgUsr.getBizOrgCode();
             }
         }
+        if (StringUtils.isEmpty(bizOrgCode)) {
+            bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+        }
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrAgencyUserController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsrAgencyUser;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrAgencyUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,6 +20,10 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 部门信息修改
  *
@@ -30,6 +38,8 @@ public class OrgUsrAgencyUserController extends BaseController {
     @Autowired
     IOrgUsrAgencyUserService orgUsrAgencyUserService;
 
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
 
     /**
      * 查询关联的amos账号信息
@@ -46,6 +56,16 @@ public class OrgUsrAgencyUserController extends BaseController {
             orgUsrAgencyUser.setUpAmosUser("0");
             return ResponseHelper.buildResponse(orgUsrAgencyUser);
         }
+        if (!StringUtils.isEmpty(agencyUser.getGroupIds())) {
+            List<String> list1 = Arrays.asList(agencyUser.getGroupIds().split(","));
+            QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("type", list1);
+            queryWrapper.eq("code", "CB_USER_GROUP");
+            List<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+            orgUsrAgencyUser.setDataDictionaryList(list);
+            List<String> collect = list.stream().map(DataDictionary::getCode).collect(Collectors.toList());
+            orgUsrAgencyUser.setGroupIdsCode(collect);
+        }
         return ResponseHelper.buildResponse(agencyUser);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.component.feign.model.Page;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -240,7 +241,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			//删除之前所在用户组
 			OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 			if (!ValidationUtil.isEmpty(orgUsrAgencyUser) && amosUser != null ) {
-				String groupIds = orgUsrAgencyUser.getGroupIds();
+
+				List<String> groupIdsList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getCode).distinct().collect(Collectors.toList());
+				String groupIds = String.join(",", groupIdsList);
 				if (!"".equals(groupIds) && null != groupIds) {
 					String[] ids = groupIds.split(",");
 					for (String gId : ids) {

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

@@ -3028,10 +3028,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
 		FeignClientResult<List<RoleModel>> roleListResult = Privilege.roleClient.queryRoleList(null, null);
 		List<RoleModel> allRoleList = roleListResult.getResult();
-		DataDictionary unitType = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getCode, "default"));
-		List<RoleModel> userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(unitType.getName()))
+		List<String> groupIdsList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getCode).distinct().collect(Collectors.toList());
+		List<String> roleNameList = peopleInfoDto.getOrgUsrAgencyUser().getDataDictionaryList().stream().map(DataDictionary::getExtend).distinct().collect(Collectors.toList());
+		String groupIdsString = String.join(",", groupIdsList);
+		String roleNameString = String.join(",", roleNameList);
+		List<RoleModel> userRoleList = allRoleList.stream().filter(r -> roleNameString.contains(r.getRoleName()))
 				.collect(Collectors.toList());
-		String appCode = unitType.getTypeDesc() != null ? unitType.getTypeDesc() : "";
+		String appCode = "";
 		String[] appCodes = appCode.split(",");
 		Collections.addAll(appCodesSet, appCodes);
 		userRoleList.forEach(r -> {
@@ -3077,10 +3080,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			userResult = Privilege.agencyUserClient.update(agencyUserModel, peopleInfoDto.getOrgUsrAgencyUser().getAmosUserId()).getResult();
 		}
 		//绑定用户组
-		String groupIds = peopleInfoDto.getOrgUsrAgencyUser().getGroupIds();
-		if (!"".equals(groupIds) && null != groupIds) {
+		if (!"".equals(groupIdsString) && null != groupIdsString) {
 			String[] userIds = {userResult.getUserId()};
-			String[] ids = groupIds.split(",");
+			String[] ids = groupIdsString.split(",");
 			for (String id : ids) {
 				Long groupId = Long.valueOf(id);
 				Privilege.groupUserClient.create(groupId, Arrays.asList(userIds)).getResult();

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3469,5 +3469,17 @@
                 MODIFY COLUMN `level_device_name` varchar(1500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水池液位显示装置名称';
         </sql>
     </changeSet>
+
+    <changeSet author="zs" id="202210131517">
+        <preConditions onFail="MARK_RAN">
+            <sqlCheck expectedResult="0">select count(*) from cb_data_dictionary where sequence_nbr = 1800</sqlCheck>
+        </preConditions>
+        <comment>add data_dictionary 角色用户租 </comment>
+        <sql>
+            INSERT INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `extend`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1800, '1580450171962032130', '管理员', 'CB_USER_GROUP', '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,default', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `extend`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1801, '1569613155653419009', '运维人员', 'CB_USER_GROUP', '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,default', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+            INSERT INTO `cb_data_dictionary` (`sequence_nbr`, `code`, `name`, `type`, `extend`, `type_desc`, `parent`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `sort_num`) VALUES (1802, '1580479144087552002', '专职消防队', 'CB_USER_GROUP', '治理人,验证人,延期治理审批人,延迟治理人,隐患填报人,default', NULL, NULL, NULL, NULL, NULL, b'0', 1);
+        </sql>
+    </changeSet>
 </databaseChangeLog>
 

pom.xml

@@ -27,7 +27,7 @@
 		<springcloud.version>Hoxton.SR8</springcloud.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<tyboot-version>1.1.23-SNAPSHOT</tyboot-version>
-		<amos.version>1.7.10-SNAPSHOT</amos.version>
+		<amos.version>1.7.13-SNAPSHOT</amos.version>
 		<rule.version>1.7.9-SNAPSHOT</rule.version>
 		<itext.version>7.1.1</itext.version>
 		<elasticsearch.version>7.15.2</elasticsearch.version>