设备目录配置查询列表返回值增加目录名称

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/model/vo/DeviceClassifyVo.java

@@ -13,4 +13,5 @@ import lombok.Data;
 @Data
 public class DeviceClassifyVo extends BaseEntityLong {
 
+    private String classifyNames;
 }
\ No newline at end of file

certificate-manager/src/main/java/com/mortals/xhx/module/certificate/service/impl/DeviceClassifyServiceImpl.java

 package com.mortals.xhx.module.certificate.service.impl;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.xhx.module.certificate.model.CertificateClassifyEntity;
+import com.mortals.xhx.module.certificate.model.CertificateClassifyQuery;
+import com.mortals.xhx.module.certificate.service.CertificateClassifyService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -22,6 +28,59 @@ import java.util.List;
 @Service("deviceClassifyService")
 public class DeviceClassifyServiceImpl extends AbstractCRUDServiceImpl<DeviceClassifyDao, DeviceClassifyEntity, Long> implements DeviceClassifyService {
 
+    @Autowired
+    private CertificateClassifyService certificateClassifyService;
+
+    @Override
+    protected void findAfter(DeviceClassifyEntity params, Context context, List<DeviceClassifyEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for (DeviceClassifyEntity item:list){
+                if(StringUtils.isNotEmpty(item.getClassifyIds())){
+                    List<Long> longList = new ArrayList<>();
+                    for(String id : item.getClassifyIds().split(",")){
+                        longList.add(DataUtil.converStr2Long(id,0l));
+                    }
+                    List<CertificateClassifyEntity> classifyEntityList = certificateClassifyService.find(new CertificateClassifyQuery().idList(longList));
+                    if(CollectionUtils.isNotEmpty(classifyEntityList)){
+                        String classifyNames ="";
+                        for(CertificateClassifyEntity classifyEntity:classifyEntityList){
+                            classifyNames+=classifyEntity.getClassifyName()+",";
+                        }
+                        if(classifyNames.endsWith(",")){
+                            classifyNames=classifyNames.substring(0,(classifyNames.length()-1));
+                        }
+                        item.setClassifyNames(classifyNames);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    protected void findAfter(DeviceClassifyEntity params, PageInfo pageInfo, Context context, List<DeviceClassifyEntity> list) throws AppException {
+        if(CollectionUtils.isNotEmpty(list)){
+            for (DeviceClassifyEntity item:list){
+                if(StringUtils.isNotEmpty(item.getClassifyIds())){
+                    List<Long> longList = new ArrayList<>();
+                    for(String id : item.getClassifyIds().split(",")){
+                        longList.add(DataUtil.converStr2Long(id,0l));
+                    }
+                    List<CertificateClassifyEntity> classifyEntityList = certificateClassifyService.find(new CertificateClassifyQuery().idList(longList));
+                    if(CollectionUtils.isNotEmpty(classifyEntityList)){
+                        String classifyNames ="";
+                        for(CertificateClassifyEntity classifyEntity:classifyEntityList){
+                            classifyNames+=classifyEntity.getClassifyName()+",";
+                        }
+                        if(classifyNames.endsWith(",")){
+                            classifyNames=classifyNames.substring(0,(classifyNames.length()-1));
+                        }
+                        item.setClassifyNames(classifyNames);
+                    }
+                }
+            }
+        }
+    }
+
     @Override
     public List<Long> getClassifyByDevice(String deviceNum) {
         DeviceClassifyEntity query = new DeviceClassifyEntity();