率

xiangpei

2024-09-05 3b146767b38a6bde685867143d397b5ece3339ea

 ycl-server/src/main/java/com/ycl/utils/MongoUtil.java

@@ -28,12 +28,11 @@
     * 构造数据中心搜索的条件
     *
     * @param params 数据中心请求参数
     * @param gbFiled 国标码字段是哪一个
     * @param timeFiled 时间字段是哪一个
     * @param gbList 国标码
     * @param dataAuth 点位类型：null 所有  1 部级  2 省厅  3 重点  4 重点指挥  5 是否新设备
     * @param likeFileds 使用like查询的字段
     */
    public static Query getQuery(DataCenterQuery params, String gbFiled, String timeFiled, List<String> likeFileds, List<String> gbList) {
    public static Query getQuery(DataCenterQuery params, String timeFiled, List<String> likeFileds, Integer dataAuth) {
        // 关键字
        List<Criteria> likeList = null;
        if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
@@ -50,10 +49,28 @@
            or.orOperator(likeList);
        }

        Criteria in = null;
        Criteria tag = null;
        // in
        if (! CollectionUtils.isEmpty(gbList)) {
            in = Criteria.where(gbFiled).in(gbList);
        if (Objects.nonNull(dataAuth)) {
            switch (dataAuth) {
                case 1:
                    tag = Criteria.where("deptTag").is(Boolean.TRUE);
                    break;
                case 2:
                    tag = Criteria.where("provinceTag").is(Boolean.TRUE);
                    break;
                case 3:
                    tag = Criteria.where("importantTag").is(Boolean.TRUE);
                    break;
                case 4:
                    tag = Criteria.where("importantCommandImageTag").is(Boolean.TRUE);
                    break;
                case 5:
                    tag = Criteria.where("newDevice").is(Boolean.TRUE);
                    break;
                default:
                    break;
            }
        }

        // 时间
@@ -63,8 +80,8 @@
        Criteria and = new Criteria();
        List<Criteria> qList = new ArrayList<>(3);
        qList.add(time);
        if (Objects.nonNull(in)) {
            qList.add(in);
        if (Objects.nonNull(tag)) {
            qList.add(tag);
        }
        if (Objects.nonNull(or)) {
            qList.add(or);