From e88711dcdde56d18641c5800a76d735bb1c40bbb Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 20 Dec 2019 13:42:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A0=81=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeptMaCodeServiceImpl.java   | 36 ++++++-------------
 1 file changed, 10 insertions(+), 26 deletions(-)

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<DeptMaCodeDao, DeptMa
     @Autowired
     private OssFeignClient ossFeignClient;
 
+    /**
+     * 小程序首页
+     */
+    private static String MA_FRONT_PAGE_URL = "pages/index/index";
+
     @Override
     public PageData<DeptMaCodeDTO> page(Map<String, Object> params) {
         String leaderFlag = (String) params.get("leaderFlag");
@@ -143,31 +147,10 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
         if (CollUtil.isEmpty(gridIdList)) {
             return new Result();
         }
-        String page = "pages/index/index";
-
-        Result<String> 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<DeptMaCodeDao, DeptMa
     @Override
     public Result createDeptMaCode(String gridId) {
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
-        entity.setCodeUrl(this.createMaCode(gridId, "pages/index/index"));
+        entity.setCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL));
         entity.setGridId(Long.parseLong(gridId));
         entity.setLeaderFlag(YesOrNoEnum.NO.value());
         this.baseDao.insert(entity);
@@ -193,7 +176,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
             return new Result();
         }
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
-        entity.setCodeUrl(this.createMaCode("gridLeader", "pages/index/index"));
+        entity.setCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL));
         entity.setLeaderFlag(YesOrNoEnum.YES.value());
         this.baseDao.insert(entity);
         return new Result();
@@ -211,7 +194,8 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     private String createMaCode(String param, String pageUrl) {
         File wxaCodeUnlimit;
         try {
-            wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCodeUnlimit(param, pageUrl);
+            wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService()
+                    .createWxaCodeUnlimit(param, pageUrl, 1280, true, null, false);
         } catch (WxErrorException e) {
             throw new RenException("请求微信接口失败");
         }