两个规定-通过组id查询组及组内人员信息接口优化

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

@@ -25,7 +25,9 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
                                           @Param("userSeq") String userSeq,
                                           @Param("dto") TzsEquipListDto dto);
 
-    GroupAndPersonInfoDto getUnitInfoByUserId(String userId);
-
     List<TzsUserInfo> getUnitPersonInfo();
+
+//    List<String> selectUserIds();
+
+    List<GroupAndPersonInfoDto> getUnitInfoByUserIds(@Param("userIds")List<String> userIds);
 }

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

@@ -49,4 +49,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
     List<GroupAndPersonInfoDto> getGroupAndPersonInfo(Long groupId);
 
     Boolean createUnitPerson();
+
+//    void testGroup();
 }

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

@@ -153,19 +153,6 @@
 
     </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>
-
     <select id="getUnitPersonInfo" resultType="com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo">
         SELECT
             admin_name as name ,
@@ -180,4 +167,37 @@
         FROM
             "tz_flc_reg_unit_info"
     </select>
+
+<!--    <select id="selectUserIds" resultType="java.lang.String">-->
+<!--        SELECT-->
+<!--            amos_user_id-->
+<!--        FROM-->
+<!--            tzs_user_info tui-->
+<!--                LEFT JOIN tz_base_enterprise_info tzei ON tui.unit_code = tzei.use_code-->
+<!--        WHERE tui.is_delete = 'f'-->
+<!--          AND tui.amos_user_id is NOT null-->
+<!--          AND tzei.unit_type IS NOT NULL-->
+<!--        GROUP BY tui.amos_user_id-->
+<!--    </select>-->
+
+    <select id="getUnitInfoByUserIds" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.GroupAndPersonInfoDto">
+        SELECT
+            tui.amos_user_id userId,
+            tui.amos_user_name userName,
+            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>
+            <if test="userIds != null and userIds.size() > 0">
+                and amos_user_id in
+                <foreach item="item" collection="userIds" separator="," open="(" close=")" index="">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </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

@@ -318,5 +318,13 @@ public class TzsUserInfoController extends BaseController {
         return ResponseHelper.buildResponse(tzsUserInfoService.getGroupAndPersonInfo(groupId));
     }
 
+//
+//    @TycloudOperation(ApiLevel = UserType.AGENCY)
+//    @GetMapping(value = "/testGroup")
+//    @ApiOperation(httpMethod = "GET", value = "给组内添加人员", notes = "给组内添加人员")
+//    public ResponseModel<Object> testGroup() {
+//        tzsUserInfoService.testGroup();
+//        return ResponseHelper.buildResponse("ok");
+//    }
 
 }

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

@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -444,56 +445,56 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         for (CompanyModel companyModel : companyModelList) {
             companyMap.put(companyModel.getCompanyCode(), companyModel.getOrgCode());
         }
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        List<String> UserIds = agencyUserModelList.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
+        List<GroupAndPersonInfoDto> groupAndPersonInfoDtoList =  tzsUserInfoMapper.getUnitInfoByUserIds(UserIds);
         DataDictionary dataDictionary = iDataDictionaryService.getByExtend(groupId.toString(), QYRYGW);
-        if (!ObjectUtils.isEmpty(agencyUserModelList) && agencyUserModelList.size() > 0) {
-            for (AgencyUserModel agencyUserModel : agencyUserModelList) {
-                GroupAndPersonInfoDto groupAndPersonInfoDto = tzsUserInfoMapper.getUnitInfoByUserId(agencyUserModel.getUserId());
-                if (!ObjectUtils.isEmpty(groupAndPersonInfoDto)) {
-                    groupAndPersonInfoDto.setGroupId(groupId);
-                    groupAndPersonInfoDto.setGroupName(ObjectUtils.isEmpty(dataDictionary) ? null : dataDictionary.getName());
-                    String unitOrgCode = String.valueOf(companyMap.get(groupAndPersonInfoDto.getUnitCode()));
-                    groupAndPersonInfoDto.setUnitOrgCode("null".equals(unitOrgCode)? null: unitOrgCode);
-                    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));
+        for (GroupAndPersonInfoDto groupAndPersonInfoDto : groupAndPersonInfoDtoList) {
+            if (!ObjectUtils.isEmpty(groupAndPersonInfoDto)) {
+                groupAndPersonInfoDto.setGroupId(groupId);
+                groupAndPersonInfoDto.setGroupName(ObjectUtils.isEmpty(dataDictionary) ? null : dataDictionary.getName());
+                String unitOrgCode = String.valueOf(companyMap.get(groupAndPersonInfoDto.getUnitCode()));
+                groupAndPersonInfoDto.setUnitOrgCode("null".equals(unitOrgCode)? null: unitOrgCode);
+                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));
+                }
 
-                    if (!ObjectUtils.isEmpty(groupAndPersonInfoDto.getEquipCategory())) {
-                        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));
+                if (!ObjectUtils.isEmpty(groupAndPersonInfoDto.getEquipCategory())) {
+                    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(null);
-                        groupAndPersonInfoDto.setEquipCategoryCode(null);
+                        groupAndPersonInfoDto.setEquipCategory(EquipmentClassifityEnum.getName.get(equipCategoryList.get(0)));
+                        groupAndPersonInfoDto.setEquipCategoryCode(equipCategoryList.get(0));
                     }
-                    result.add(groupAndPersonInfoDto);
+                } else {
+                    groupAndPersonInfoDto.setEquipCategory(null);
+                    groupAndPersonInfoDto.setEquipCategoryCode(null);
                 }
-
+                result.add(groupAndPersonInfoDto);
             }
         }
+        stopWatch.stop();
+        System.out.printf("组装数据耗时%f秒/n", stopWatch.getTotalTimeSeconds());
         return result;
     }
 
@@ -503,6 +504,15 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         return this.saveBatch(result);
     }
 
+
+//    @Override
+//    public void testGroup() {
+//        List<String> userIds = tzsUserInfoMapper.selectUserIds();
+//        String groupSeq = "1712372080231608322";
+//        Privilege.groupUserClient.create(Long.valueOf(groupSeq), userIds);
+//    }
+
+
     @Override
     public List<Map<String, Object>> getUserType(String unitType) {
         if (unitType.equals("pro")) {