From 64dd5008cbdb641accd390b9195418c85cc1c7f3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 4 Mar 2019 11:09:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B9=B3=E5=8F=B0][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxWeappReleaseStatusMapper.java | 7 +- .../service/WxWeappReleaseStatusService.java | 9 ++ .../impl/WxWeappReleaseStatusServiceImpl.java | 9 +- .../controller/WxWeappInfoController.java | 83 +++++++++++++++++-- 4 files changed, 94 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java index 018bbc6c3..99f183d55 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java @@ -2,7 +2,6 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappReleaseStatus; -import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappReleaseStatusVo; import java.util.List; @@ -10,13 +9,13 @@ import java.util.Map; public interface WxWeappReleaseStatusMapper extends CommonMapper { - List findList(WxWeappReleaseStatus wxWeappCodeStatus); + List findList(WxWeappReleaseStatus wxWeappReleaseStatus); - List findVoList(WxWeappReleaseStatusVo weappCodeStatusVo); + List findVoList(WxWeappReleaseStatusVo weappReleaseStatusVo); List findUserVersions(); - void updateStatus(WxWeappReleaseStatus weappCodeStatus); + void updateStatus(WxWeappReleaseStatus weappRelaseStatus); diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java index 5d382e7d0..9209b4ec3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.po.WxWeappReleaseStatus; +import com.iformall.domain.vo.WxWeappAuditStatusVo; import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappReleaseStatusVo; @@ -21,6 +22,14 @@ public interface WxWeappReleaseStatusService { */ PageInfo listAsPage(WxWeappReleaseStatusVo record, Integer pageIndex, Integer pageSize); + /** + * 根据实体查询列表 + * + * @param record + * @return + */ + List getList(WxWeappReleaseStatusVo record); + /** * 查询version列表 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java index e8840c0bf..60c4c6e02 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java @@ -2,17 +2,13 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.iformall.common.IdWorker; import com.iformall.domain.po.WxAuthorizerInfo; -import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.po.WxWeappReleaseStatus; -import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappReleaseStatusVo; import com.iformall.enums.EnumWeappReleaseStatus; import com.iformall.mapper.WxAuthorizerInfoMapper; import com.iformall.mapper.WxWeappReleaseStatusMapper; import com.iformall.service.WxWeappReleaseStatusService; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +34,11 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> weappReleaseStatusMapper.findVoList(record)); } + @Override + public List getList(WxWeappReleaseStatusVo record) { + return weappReleaseStatusMapper.findVoList(record); + } + @Override public List getVersionList() { return weappReleaseStatusMapper.findUserVersions(); diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 72fb30f48..21b246fb3 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -16,6 +16,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.vo.WxWeappAuditStatusVo; import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappInfo; +import com.iformall.domain.vo.WxWeappReleaseStatusVo; import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.service.wechat.WxOpenService; @@ -787,13 +788,13 @@ public class WxWeappInfoController extends BaseController { return new ResultData(); } - @ApiOperation(value = "小程序发布状态分页列表接口", notes = "查询支持小程序类型,名称,appid,version") - @GetMapping("releaseStatusList") + @ApiOperation(value = "小程序code提交状态分页列表接口", notes = "查询支持小程序类型,名称,appid,version") + @GetMapping("codeStatusList") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData releaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxWeappInfoController::releaseStatusList"); + public ResultData codeStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::codeStatusList"); if (null == weappCodeStatusVo) { weappCodeStatusVo = new WxWeappCodeStatusVo(); } else { @@ -806,8 +807,8 @@ public class WxWeappInfoController extends BaseController { return new ResultData(page); } - @ApiOperation("小程序发布状态列表接口") - @GetMapping("releaseStatusAllList") + @ApiOperation("小程序code提交状态状态列表接口") + @GetMapping("codeStatusAllList") public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::releaseStatusAllList"); if (null == weappCodeStatusVo) { @@ -822,6 +823,76 @@ public class WxWeappInfoController extends BaseController { return new ResultData(list); } + @ApiOperation(value = "小程序审核状态分页列表接口", notes = "查询支持小程序类型,名称,appid,version") + @GetMapping("auditStatusList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData auditStatusList(@ModelAttribute WxWeappAuditStatusVo weappAuditStatusVo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::auditStatusList"); + if (null == weappAuditStatusVo) { + weappAuditStatusVo = new WxWeappAuditStatusVo(); + } else { + if(StringUtils.isBlank(weappAuditStatusVo.getAppId())) { + weappAuditStatusVo.setAppId(null); + } + } + weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.UserVersion_DESC); + final PageInfo page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("小程序审核状态状态列表接口") + @GetMapping("auditStatusAllList") + public ResultData getAuditStatusList(@ModelAttribute WxWeappAuditStatusVo weappAuditStatusVo) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditStatusList"); + if (null == weappAuditStatusVo) { + weappAuditStatusVo = new WxWeappAuditStatusVo(); + } else { + if(StringUtils.isBlank(weappAuditStatusVo.getAppId())) { + weappAuditStatusVo.setAppId(null); + } + } + weappAuditStatusVo.setSortColumns(WxWeappAuditStatus.Field.UserVersion_DESC); + final List list = weappAuditStatusService.getList(weappAuditStatusVo); + return new ResultData(list); + } + + @ApiOperation(value = "小程序发布状态分页列表接口", notes = "查询支持小程序类型,名称,appid,version") + @GetMapping("releaseStatusList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData releaseStatusList(@ModelAttribute WxWeappReleaseStatusVo weappReleaseStatusVo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::releaseStatusList"); + if (null == weappReleaseStatusVo) { + weappReleaseStatusVo = new WxWeappReleaseStatusVo(); + } else { + if(StringUtils.isBlank(weappReleaseStatusVo.getAppId())) { + weappReleaseStatusVo.setAppId(null); + } + } + weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.UserVersion_DESC); + final PageInfo page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("小程序审核状态状态列表接口") + @GetMapping("releaseStatusAllList") + public ResultData getReleaseStatusList(@ModelAttribute WxWeappReleaseStatusVo weappReleaseStatusVo) { + logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getReleaseStatusList"); + if (null == weappReleaseStatusVo) { + weappReleaseStatusVo = new WxWeappReleaseStatusVo(); + } else { + if(StringUtils.isBlank(weappReleaseStatusVo.getAppId())) { + weappReleaseStatusVo.setAppId(null); + } + } + weappReleaseStatusVo.setSortColumns(WxWeappReleaseStatus.Field.UserVersion_DESC); + final List list = weappReleaseStatusService.getList(weappReleaseStatusVo); + return new ResultData(list); + } + @ApiOperation("小程序code提交版本列表") @GetMapping("codeVersionList") public ResultData getCodeVersionList() {