更新素材搜索

720yun_local_manage/gis_pano/src/main/java/com/gis/cms/service/impl/FodderServiceImpl.java

@@ -17,10 +17,10 @@ import com.gis.common.util.FileUtils;
 import com.gis.common.util.RedisUtil;
 import com.gis.common.util.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.Arrays;
 
 
@@ -62,6 +62,10 @@ public class FodderServiceImpl extends ServiceImpl<FodderMapper, FodderEntity> i
         IPage<FodderEntity> page = new Page<>(param.getPageNum() , param.getPageSize());
         LambdaQueryWrapper<FodderEntity> wrapper = new LambdaQueryWrapper<> ();
         wrapper.eq(FodderEntity::getCreatorId, iBaseService.getUserId());
+        String searchKey = param.getSearchKey();
+        if (StringUtils.isNotBlank(searchKey)){
+            wrapper.like(FodderEntity::getFileName, searchKey);
+        }
         wrapper.orderByDesc(FodderEntity::getCreateTime);
         IPage<FodderEntity> result = this.page(page, wrapper);
         return Result.success(result);

720yun_local_manage/gis_pano/src/main/java/com/gis/cms/service/impl/WorkServiceImpl.java

@@ -249,20 +249,8 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
         entity.setQrCode(sd.getString("qrCode"));
         entity.setStatus(sd.getInteger("status"));
         entity.setPassword(sd.getString("password"));
-//        entity.setSceneCodes(sd.getString("scenes"));
         String scenes = sd.getString("scenes");
         entity.setSceneCodes(getSceneCodes(scenes));
-        // 更新logoQrCode
-        Boolean logoChange = sd.getBoolean("logoChange");
-//        String logoUrl = sd.getString("logo");
-//        if (logoChange) {
-//            Boolean isLogo = updateQrCode(entity.getId(), logoUrl);
-//            if (!isLogo) {
-//                log.error("二维码创建失败");
-//                return false;
-//            }
-//        }
-
 
         entity.setUpdateTime(LocalDateTime.now());
 
@@ -289,26 +277,6 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
 
     }
 
-//    /**
-//     * 更新二维码
-//     */
-//    private Boolean updateQrCode(String id, String logoUrl) {
-//
-//        // 网络下载logo图片
-//        logoUrl = logoUrl + "?m=" + System.currentTimeMillis();
-//        String localBasePath = configConstant.serverBasePath + id;
-//        FileUtils.downLoadFromUrl(logoUrl, "logo.jpg", localBasePath);
-//        String logoPath = localBasePath + "/logo.jpg";
-//        if (!FileUtil.isFile(logoPath)) {
-//            log.error("logo.jpg文件不存在");
-//            return false;
-//        }
-//        log.info("网络下载logo完成");
-//        String shareUrl = configConstant.domain4dKK + "/panorama/show.html?id=" + id;
-//        qrCodeUtils.diyLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id, logoPath);
-//        log.info("二维码更新完成");
-//        return true;
-//    }
 
 
     /**
@@ -324,60 +292,6 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, WorkEntity> impleme
 
     }
 
-//
-//    @Override
-//    public Result select4dkk(PageDto param, String workId) {
-//        startPage(param);
-//
-//        String url = configConstant.domain4dKK + "/api/user/scene/list";
-//        JSONObject reqParam = new JSONObject();
-//        reqParam.put("pageNum", param.getPageNum().toString());
-//        reqParam.put("pageSize", param.getPageSize().toString());
-//        reqParam.put("searchKey", param.getSearchKey());
-//        // type=11, 计算成功的场景
-//        reqParam.put("type", "11");
-//        // 2022-2-10 excludeSceneSource=4, 过滤激光场景数据
-//        reqParam.put("excludeSceneSource", 4);
-//
-//        HashMap<String, String> headers = new HashMap<>();
-//        String token = getToken();
-//        if (StringUtils.isBlank(token)) {
-//            return Result.failure("token无空");
-//        }
-//        headers.put("token", token);
-//        String restResult = null;
-//        JSONObject reJson = null;
-//        try {
-//
-//            HttpResponse httpResponse = HttpUtils.doPost(url, headers, reqParam);
-//            restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
-//            log.debug("四维看看返回值: " + restResult);
-//
-//
-//            reJson = JSONObject.parseObject(restResult);
-//            int code = reJson.getInteger("code");
-//            log.info("resultCode: {}", code);
-//
-//            if (code == 3004) {
-//                String msg = reJson.getString("msg");
-//                log.info("获取四维看看列表失败，{}", msg);
-//                return Result.failure(5001, msg);
-//            }
-//
-//            if (code != 0) {
-//                String msg = reJson.getString("msg");
-//                log.info("获取四维看看列表失败，{}", msg);
-//                return Result.failure(msg);
-//            }
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//        return Result.success(reJson);
-//
-//
-//    }
 
 
     @Override