1、两个规定-用户组列表查询

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-cyl.properties

@@ -19,12 +19,12 @@ eureka.client.service-url.defaultZone=http://172.16.10.210:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.89:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.89:${server.port}${server.servlet.context-path}/doc\
+eureka.instance.status-page-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.17:${server.port}${server.servlet.context-path}/doc\
   .html
-eureka.instance.ip-address=172.16.3.89
+eureka.instance.ip-address=172.16.3.17
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application.properties

 spring.application.name=TZS-CYLINDER
 server.servlet.context-path=/cylinder
 server.port=11003
-spring.profiles.active=dev
+spring.profiles.active=cyl
 
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/GroupAndPersonInfoDto.java

+package com.yeejoin.amos.boot.module.tcm.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(value = "GroupAndPersonInfoDto", description = "用户组及组内用户相关信息")
+public class GroupAndPersonInfoDto {
+
+    /**
+     * 组id
+     */
+    @ApiModelProperty(value = "组id")
+    private Long groupId;
+
+    /**
+     * 组名称
+     */
+    @ApiModelProperty(value = "组名称")
+    private String groupName;
+
+    /**
+     * 人员名称
+     */
+    @ApiModelProperty(value = "人员名称")
+    private String userName;
+
+    /**
+     * 人员id
+     */
+    @ApiModelProperty(value = "人员id")
+    private String userId;
+
+    /**
+     * 所在单位名称
+     */
+    @ApiModelProperty(value = "所在单位名称")
+    private String unitName;
+
+    /**
+     * 所在单位统一信用代码
+     */
+    @ApiModelProperty(value = "所在单位统一信用代码")
+    private String unitCode;
+
+    /**
+     * 企业类型
+     */
+    @ApiModelProperty(value = "企业类型")
+    private String unitType;
+
+    /**
+     * 企业类型编码
+     */
+    @ApiModelProperty(value = "企业类型编码")
+    private String unitTypeCode;
+
+    /**
+     * 企业涉及设备类型
+     */
+    @ApiModelProperty(value = "企业涉及设备类型")
+    private String equipCategory;
+
+    /**
+     * 企业涉及设备类型编码
+     */
+    @ApiModelProperty(value = "企业涉及设备类型编码")
+    private String equipCategoryCode;
+
+
+
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/UnitTypeEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@AllArgsConstructor
+@Getter
+public enum UnitTypeEnum {
+
+    /**
+     * *注册单位类型
+     */
+
+    sydw("使用单位", "1232"),
+    czdw("充装单位", "1231"),
+    jyjcjg("检验检测机构", "1233"),
+    azgzwxdw("安装改造维修单位", "1234"),
+    zzdw("制造单位", "1236"),
+    sjdw("设计单位", "1235"),
+    grzt("个人主体", "6599");
+
+    private String name;
+    private String code;
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+
+    static {
+        for (UnitTypeEnum e : UnitTypeEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
@@ -23,4 +24,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
                                           @Param("companyCode") String companyCode,
                                           @Param("userSeq") String userSeq,
                                           @Param("dto") TzsEquipListDto dto);
+
+    GroupAndPersonInfoDto getUnitInfoByUserId(String userId);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsUserInfoService.java

@@ -3,10 +3,12 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserQualifications;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
 
 import java.util.List;
 import java.util.Map;
@@ -39,4 +41,10 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
     Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);
 
     List<TzsUserInfo> getSafetyList(String companyCode);
+
+    List<Map<String,Object>>  getGroupList();
+
+    Map<String,Object> getPersonType();
+
+    List<GroupAndPersonInfoDto> getGroupAndPersonInfo(Long groupId);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -152,4 +152,17 @@
             </if>
 
     </select>
+
+    <select id="getUnitInfoByUserId" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto">
+        SELECT
+            tui.unit_name,
+            tui.unit_code,
+            replace(tzei.unit_type,'#', ',') unitType,
+            tzei.equip_category
+        FROM
+            tzs_user_info tui
+                LEFT JOIN tz_base_enterprise_info tzei ON tui.unit_code = tzei.use_code
+        WHERE
+            amos_user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
@@ -16,6 +17,7 @@ import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsUserInfoServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -229,4 +231,30 @@ public class TzsUserInfoController extends BaseController {
         return ResponseHelper.buildResponse(tzsUserInfoService.getSafetyList(companyCode));
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getGroupList")
+    @ApiOperation(httpMethod = "GET", value = "两个规定用户组列表查询", notes = "两个规定用户组列表查询")
+    public ResponseModel<List<Map<String, Object>>> getGroupList() {
+        return ResponseHelper.buildResponse(tzsUserInfoService.getGroupList());
+    }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getPersonType")
+    @ApiOperation(httpMethod = "GET", value = "获取当前登录人人员类型", notes = "获取当前登录人人员类型")
+    public ResponseModel<Map<String,Object>> getPersonType() {
+        return ResponseHelper.buildResponse(tzsUserInfoService.getPersonType());
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getGroupAndPersonInfo")
+    @ApiOperation(httpMethod = "GET", value = "通过组id查询组及组内人员信息", notes = "通过组id查询组及组内人员信息")
+    public ResponseModel<List<GroupAndPersonInfoDto>> getGroupAndPersonInfo(@RequestParam(value = "groupId") Long groupId) {
+        return ResponseHelper.buildResponse(tzsUserInfoService.getGroupAndPersonInfo(groupId));
+    }
+
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -12,10 +12,12 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsEquipListDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EquipmentClassifityEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserEquipMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
@@ -27,6 +29,7 @@ import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -405,6 +408,83 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     @Override
+    public List<Map<String, Object>> getGroupList() {
+        FeignClientResult<Collection<GroupModel>> collectionFeignClientResult = Privilege.groupClient.selectForList(1712370734598221825L, null);
+        Collection<GroupModel> GroupModelResult = collectionFeignClientResult.getResult();
+        List<GroupModel> collect = GroupModelResult.stream().filter(e -> "twoStipulate".equals(e.getGroupDesc())).collect(Collectors.toList());
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (GroupModel groupModel : collect) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("groupName", groupModel.getGroupName());
+            map.put("sequenceNbr", groupModel.getSequenceNbr());
+            result.add(map);
+        }
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getPersonType() {
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (ObjectUtils.isEmpty(reginParams)) {
+            return null;
+        }
+        String userId = reginParams.getUserModel().getUserId();
+        TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectOne(new QueryWrapper<TzsUserInfo>().eq("amos_user_id", userId));
+        Map<String, Object> result = new HashMap<>();
+        result.put("postName", tzsUserInfo.getPostName());
+        return result;
+    }
+
+    @Override
+    public List<GroupAndPersonInfoDto> getGroupAndPersonInfo(Long groupId) {
+        List<GroupAndPersonInfoDto> result = new ArrayList<>();
+        List<AgencyUserModel> agencyUserModelList = Privilege.groupUserClient.queryForList(groupId).getResult();
+        if (!ObjectUtils.isEmpty(agencyUserModelList) && agencyUserModelList.size() > 0) {
+
+            for (AgencyUserModel agencyUserModel : agencyUserModelList) {
+                GroupAndPersonInfoDto groupAndPersonInfoDto = new GroupAndPersonInfoDto();
+                groupAndPersonInfoDto = tzsUserInfoMapper.getUnitInfoByUserId(agencyUserModel.getUserId());
+                groupAndPersonInfoDto.setGroupId(groupId);
+                String groupName = Privilege.groupClient.seleteOne(groupId).getResult().getGroupName();
+                groupAndPersonInfoDto.setGroupName(groupName);
+                groupAndPersonInfoDto.setUserId(agencyUserModel.getUserId());
+                groupAndPersonInfoDto.setUserName(agencyUserModel.getRealName());
+
+                String[] UnitType = groupAndPersonInfoDto.getUnitType().split(",");
+                if (UnitType.length > 0) {
+                    StringBuilder unitTypeCode = new StringBuilder();
+                    for (String s : UnitType) {
+                        unitTypeCode.append(UnitTypeEnum.getCode.get(s)).append(",");
+                    }
+                    groupAndPersonInfoDto.setUnitTypeCode(unitTypeCode.substring(0, unitTypeCode.length() - 1));
+                } else {
+                    groupAndPersonInfoDto.setUnitTypeCode(UnitTypeEnum.getCode.get(UnitType));
+                }
+                String EquipCategory =  groupAndPersonInfoDto.getEquipCategory()
+                        .replace("[","")
+                        .replace("]","")
+                        .replace("\"","");
+                List<String> equipCategoryList = Arrays.asList(EquipCategory.split(","));
+                if (equipCategoryList.size() > 0) {
+                    StringBuilder equipCategoryCode = new StringBuilder();
+                    StringBuilder equipCategory = new StringBuilder();
+                    for (String s : equipCategoryList) {
+                        equipCategoryCode.append(s).append(",");
+                        equipCategory.append(EquipmentClassifityEnum.getName.get(s)).append(",");
+                    }
+                    groupAndPersonInfoDto.setEquipCategory(equipCategory.substring(0, equipCategory.length() - 1));
+                    groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryCode.substring(0, equipCategoryCode.length() - 1));
+                } else {
+                    groupAndPersonInfoDto.setEquipCategory(EquipmentClassifityEnum.getName.get(equipCategoryList.get(0)));
+                    groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryList.get(0));
+                }
+                result.add(groupAndPersonInfoDto);
+            }
+        }
+        return result;
+    }
+
+    @Override
     public List<Map<String, Object>> getUserType(String unitType) {
         if (unitType.equals("pro")) {
             return tzsUserInfoMapper.getUserType("QYRYGW-SCDW");

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties

@@ -7,11 +7,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.210:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.3.34
+eureka.instance.status-page-url=http://172.16.3.17:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.17:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=172.16.3.17
 ## ES properties:
 elasticsearch.username=elastic
 elasticsearch.password=a123456