From 19b4a1a6e2195170ca4efd908ce2f3689a07e2a3 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 5 Mar 2019 07:39:41 +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?=E6=A0=B9=E6=8D=AE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxWeappAuditStatusMapper.java | 3 ++- .../mapper/WxWeappCodeStatusMapper.java | 3 ++- .../mapper/WxWeappReleaseStatusMapper.java | 3 ++- .../service/WxWeappAuditStatusService.java | 2 +- .../service/WxWeappCodeStatusService.java | 2 +- .../service/WxWeappReleaseStatusService.java | 2 +- .../impl/WxWeappAuditStatusServiceImpl.java | 4 ++-- .../impl/WxWeappCodeStatusServiceImpl.java | 4 ++-- .../impl/WxWeappReleaseStatusServiceImpl.java | 5 +++-- .../mapper/WxWeappAuditStatusMapper.xml | 17 ++++++++++------- .../mapper/WxWeappCodeStatusMapper.xml | 17 +++++++++-------- .../mapper/WxWeappReleaseStatusMapper.xml | 16 +++++++++------- .../controller/WxWeappInfoController.java | 18 ++++++++++++------ 13 files changed, 56 insertions(+), 40 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java index cbef6fe3c..7f2d45bda 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappAuditStatus; import com.iformall.domain.vo.WxWeappAuditStatusVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -13,7 +14,7 @@ public interface WxWeappAuditStatusMapper extends CommonMapper findVoList(WxWeappAuditStatusVo weappAuditStatusVo); - List findUserVersions(); + List findUserVersions(@Param(value = "type") Integer type); void updateStatus(WxWeappAuditStatus record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java index 83a191040..854a5971e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappCodeStatus; import com.iformall.domain.vo.WxWeappCodeStatusVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -13,7 +14,7 @@ public interface WxWeappCodeStatusMapper extends CommonMapper findVoList(WxWeappCodeStatusVo weappCodeStatusVo); - List findUserVersions(); + List findUserVersions(@Param(value = "type") Integer type); void updateStatus(WxWeappCodeStatus weappCodeStatus); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java index 99f183d55..8f72957be 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappReleaseStatus; import com.iformall.domain.vo.WxWeappReleaseStatusVo; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -13,7 +14,7 @@ public interface WxWeappReleaseStatusMapper extends CommonMapper findVoList(WxWeappReleaseStatusVo weappReleaseStatusVo); - List findUserVersions(); + List findUserVersions(@Param(value = "type") Integer type); void updateStatus(WxWeappReleaseStatus weappRelaseStatus); diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappAuditStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappAuditStatusService.java index de7724b5d..fa90b35f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappAuditStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappAuditStatusService.java @@ -32,7 +32,7 @@ public interface WxWeappAuditStatusService { * * @return */ - List getVersionList(); + List getVersionList(Integer type); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java index a8b2d184e..e7e48d43b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java @@ -32,7 +32,7 @@ public interface WxWeappCodeStatusService { * * @return */ - List getVersionList(); + List getVersionList(Integer type); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java index 9209b4ec3..eaa0a3034 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java @@ -35,7 +35,7 @@ public interface WxWeappReleaseStatusService { * * @return */ - List getVersionList(); + List getVersionList(Integer type); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java index 4698d725d..8b7cd7c28 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java @@ -34,8 +34,8 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService } @Override - public List getVersionList() { - return weappAuditStatusMapper.findUserVersions(); + public List getVersionList(Integer type) { + return weappAuditStatusMapper.findUserVersions(type); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java index ae95ca7c0..dd15f5b84 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -36,8 +36,8 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { } @Override - public List getVersionList() { - return weappCodeStatusMapper.findUserVersions(); + public List getVersionList(Integer type) { + return weappCodeStatusMapper.findUserVersions(type); } @Override 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 a004a1fda..8dd3fe7f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java @@ -9,6 +9,7 @@ import com.iformall.enums.EnumWeappReleaseStatus; import com.iformall.mapper.WxAuthorizerInfoMapper; import com.iformall.mapper.WxWeappReleaseStatusMapper; import com.iformall.service.WxWeappReleaseStatusService; +import org.omg.CORBA.INTERNAL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -40,8 +41,8 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ } @Override - public List getVersionList() { - return weappReleaseStatusMapper.findUserVersions(); + public List getVersionList(Integer type) { + return weappReleaseStatusMapper.findUserVersions(type); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml index ffa35cc14..21aead87a 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml @@ -62,6 +62,16 @@ where `app_id` = #{appId} and `type` = #{type} + + @@ -118,12 +128,5 @@ left join wx_appinfo a on c.`app_id` = a.`app_id` - - - diff --git a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml index 81be02b77..6612bad85 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml @@ -57,6 +57,15 @@ where `app_id` = #{appId} and `type` = #{type} + @@ -109,12 +118,4 @@ left join wx_appinfo a on c.`app_id` = a.`app_id` - - - - diff --git a/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml index 557254c87..f615331aa 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml @@ -57,6 +57,15 @@ where `app_id` = #{appId} and `type` = #{type} + @@ -114,12 +123,5 @@ left join wx_appinfo a on c.`app_id` = a.`app_id` - - - diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index cbedd1004..890a2c979 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -770,25 +770,31 @@ public class WxWeappInfoController extends BaseController { @ApiOperation("小程序code提交版本列表") @GetMapping("codeVersionList") - public ResultData getCodeVersionList() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) + public ResultData getCodeVersionList(Integer type) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getCodeVersionList"); - final List list = weappCodeStatusService.getVersionList(); + final List list = weappCodeStatusService.getVersionList(type); return new ResultData(list); } @ApiOperation("小程序审核版本列表") @GetMapping("auditVersionList") - public ResultData getAuditVersionList() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) + public ResultData getAuditVersionList(Integer type) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditVersionList"); - final List list = weappAuditStatusService.getVersionList(); + final List list = weappAuditStatusService.getVersionList(type); return new ResultData(list); } @ApiOperation("小程序发布版本列表") @GetMapping("releaseVersionList") - public ResultData getReleaseVersionList() { + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "小程序类型", dataType = "int", paramType = "query", required = true)}) + public ResultData getReleaseVersionList(Integer type) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getReleaseVersionList"); - final List list = weappReleaseStatusService.getVersionList(); + final List list = weappReleaseStatusService.getVersionList(type); return new ResultData(list); }