Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java

@@ -23,7 +23,7 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
     Integer deleteByIds(@Param("ids") List<Long> idList);
 
 
-    @Cacheable(value = "selectWithAttrs", key = "#p0")
+    @Cacheable(value = "selectWithAttrs", key = "#p0+'-'+#orderField+'-'+#orderType")
     List<ResourceDTO> selectWithAttrs(@Param("dto") ResourceDTO resourceDTO,
                                       @Param("orderField") String orderField,
                                       @Param("orderType") String orderType);

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -374,66 +374,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
             case TSINGTAO:
             case BAOTOU: { // 包头、青岛
                 logger.info("包头、青岛");
-                if (resourceDTO.getInfoList().isEmpty()) {
+                resultPage = common(resultPage, selectDTOPageSpecilTotal, resourceDTO, orderField, orderType, pageNum, pageSize);
-                    List<ResourceDTO> resourceDTOS = null;
-                    if (orderField.equals("total")) { // 对总体评价特殊处理
-                        List<Long> ids = new ArrayList<>();
-                        switch (orderType) {
-                            case "DESC": // total 倒序
-                                ids = selectDTOPageSpecilTotal.parallelStream().map(Map.class::cast).sorted(Comparator.comparing(x -> {
-                                            Map index = (Map) x;
-                                            String string = (index.get("total") == null) ? "0" : index.get("total").toString();
-                                            return Long.valueOf(string);
-                                        }
-                                ).reversed()).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(x ->
-                                        Long.valueOf(x.get("id").toString())
-                                ).collect(Collectors.toList());
-                                break;
-                            case "ASC": // total 升序
-                                ids = selectDTOPageSpecilTotal.parallelStream().map(Map.class::cast).sorted(Comparator.comparing(x -> {
-                                            String string = (x.get("total") == null) ? "0" : x.get("total").toString();
-                                            return Long.valueOf(string);
-                                        }
-                                )).skip((pageNum - 1) * pageSize).limit(pageSize).map(x ->
-                                        Long.valueOf(x.get("id").toString())
-                                ).collect(Collectors.toList());
-                                break;
-                        }
-                        resourceDTOS = resourceDao.selectDTOPage(resourceDTO, null, null, null, null, ids);
-                        if ("DESC".equals(orderType)) {
-                            resultPage.setRecords(resourceDTOS.stream().sorted(Comparator.comparing(x -> {
-                                ResourceDTO index = (ResourceDTO) x;
-                                return index.getTotal() == null ? 0L : index.getTotal();
-                            }).reversed()).collect(Collectors.toList()));
-                        } else {
-                            resultPage.setRecords(resourceDTOS.stream().sorted(Comparator.comparing(x -> {
-                                ResourceDTO index = (ResourceDTO) x;
-                                return index.getTotal() == null ? 0L : index.getTotal();
-                            })).collect(Collectors.toList()));
-                        }
-                    } else {
-                        resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType, null);
-                    }
-                    resultPage.setRecords(resourceDTOS);
-                    resultPage.setTotal(resourceDao.selectDTOPageCount(resourceDTO));
-                } else {
-                    List<ResourceDTO> resourceDTOS = resourceDao.selectWithAttrs(resourceDTO, orderField, orderType);
-                    int j = Math.min(pageNum * pageSize, resourceDTOS.size());
-                    if (resourceDTOS.isEmpty()) {
-                        resultPage.setRecords(null);
-                        resultPage.setTotal(0);
-                    } else {
-                        List<ResourceDTO> recordLists = resourceDTOS.stream()
-                                .skip((pageNum - 1) * pageSize).limit(pageSize)
-                                .map(dto_ -> {
-                                    ResourceDTO get = this.selectWithAttrs(dto_.getId());
-                                    BeanUtils.copyProperties(get, dto_);
-                                    return dto_;
-                                }).collect(Collectors.toList());
-                        resultPage.setRecords(recordLists);
-                        resultPage.setTotal(resourceDTOS.size());
-                    }
-                }
             }
             break;
             case TSINGTAO_XHA: {
@@ -441,7 +382,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                     logger.info("西海岸基础设施");
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     OkHttpClient client = new OkHttpClient();
-                    String url = String.format(tsingtao_xhaProperties.getCloudcam(), org.apache.commons.lang3.StringUtils.isNotEmpty(resourceDTO.getName()) ? resourceDTO.getName() : "", pageNum, pageSize);
+                    String url = String.format(tsingtao_xhaProperties.getCloudcam(), StringUtils.isNotBlank(resourceDTO.getName()) ? resourceDTO.getName() : "", pageNum, pageSize);
                     logger.info(url);
                     Request request = new Request.Builder().url(url).build();
                     try (Response response = client.newCall(request).execute()) {
@@ -479,10 +420,26 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                     } catch (Exception exception) {
                         logger.error("失败", exception);
                     }
-                } else {
+                } else { // 西海岸普通资源
                     logger.info("西海岸基普通");
+                    resultPage = common(resultPage, selectDTOPageSpecilTotal, resourceDTO, orderField, orderType, pageNum, pageSize);
+                }
+            }
+            break;
+        }
+        return resultPage;
+    }
+
+
+    /**
+     * 从本库内查询
+     *
+     * @param resultPage
+     * @return
+     */
+    private Page<ResourceDTO> common(Page<ResourceDTO> resultPage, List<Map> selectDTOPageSpecilTotal, ResourceDTO resourceDTO, String orderField, String orderType, Integer pageNum, Integer pageSize) {
         if (resourceDTO.getInfoList().isEmpty()) {
-                        List<ResourceDTO> resourceDTOS = null;
+            List<ResourceDTO> resourceDTOS;
             if (orderField.equals("total")) { // 对总体评价特殊处理
                 List<Long> ids = new ArrayList<>();
                 switch (orderType) {
@@ -492,7 +449,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                                     String string = (index.get("total") == null) ? "0" : index.get("total").toString();
                                     return Long.valueOf(string);
                                 }
-                                    ).reversed()).skip((pageNum - 1) * pageSize).limit(pageSize).map(x ->
+                        ).reversed()).skip((long) (pageNum - 1) * pageSize).limit(pageSize).map(x ->
                                 Long.valueOf(x.get("id").toString())
                         ).collect(Collectors.toList());
                         break;
