From 3d5100e0ee1b4e0d72fec73c90943f61f23765ae Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 12 Apr 2022 20:17:40 +0800 Subject: [PATCH] update tt --- .../java/com/iformall/domain/po/WxAppinfo.java | 2 ++ .../iformall/domain/po/WxWeappAuditStatus.java | 3 +++ .../iformall/domain/po/WxWeappCodeStatus.java | 3 +++ .../domain/po/WxWeappReleaseStatus.java | 3 +++ .../mapper/WxWeappAuditStatusMapper.java | 2 +- .../mapper/WxWeappCodeStatusMapper.java | 2 +- .../mapper/WxWeappReleaseStatusMapper.java | 2 +- .../service/WxWeappAuditStatusService.java | 2 +- .../service/WxWeappCodeStatusService.java | 2 +- .../service/WxWeappReleaseStatusService.java | 2 +- .../impl/WxWeappAuditStatusServiceImpl.java | 4 ++-- .../impl/WxWeappCodeStatusServiceImpl.java | 4 ++-- .../impl/WxWeappReleaseStatusServiceImpl.java | 4 ++-- .../main/resources/mapper/WxAppinfoMapper.xml | 6 +++++- .../mapper/WxWeappAuditStatusMapper.xml | 15 +++++++++++++-- .../mapper/WxWeappCodeStatusMapper.xml | 18 +++++++++++++++--- .../mapper/WxWeappReleaseStatusMapper.xml | 17 +++++++++++++++-- .../controller/WechatWeappCodeController.java | 5 +++++ .../controller/WxWeappInfoController.java | 12 +++++++++--- .../controller/WechatWeappCodeController.java | 5 +++++ .../controller/WxWeappInfoController.java | 12 +++++++++--- 21 files changed, 99 insertions(+), 26 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index 11f4319..152e0b2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -39,6 +39,8 @@ public class WxAppinfo extends BaseEntity { private Long payId; @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="平台",name="plat") + private Integer plat; @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") private Long payBillId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java index 2e4c5cb..ab440ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappAuditStatus.java @@ -35,4 +35,7 @@ public class WxWeappAuditStatus extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="审核时间",name="auditTime") private Date auditTime; + @io.swagger.annotations.ApiModelProperty(value="小程序平台",name="plat") + private Integer plat; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java index ced0525..2948746 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -32,4 +32,7 @@ public class WxWeappCodeStatus extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="code提交时间",name="codeTime") private Date codeTime; + @io.swagger.annotations.ApiModelProperty(value="小程序平台",name="type") + private Integer plat; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java index 83fa6dd..6888756 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappReleaseStatus.java @@ -31,5 +31,8 @@ public class WxWeappReleaseStatus extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="发布时间",name="releaseTime") private Date releaseTime; + @io.swagger.annotations.ApiModelProperty(value="小程序平台",name="plat") + private Integer plat; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java index 2a92084..fbc0d69 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappAuditStatusMapper.java @@ -14,7 +14,7 @@ public interface WxWeappAuditStatusMapper extends CommonMapper findVoList(WxWeappAuditStatusVo weappAuditStatusVo); - List findUserVersions(@Param(value = "type") Integer type, @Param(value = "auditStatus") Integer auditStatus); + List findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat") Integer plat, @Param(value = "auditStatus") Integer auditStatus); 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 854a597..39bd806 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java @@ -14,7 +14,7 @@ public interface WxWeappCodeStatusMapper extends CommonMapper findVoList(WxWeappCodeStatusVo weappCodeStatusVo); - List findUserVersions(@Param(value = "type") Integer type); + List findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat")Integer plat); 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 8f72957..d10628d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappReleaseStatusMapper.java @@ -14,7 +14,7 @@ public interface WxWeappReleaseStatusMapper extends CommonMapper findVoList(WxWeappReleaseStatusVo weappReleaseStatusVo); - List findUserVersions(@Param(value = "type") Integer type); + List findUserVersions(@Param(value = "type") Integer type,@Param(value = "plat") Integer plat); 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 f7abd62..59a03c0 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(Integer type, Integer auditStatus); + List getVersionList(Integer type,Integer plat, Integer auditStatus); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java index e7e48d4..356377b 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(Integer type); + List getVersionList(Integer type,Integer plat); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappReleaseStatusService.java index eaa0a30..3649509 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(Integer type); + List getVersionList(Integer type,Integer plat); /** * 根据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 b1f8f43..6b6b8d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java @@ -35,8 +35,8 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService } @Override - public List getVersionList(Integer type, Integer auditStatus) { - return weappAuditStatusMapper.findUserVersions(type, auditStatus); + public List getVersionList(Integer type,Integer plat, Integer auditStatus) { + return weappAuditStatusMapper.findUserVersions(type,plat, auditStatus); } @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 2fbd70d..59bdaa1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -37,8 +37,8 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { } @Override - public List getVersionList(Integer type) { - return weappCodeStatusMapper.findUserVersions(type); + public List getVersionList(Integer type,Integer plat) { + return weappCodeStatusMapper.findUserVersions(type,plat); } @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 93f11bd..316e394 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java @@ -42,8 +42,8 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ } @Override - public List getVersionList(Integer type) { - return weappReleaseStatusMapper.findUserVersions(type); + public List getVersionList(Integer type,Integer plat) { + return weappReleaseStatusMapper.findUserVersions(type,plat); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index b852e23..558072d 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -16,12 +16,13 @@ + - `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type`,`pay_bill_id` + `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`,`secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`,`pay_id`,`type`,`plat`,`pay_bill_id` @@ -80,6 +81,9 @@ and `type` = #{type} + + and `plat` = #{plat} + and `pay_bill_id` = #{payBillId} diff --git a/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml index cddef35..25fda51 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappAuditStatusMapper.xml @@ -12,10 +12,11 @@ + - `id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`, `auditid`, `audit_status`,`audit_err_code`,`audit_time` + `id`,`tenant_id`,`app_id`,`type`,`plat`,`user_version`,`version_desc`, `auditid`, `audit_status`,`audit_err_code`,`audit_time` @@ -32,6 +33,9 @@ and `type` = #{type} + + and `plat` = #{plat} + and `user_version` = #{userVersion} @@ -74,6 +78,9 @@ and `type` = #{type} + + and `plat` = #{plat} + and `audit_status` = #{auditStatus} @@ -92,10 +99,11 @@ + - c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,`version_desc`, + c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,`version_desc`, c.`auditid`, c.`audit_status`,c.`audit_err_code`,c.`audit_time` as `audit_time`, a.`name` @@ -114,6 +122,9 @@ and c.`type` = #{type} + + and c.`plat` = #{plat} + and c.`user_version` = #{userVersion} diff --git a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml index 86eb98a..d07e3c0 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml @@ -11,10 +11,12 @@ + + - `id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time` + `id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`code_status`,`code_err_code`,`code_time`,`plat` @@ -31,6 +33,9 @@ and `type` = #{type} + + and `plat` = #{plat} + and `user_version` = #{userVersion} @@ -63,13 +68,16 @@ where `app_id` = #{appId} and `type` = #{type} - select user_version as version from wx_weapp_code_status where 1=1 and `type` = #{type} + + and `plat` = #{plat} + group by user_version @@ -78,6 +86,7 @@ + @@ -87,7 +96,7 @@ - c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time` as `code_time`, a.`name` + c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,c.`version_desc`,c.`code_status`,c.`code_err_code`,c.`code_time` as `code_time`, a.`name` @@ -104,6 +113,9 @@ and c.`type` = #{type} + + and c.`plat` = #{plat} + and c.`user_version` = #{userVersion} diff --git a/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml index ae1f360..03f98e2 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappReleaseStatusMapper.xml @@ -11,10 +11,12 @@ + + - `id`,`tenant_id`,`app_id`,`type`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time` + `id`,`tenant_id`,`app_id`,`type`,`plat`,`user_version`,`version_desc`,`release_status`,`release_err_code`,`release_time` @@ -31,6 +33,9 @@ and `type` = #{type} + + and `plat` = #{plat} + and `user_version` = #{userVersion} @@ -70,6 +75,9 @@ and `type` = #{type} + + and `plat` = #{plat} + group by user_version @@ -84,10 +92,12 @@ + + - c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`user_version` as `user_version`,c.`version_desc`, + c.`id`,c.`tenant_id` as `tenant_id`,c.`app_id`,c.`type` as `type`,c.`plat` as `plat`,c.`user_version` as `user_version`,c.`version_desc`, c.`release_status`,c.`release_err_code`,c.`release_time` as `release_time`, a.`name` @@ -106,6 +116,9 @@ and c.`type` = #{type} + + and c.`plat` = #{plat} + and c.`user_version` = #{userVersion} diff --git a/mlToutiaoOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mlToutiaoOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index 8d97ccc..3dd049e 100644 --- a/mlToutiaoOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mlToutiaoOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -113,6 +113,7 @@ public class WechatWeappCodeController extends BaseController { if (appinfo != null) { codeStatus.setTenantId(appinfo.getTenantId()); codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -145,6 +146,7 @@ public class WechatWeappCodeController extends BaseController { if (appinfo != null) { codeStatus.setTenantId(appinfo.getTenantId()); codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -280,6 +282,7 @@ public class WechatWeappCodeController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); if(submitStatus) { @@ -393,6 +396,7 @@ public class WechatWeappCodeController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); auditStatus.setAuditid(auditId); @@ -567,6 +571,7 @@ public class WechatWeappCodeController extends BaseController { releaseStatus.setTenantId(auditStatus.getTenantId()); releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setType(auditStatus.getType()); + releaseStatus.setPlat(auditStatus.getPlat()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } diff --git a/mlToutiaoOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlToutiaoOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index e732797..9008db9 100644 --- a/mlToutiaoOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlToutiaoOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -642,6 +642,7 @@ public class WxWeappInfoController extends BaseController { codeStatus.setAppId(appinfo.getAppId()); if (appinfo != null) { codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -698,6 +699,7 @@ public class WxWeappInfoController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); auditStatus.setAuditid(auditid); @@ -870,6 +872,7 @@ public class WxWeappInfoController extends BaseController { releaseStatus.setTenantId(auditStatus.getTenantId()); releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setType(auditStatus.getType()); + releaseStatus.setPlat(auditStatus.getPlat()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } @@ -934,6 +937,7 @@ public class WxWeappInfoController extends BaseController { weappCodeStatusVo.setName(null); } } + weappCodeStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); weappCodeStatusVo.setSortColumns(BaseEntity.SortField.CodeTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); return new ResultData(page); @@ -956,6 +960,7 @@ public class WxWeappInfoController extends BaseController { weappAuditStatusVo.setName(null); } } + weappAuditStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); weappAuditStatusVo.setSortColumns(BaseEntity.SortField.AuditTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); return new ResultData(page); @@ -978,6 +983,7 @@ public class WxWeappInfoController extends BaseController { weappReleaseStatusVo.setName(null); } } + weappReleaseStatusVo.setPlat(EnumAppPlat.TOUTIAO.getCode()); weappReleaseStatusVo.setSortColumns(BaseEntity.SortField.ReleaseTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC,BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); return new ResultData(page); @@ -989,7 +995,7 @@ public class WxWeappInfoController extends BaseController { @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(type); + final List list = weappCodeStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode()); return new ResultData(list); } @@ -1000,7 +1006,7 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "status", value = "审核状态", dataType = "int", paramType = "query")}) public ResultData getAuditVersionList(Integer type, Integer status) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditVersionList"); - final List list = weappAuditStatusService.getVersionList(type, status); + final List list = weappAuditStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode(), status); return new ResultData(list); } @@ -1010,7 +1016,7 @@ public class WxWeappInfoController extends BaseController { @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(type); + final List list = weappReleaseStatusService.getVersionList(type,EnumAppPlat.TOUTIAO.getCode()); return new ResultData(list); } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index 8d97ccc..3dd049e 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -113,6 +113,7 @@ public class WechatWeappCodeController extends BaseController { if (appinfo != null) { codeStatus.setTenantId(appinfo.getTenantId()); codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -145,6 +146,7 @@ public class WechatWeappCodeController extends BaseController { if (appinfo != null) { codeStatus.setTenantId(appinfo.getTenantId()); codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -280,6 +282,7 @@ public class WechatWeappCodeController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); if(submitStatus) { @@ -393,6 +396,7 @@ public class WechatWeappCodeController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); auditStatus.setAuditid(auditId); @@ -567,6 +571,7 @@ public class WechatWeappCodeController extends BaseController { releaseStatus.setTenantId(auditStatus.getTenantId()); releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setType(auditStatus.getType()); + releaseStatus.setPlat(auditStatus.getPlat()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index f06011d..68ba499 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -639,6 +639,7 @@ public class WxWeappInfoController extends BaseController { codeStatus.setAppId(appinfo.getAppId()); if (appinfo != null) { codeStatus.setType(appinfo.getType()); + codeStatus.setPlat(appinfo.getPlat()); } codeStatus.setUserVersion(userVersion); codeStatus.setVersionDesc(userDesc); @@ -695,6 +696,7 @@ public class WxWeappInfoController extends BaseController { auditStatus.setTenantId(codeStatus.getTenantId()); auditStatus.setAppId(codeStatus.getAppId()); auditStatus.setType(codeStatus.getType()); + auditStatus.setPlat(codeStatus.getPlat()); auditStatus.setUserVersion(codeStatus.getUserVersion()); auditStatus.setVersionDesc(codeStatus.getVersionDesc()); auditStatus.setAuditid(auditid); @@ -867,6 +869,7 @@ public class WxWeappInfoController extends BaseController { releaseStatus.setTenantId(auditStatus.getTenantId()); releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setType(auditStatus.getType()); + releaseStatus.setPlat(auditStatus.getPlat()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } @@ -931,6 +934,7 @@ public class WxWeappInfoController extends BaseController { weappCodeStatusVo.setName(null); } } + weappCodeStatusVo.setPlat(EnumAppPlat.WX.getCode()); weappCodeStatusVo.setSortColumns(BaseEntity.SortField.CodeTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); return new ResultData(page); @@ -953,6 +957,7 @@ public class WxWeappInfoController extends BaseController { weappAuditStatusVo.setName(null); } } + weappAuditStatusVo.setPlat(EnumAppPlat.WX.getCode()); weappAuditStatusVo.setSortColumns(BaseEntity.SortField.AuditTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC, BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappAuditStatusService.listAsPage(weappAuditStatusVo, pageNum, pageSize); return new ResultData(page); @@ -975,6 +980,7 @@ public class WxWeappInfoController extends BaseController { weappReleaseStatusVo.setName(null); } } + weappReleaseStatusVo.setPlat(EnumAppPlat.WX.getCode()); weappReleaseStatusVo.setSortColumns(BaseEntity.SortField.ReleaseTime_DESC, BaseEntity.SortField.TenantId_ASC, BaseEntity.SortField.Type_ASC,BaseEntity.SortField.UserVersion_DESC); final PageInfo page = weappReleaseStatusService.listAsPage(weappReleaseStatusVo, pageNum, pageSize); return new ResultData(page); @@ -986,7 +992,7 @@ public class WxWeappInfoController extends BaseController { @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(type); + final List list = weappCodeStatusService.getVersionList(type,EnumAppPlat.WX.getCode()); return new ResultData(list); } @@ -997,7 +1003,7 @@ public class WxWeappInfoController extends BaseController { @ApiImplicitParam(name = "status", value = "审核状态", dataType = "int", paramType = "query")}) public ResultData getAuditVersionList(Integer type, Integer status) { logger.debug("[" + getIpAddr() + "] WxWeappInfoController::getAuditVersionList"); - final List list = weappAuditStatusService.getVersionList(type, status); + final List list = weappAuditStatusService.getVersionList(type,EnumAppPlat.WX.getCode(), status); return new ResultData(list); } @@ -1007,7 +1013,7 @@ public class WxWeappInfoController extends BaseController { @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(type); + final List list = weappReleaseStatusService.getVersionList(type,EnumAppPlat.WX.getCode()); return new ResultData(list); }