小程序码后端修改

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptMaCodeDTO.java

@@ -49,6 +49,11 @@ public class DeptMaCodeDTO implements Serializable {
      */
     private String codeUrl;
 
+    /**
+     * 是否是网格长码，0否  1是
+     */
+    private String leaderFlag;
+
     /**
      * 乐观锁
      */

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/DeptMaCodeController.java

@@ -118,5 +118,17 @@ public class DeptMaCodeController {
         return deptMaCodeService.createDeptMaCode(gridId);
     }
 
+    /**
+     * 创建网格长注册小程序码
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/10/22 09:59
+     */
+    @PostMapping("gridLeader")
+    public Result createGridLeaderMaCode() {
+        return deptMaCodeService.createGridLeaderMaCode();
+    }
+
 
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/DeptMaCodeEntity.java

@@ -23,8 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 网格小程序码
  *
@@ -48,4 +46,9 @@ public class DeptMaCodeEntity extends BaseEpdcEntity {
      */
 	private String codeUrl;
 
+    /**
+     * 是否是网格长码，0否  1是
+     */
+    private String leaderFlag;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/DeptMaCodeService.java

@@ -112,4 +112,13 @@ public interface DeptMaCodeService extends BaseService<DeptMaCodeEntity> {
      * @date 2019/9/19 11:05
      */
     Result createDeptMaCode(String gridId);
+
+    /**
+     * 创建网格长注册小程序码
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author work@yujt.net.cn
+     * @date 2019/10/22 09:59
+     */
+    Result createGridLeaderMaCode();
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java

@@ -24,6 +24,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@@ -64,6 +66,26 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
 
     @Override
     public PageData<DeptMaCodeDTO> page(Map<String, Object> params) {
+        String leaderFlag = (String) params.get("leaderFlag");
+        if (StringUtils.isNotBlank(leaderFlag) && leaderFlag.equals(YesOrNoEnum.YES.value())) {
+            QueryWrapper<DeptMaCodeEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq("LEADER_FLAG", leaderFlag);
+
+            IPage<DeptMaCodeEntity> page = baseDao.selectPage(
+                    getPage(params, FieldConstant.CREATED_TIME, false),
+                    wrapper
+            );
+
+            PageData<DeptMaCodeDTO> pageData = getPageData(page, DeptMaCodeDTO.class);
+            List<DeptMaCodeDTO> pageDataList = pageData.getList();
+            for (DeptMaCodeDTO dto : pageDataList) {
+                dto.setStreet("全部街道通用");
+                dto.setCommunity("全部社区通用");
+                dto.setGrid("全部网格通用");
+            }
+
+            return pageData;
+        }
 
         IPage<DeptMaCodeDTO> page = this.getPage(params);
         List<DeptMaCodeDTO> dtoList = this.baseDao.selectListDeptMaCode(params);
@@ -154,11 +176,38 @@ 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.setGridId(Long.parseLong(gridId));
+        entity.setLeaderFlag(YesOrNoEnum.NO.value());
+        this.baseDao.insert(entity);
+        return new Result();
+    }
+
+    @Override
+    public Result createGridLeaderMaCode() {
+        DeptMaCodeEntity entity = new DeptMaCodeEntity();
+        entity.setCodeUrl(this.createMaCode("gridLeader", "pages/index/index"));
+        entity.setLeaderFlag(YesOrNoEnum.YES.value());
+        this.baseDao.insert(entity);
+        return new Result();
+    }
+
+    /**
+     * 创建微信小程序码，并上传到oss
+     *
+     * @param param   小程序码的参数
+     * @param pageUrl 小程序码的跳转链接
+     * @return java.lang.String 小程序码的下载抵制
+     * @author work@yujt.net.cn
+     * @date 2019/10/22 10:14
+     */
+    private String createMaCode(String param, String pageUrl) {
         File wxaCodeUnlimit;
         try {
-            wxaCodeUnlimit = wxMaService.getQrcodeService().createWxaCodeUnlimit(gridId, "pages/index/index");
+            wxaCodeUnlimit = wxMaService.getQrcodeService().createWxaCodeUnlimit(param, pageUrl);
         } catch (WxErrorException e) {
-            return new Result().error("请求微信接口失败");
+            throw new RenException("请求微信接口失败");
         }
 
         UploadToOssDTO dto = new UploadToOssDTO();
@@ -167,13 +216,9 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
 
         Result<String> ossResult = ossFeignClient.uploadFile(dto);
         if (null == ossResult || !ossResult.success() || null == ossResult.getData()) {
-            return new Result().error("小程序码上传失败");
+            throw new RenException("小程序码上传失败");
         }
-        DeptMaCodeEntity entity = new DeptMaCodeEntity();
-        entity.setCodeUrl(ossResult.getData());
-        entity.setGridId(Long.parseLong(gridId));
-        this.baseDao.insert(entity);
-        return new Result();
+        return ossResult.getData();
     }
 
     /**

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/DeptMaCodeDao.xml

@@ -11,6 +11,7 @@
             dg.id AS GRID_ID,
             ed.CREATED_TIME,
             ed.ID,
+            ed.leader_flag,
             ed.CODE_URL
         FROM
             sys_dept dg