@@ -507,15 +464,24 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         break;
                 }
                 resourceDTOS = resourceDao.selectDTOPage(resourceDTO, null, null, null, null, ids);
-                        } else {
+                if ("DESC".equals(orderType)) {
-                            resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType, null);
-                        }
                     resultPage.setRecords(resourceDTOS.stream().sorted(Comparator.comparing(x -> {
                         ResourceDTO index = (ResourceDTO) x;
                         return index.getTotal() == null ? 0L : index.getTotal();
                     }).reversed()).collect(Collectors.toList()));
+                } else {
+                    resultPage.setRecords(resourceDTOS.stream().sorted(Comparator.comparing(x -> {
+                        ResourceDTO index = x;
+                        return index.getTotal() == null ? 0L : index.getTotal();
+                    })).collect(Collectors.toList()));
+                }
+            } else { // 非总体评价排序时
+                resourceDTOS = resourceDao.selectDTOPage(resourceDTO, (pageNum - 1) * pageSize, pageSize, orderField, orderType, null);
+            }
+            resultPage.setRecords(resourceDTOS);
             resultPage.setTotal(resourceDao.selectDTOPageCount(resourceDTO));
         } else {
+            logger.info("orderField:{} orderType:{}", orderField, orderType);
             List<ResourceDTO> resourceDTOS = resourceDao.selectWithAttrs(resourceDTO, orderField, orderType);
             int j = Math.min(pageNum * pageSize, resourceDTOS.size());
             if (resourceDTOS.isEmpty()) {
@@ -533,17 +499,15 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                 resultPage.setTotal(resourceDTOS.size());
             }
         }
-                }
-            }
-            break;
-        }
         return resultPage;
     }
 
     @Override
     public List<AttrEntity> selectAttrsByResourceId(Long resourceId) {
         QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("data_resource_id", resourceId).eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag()).orderByDesc("attr_type");
+        wrapper.eq("data_resource_id", resourceId)
+                .eq("del_flag", ResourceEntityDelFlag.NORMAL.getFlag())
+                .orderByDesc("attr_type");
         return attrDao.selectList(wrapper);
     }
 

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -123,10 +123,8 @@
         AND tdr.del_flag = 0
         <if test="dto.type != null and dto.type != ''">
             AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE)
-            <!--AND tdr.type LIKE CONCAT('%',#{dto.type},'%') -->
         </if>
         <if test="dto.name != null and dto.name != ''">
-            <!-- AND tdr.name LIKE CONCAT('%',#{dto.name},'%') -->
             AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE)
         </if>
         <if test="dto.districtId != null and dto.districtId != ''">
@@ -162,7 +160,9 @@
             ) tmp
             )
         </if>
+        <if test="orderField != null and orderField !=''">
             ORDER BY ${orderField} ${orderType}
+        </if>
     </select>
 
     <select id="selectTypeCount" resultType="java.util.Map">
@@ -428,6 +428,7 @@
         <if test="dto.deptId != null and dto.deptId != ''">
             AND tdr.dept_id = #{dto.deptId}
         </if>
+        ORDER BY create_date DESC
     </select>
 
     <select id="selectDTOPageCount" resultType="java.lang.Long">