合并代码

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
@@ -54,7 +55,7 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implements WorkService {
 
-    @Autowired
+    @Resource
     private WorkMapper entityMapper;
 
     @Autowired
@@ -104,8 +105,8 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result search(AgePageDto param, boolean isAdmin) {
-        startPage(param);
-        String userNameForToken = getUserNameForToken();
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
+        String userNameForToken = userRequest.getUserNameForToken();
         if (isAdmin){
             userNameForToken = null;
         }
@@ -202,7 +203,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
         // 创建二维码、二维码url
         String shareUrl = configConstant.domain4dKK + "/panorama/showMobile.html?id=" + id;
-        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id);
+        String qrCode = qrCodeUtils.generateLogoQrCode(shareUrl, configConstant.serverBasePath, configConstant.ossBasePath, configConstant.ossDomain, id,"zh");
         jsonObject.put("share", shareUrl);
         jsonObject.put("qrCode", qrCode);
 
@@ -851,7 +852,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper,WorkEntity> implemen
 
     @Override
     public Result select4dkk(PageDto param, String workId) {
-        startPage(param);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
 
         String url = configConstant.domain4dKK + "/api/user/scene/list";
         JSONObject reqParam = new JSONObject();