diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java index 3e9c19894..492128a09 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java @@ -17,7 +17,6 @@ package com.elink.esua.epdc.service.impl; -import cn.binarywang.wx.miniapp.api.WxMaQrcodeService; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -64,6 +63,11 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl page(Map params) { String leaderFlag = (String) params.get("leaderFlag"); @@ -143,31 +147,10 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl ossResult; - File wxaCodeUnlimit; - UploadToOssDTO uploadDto; - DeptMaCodeEntity entity; - WxMaQrcodeService qrcodeService = wxMaServiceUtils.normalWxMaService().getQrcodeService(); for (Long gridId : gridIdList) { - try { - wxaCodeUnlimit = qrcodeService.createWxaCodeUnlimit(String.valueOf(gridId), page); - } catch (WxErrorException e) { - log.error("->initDeptMaCode::createWxaCodeUnlimit error::deptId={}", gridId); - continue; - } - uploadDto = new UploadToOssDTO(); - uploadDto.setFileByte(this.fileToByteArray(wxaCodeUnlimit)); - uploadDto.setFileName(wxaCodeUnlimit.getName()); - ossResult = ossFeignClient.uploadFile(uploadDto); - if (null == ossResult || !ossResult.success() || null == ossResult.getData()) { - log.error("->initDeptMaCode::oss uploadFile error::deptId={}", gridId); - continue; - } entity = new DeptMaCodeEntity(); - entity.setCodeUrl(ossResult.getData()); + entity.setCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL)); entity.setGridId(gridId); this.baseDao.insert(entity); } @@ -177,7 +160,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl