代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceIntegratedController.java

@@ -16,15 +16,11 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.NumberUtil;
import com.yihu.jw.util.network.HttpResponse;
import com.yihu.jw.util.network.HttpUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import jxl.Cell;
import jxl.Workbook;
import jxl.write.Label;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +29,7 @@ import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
/**
@@ -102,10 +95,30 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
     * @return
     */
    @GetMapping("/metadata")
    public Envelop getMetadataList1(String categoryId, String filters) throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/metadata";
        //标准分类
//        long start = System.currentTimeMillis();
        List<Map<String, Object>> list = resourcesIntegratedService.metadata(categoryId,  filters);
//        List<Map<String, Object>> list = resourcesIntegratedService.intMetadata(categoryId, "*", "*", "standard", filters);
//        long end = System.currentTimeMillis();
//        System.out.println("newTime:"+(end-start));
        return ListEnvelop.getSuccess("查询成功",list);
    }
    /**
     * 综合查询档案数据资源列表 zuul
     * @param filters
     * @return
     */
    @GetMapping("/metadataOld")
    public Envelop getMetadataList(String categoryId, String filters, HttpServletRequest request) throws Exception {
        String url = "/resource/api/v1.0/resources/integrated/metadata";
        //标准分类
        long start = System.currentTimeMillis();
        List<Map<String, Object>> list = resourcesIntegratedService.intMetadata(categoryId, "*", "*", "standard", filters);
        long end = System.currentTimeMillis();
        System.out.println("time:"+(end-start));
        return ListEnvelop.getSuccess("查询成功",list);
    }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/dao/ResourceBrowseMetadataDao.java

@@ -31,6 +31,18 @@ public class ResourceBrowseMetadataDao {
        return jdbcTemplate.query(sql, rowMapper);
    }
    /**
     * 获取某资源所有数据元
     */
    public List<Map<String,Object>> getAllMetadata(String resourcesCode) throws Exception {
        String sql = "SELECT m.EHR_ID,m.name,m.DICT_CODE ,d.name dictName " +
                "FROM rs_resource_metadata a, rs_resource b, rs_metadata m LEFT JOIN rs_dictionary d on m.dict_code=d.code " +
                "WHERE a.resources_id = b.id " +
                "AND a.metadata_id = m.ehr_id " +
                "AND b.code = '" + resourcesCode + "'";
        return jdbcTemplate.queryForList(sql);
    }
    /**
     * 获取某资源所有数据元
     */

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceIntegratedService.java

@@ -376,6 +376,46 @@ public class ResourceIntegratedService extends BaseJpaService {
        return cateMapList;
    }
    /**
     * 综合查询档案数据列表树(新)
     *
     * @param filters
     * @return
     */
    @Transactional(readOnly = true)
    public List<Map<String, Object>> metadata(String categoryId, String filters) throws Exception {
        List<Map<String, Object>> resultList = new ArrayList<>();
        List<RsResource> rrList = findFileMasterList(categoryId, null, filters, "standard");
        if (rrList != null) {
            for (RsResource rsResources : rrList) {
                Map<String, Object> masterMap = new HashMap<String, Object>();
                masterMap.put("level", "2");
                masterMap.put("code", rsResources.getCode());
                masterMap.put("name", rsResources.getName());
                masterMap.put("id", rsResources.getId());
                List<Map<String,Object>> rmList = resourceBrowseMetadataDao.getAllMetadata(rsResources.getCode());
                if (rmList != null) {
                    List<Map<String, Object>> metadataList = new ArrayList<Map<String, Object>>();
                    for (Map<String,Object> rsMetadata : rmList) {
                        Map<String, Object> metadataMap = new HashMap<String, Object>();
                        metadataMap.put("level", "3");
                        metadataMap.put("code", rsMetadata.get("EHR_ID"));
                        metadataMap.put("name", rsMetadata.get("name"));
                        metadataMap.put("id", UUID.randomUUID().toString());
                        metadataMap.put("dictCode", rsMetadata.get("DICT_CODE"));
                        metadataMap.put("dictName", rsMetadata.get("dictName"));
                        metadataList.add(metadataMap);
                    }
                    masterMap.put("children", metadataList);
                }
                resultList.add(masterMap);
            }
        }
        return resultList;
    }
    /**
     * 综合查询档案数据列表树
     *