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 60132e37a..8504a6d15 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxWeappCodeStatus.java @@ -32,6 +32,8 @@ public class WxWeappCodeStatus implements Serializable { /**用户版本*/ @io.swagger.annotations.ApiModelProperty(value="用户版本",name="userVersion") private String userVersion; + @io.swagger.annotations.ApiModelProperty(value="用户版本描述",name="versionDesc") + private String versionDesc; /**code提交状态*/ @io.swagger.annotations.ApiModelProperty(value="code提交状态(0:成功, ...error code)",name="codeStatus") private Integer codeStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java new file mode 100644 index 000000000..c91d1df16 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappCodeStatusVo.java @@ -0,0 +1,14 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxWeappCodeStatus; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +public class WxWeappCodeStatusVo extends WxWeappCodeStatus { + + /**小程序名称*/ + @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") + private String name; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java index 4f337f8fa..61cf39271 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxWeappCodeStatusMapper.java @@ -2,12 +2,15 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxWeappCodeStatus; +import com.iformall.domain.vo.WxWeappCodeStatusVo; import java.util.List; public interface WxWeappCodeStatusMapper extends CommonMapper { List findList(WxWeappCodeStatus wxWeappCodeStatus); + + List findVoList(WxWeappCodeStatusVo weappCodeStatusVo); diff --git a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java index 25f61a655..9f67b2026 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxWeappCodeStatusService.java @@ -2,6 +2,9 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxWeappCodeStatus; +import com.iformall.domain.vo.WxWeappCodeStatusVo; + +import java.util.List; public interface WxWeappCodeStatusService { @@ -13,7 +16,15 @@ public interface WxWeappCodeStatusService { * @param pageSize * @return */ - PageInfo listAsPage(WxWeappCodeStatus record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxWeappCodeStatusVo record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询列表 + * + * @param record + * @return + */ + List getList(WxWeappCodeStatusVo record); /** * 根据Id获得实体 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 839ec2046..36bd92531 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -3,13 +3,17 @@ 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.vo.WxWeappCodeStatusVo; +import com.iformall.mapper.WxAuthorizerInfoMapper; import com.iformall.mapper.WxWeappCodeStatusMapper; import com.iformall.service.WxWeappCodeStatusService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; @Service public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @@ -17,10 +21,18 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @Autowired WxWeappCodeStatusMapper wxWeappCodeStatusMapper; + @Autowired + WxAuthorizerInfoMapper wxAuthorizerInfoMapper; + + + @Override + public PageInfo listAsPage(WxWeappCodeStatusVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxWeappCodeStatusMapper.findVoList(record)); + } @Override - public PageInfo listAsPage(WxWeappCodeStatus record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxWeappCodeStatusMapper.findList(record)); + public List getList(WxWeappCodeStatusVo record) { + return wxWeappCodeStatusMapper.findVoList(record); } @Override @@ -82,6 +94,14 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { updateRecord.setUpdateTime(curDate); updateRecord.setReleaseTime(curDate); wxWeappCodeStatusMapper.updateByPrimaryKeySelective(updateRecord); + // 更新 小程序 状态 + if(record.getReleaseStatus().equals(0)) { // 发布成功 + WxAuthorizerInfo updateInfo = new WxAuthorizerInfo(); + updateInfo.setCurrentVersion(record.getUserVersion()); + updateInfo.setCurrentDesc(record.getVersionDesc()); + updateInfo.setUpdateTime(curDate); + wxAuthorizerInfoMapper.updateByPrimaryKeySelective(updateInfo); + } } @Override diff --git a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml index 19da3b656..270c5c800 100644 --- a/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAuthorizerInfoMapper.xml @@ -103,7 +103,7 @@ and ai.`id` = #{id} - and ai.`name` like concat('%', #{name},'%') + and a.`name` like concat('%', #{name},'%') and ai.`authorizer_appid` = #{authorizerAppid} diff --git a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml index 64f4f466a..6974a5d8c 100644 --- a/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxWeappCodeStatusMapper.xml @@ -62,6 +62,76 @@ select from wx_weapp_code_status + + + + + + + + + + + + + + + + + + + + c.`id`,c.`app_id`,c.`type`,c.`user_version`,c.`code_status`,c.`code_time`,c.`audit_status`,c.`audit_time`,c.`release_status`,c.`release_time`,c.`create_time`,c.`update_time`, + a.`name` + + + + where 1 = 1 + + and c.`id` = #{id} + + + and c.`app_id` = #{appId} + + + and c.`type` = #{type} + + + and vc.`user_version` = #{userVersion} + + + and c.`code_status` = #{codeStatus} + + + and c.v`audit_status` = #{auditStatus} + + + and c.`release_status` = #{releaseStatus} + + + and c.`create_time` = #{createTime} + + + and c.`update_time` = #{updateTime} + + + and a.`name` like concat('%', #{name},'%') + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index a85664faf..ee0eb6314 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -13,6 +13,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxWeappCodeStatusVo; import com.iformall.domain.vo.WxWeappInfo; import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumAuditStatus; @@ -73,7 +74,7 @@ public class WxWeappInfoController extends BaseController { private WxTemplateMsgService templateMsgService; - @ApiOperation(value = "分页列表接口", notes = "查询支持小程序类型,名称,appid,version") + @ApiOperation(value = "小程序分页列表接口", notes = "查询支持小程序类型,名称,appid,version") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -87,7 +88,7 @@ public class WxWeappInfoController extends BaseController { return new ResultData(page); } - @ApiOperation("列表接口") + @ApiOperation("小程序列表接口") @GetMapping("allist") public ResultData getList(@ModelAttribute WxWeappInfo weappInfo) { logger.debug("[" + getIpAddr() + "] WxWeappController::list"); @@ -281,10 +282,12 @@ public class WxWeappInfoController extends BaseController { codeStatus = new WxWeappCodeStatus(); codeStatus.setAppId(appId); codeStatus.setUserVersion(userVersion); + codeStatus.setVersionDesc(userDesc); codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); weappCodeStatusService.saveOrUpdate(codeStatus); } else { codeStatus.setUserVersion(userVersion); + codeStatus.setVersionDesc(userDesc); codeStatus.setCodeStatus(Integer.valueOf(openRet.getErrcode())); weappCodeStatusService.updateCodeCommitStatus(codeStatus); } @@ -403,6 +406,31 @@ public class WxWeappInfoController extends BaseController { return new ResultData(); } + @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 WxWeappCodeStatusVo weappCodeStatusVo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusList"); + if (null == weappCodeStatusVo) weappCodeStatusVo = new WxWeappCodeStatusVo(); + weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); + final PageInfo page = weappCodeStatusService.listAsPage(weappCodeStatusVo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("小程序发布状态列表接口") + @GetMapping("releaseStatusAllList") + public ResultData getReleaseStatusList(@ModelAttribute WxWeappCodeStatusVo weappCodeStatusVo) { + logger.debug("[" + getIpAddr() + "] WxWeappController::releaseStatusAllList"); + if (null == weappCodeStatusVo) weappCodeStatusVo = new WxWeappCodeStatusVo(); + weappCodeStatusVo.setSortColumns(WxWeappCodeStatus.Field.UserVersion_DESC); + final List list = weappCodeStatusService.getList(weappCodeStatusVo); + return new ResultData(list); + } + + + /* * 0. 回调搭建好 * 1. wx_appinfo配置好