Skip to content

A
appApi
Commit b1e7d6cc by XiaHou
Options

云应用相关的业务代码

parent ff86f8c2
Showing with 1671 additions and 616 deletions
pom.xml
...@@ -248,6 +248,24 @@ ...@@ -248,6 +248,24 @@
<artifactId>weixin-java-pay</artifactId> <artifactId>weixin-java-pay</artifactId>
<version>3.5.0</version> <version>3.5.0</version>
</dependency> </dependency>
<!--苹果相关登录接口-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>jwks-rsa</artifactId>
<version>0.9.0</version>
</dependency>
<!-- 单元测试 -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies> </dependencies>
<repositories> <repositories>
......
src/main/java/com/hwstudio/antaile/InsertParam/InsertAppstoreOrderParam.java 0 → 100644
package com.hwstudio.antaile.InsertParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@Data
public class InsertAppstoreOrderParam implements Serializable {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "订单金额")
private BigDecimal orderMoney;
@ApiModelProperty(value = "0免费 1微信 2支付宝 3其他")
private Integer payType;
@ApiModelProperty(value = "应用编号")
private String appId;
}
src/main/java/com/hwstudio/antaile/InsertParam/InsertAtlAppAliossParam.java 0 → 100644
package com.hwstudio.antaile.InsertParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/12
* description:
*/
@Data
public class InsertAtlAppAliossParam implements Serializable {
@ApiModelProperty(value = "关联app应用订单Id")
private Long appOrderId;
@ApiModelProperty(value = "oss相关配置AccessKey")
private String accessKeyId;
@ApiModelProperty(value = "oss相关配置AccessKeySecret")
private String accessKeySecret;
@ApiModelProperty(value = "oss相关配置endpoint")
private String endpoint;
@ApiModelProperty(value = "oss相关配置bucket")
private String bucket;
@ApiModelProperty(value = "oss相关配置ossUrl")
private String ossUrl;
@ApiModelProperty(value = "本地服务器是否存储 0否 1是")
private Integer isSaveLocal;
@ApiModelProperty(value = "是否开启 0否 1是")
private Integer isOpen;
}
src/main/java/com/hwstudio/antaile/InsertParam/InsertAtlTimeMenuParam.java 0 → 100644
package com.hwstudio.antaile.InsertParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/13
* description:
*/
@Data
public class InsertAtlTimeMenuParam implements Serializable {
@ApiModelProperty(value = "时光纪id")
private Long timeId;
@ApiModelProperty(value = "菜单ids，多个根据逗号隔开")
private String menuIds;
}
src/main/java/com/hwstudio/antaile/controller/AtlAppAliossController.java 0 → 100644
package com.hwstudio.antaile.controller;
import com.hwstudio.antaile.InsertParam.InsertAtlAppAliossParam;
import com.hwstudio.antaile.mbg.po.AtlAppAlioss;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
import com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam;
import com.hwstudio.antaile.service.AtlAppAliossService;
import com.hwstudio.antaile.utils.JsonResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@CrossOrigin(value = "*", maxAge = 3600)
@RequestMapping(value = "/atlAppAlioss")
@RestController
@Api(tags = "atl应用相关接口")
public class AtlAppAliossController extends BaseController {
@Autowired
private AtlAppAliossService atlAppAliossService;
@ApiOperation("根据appOrderId 查询一条oss数据")
@RequestMapping(value = "/selectOneByAppOrderId", method = RequestMethod.GET)
public JsonResult<List<AtlAppAlioss>> selectOneByAppOrderId(@ApiParam(value = "关联app应用订单id", required = true) @RequestParam(value = "appOrderId", required = true) Long appOrderId, HttpServletRequest request) {
String token = request.getHeader("token");
if (token == null) {
return JsonResult.notLogin();
}
return JsonResult.success("查询成功", this.atlAppAliossService.selectOneByAppOrderId(appOrderId));
}
@ApiOperation("新增一条阿里云oss订单配置数据")
@RequestMapping(value = "/insertAtlAppAlioss", method = RequestMethod.POST)
public JsonResult<AtlAppstoreOrder> insertAtlAppAlioss(@ApiParam(value = "传入对象") @RequestBody InsertAtlAppAliossParam insertAtlAppAliossParam, HttpServletRequest request) {
String token = request.getHeader("token");
if (token == null) {
return JsonResult.notLogin();
}
return this.atlAppAliossService.insertAtlAppAlioss(insertAtlAppAliossParam);
}
@ApiOperation("根据id 修改配置数据")
@RequestMapping(value = "/updateByAtlAppAliossId", method = RequestMethod.POST)
public JsonResult updateByAtlAppAliossId(@ApiParam(value = "传入对象") @RequestBody AtlAppAlioss atlAppAlioss, HttpServletRequest request) {
String token = request.getHeader("token");
if (token == null) {
return JsonResult.notLogin();
}
return this.atlAppAliossService.updateByAtlAppAliossId(atlAppAlioss);
}
@ApiOperation("校验用户是使用自己的oss还是平台的")
@RequestMapping(value = "/checkUserOss", method = RequestMethod.GET)
public JsonResult checkUserOss(@ModelAttribute QueryAliossAndOrderParam queryAliossAndOrderParam) {
return this.atlAppAliossService.checkUserOss(queryAliossAndOrderParam);
}
}
src/main/java/com/hwstudio/antaile/controller/AtlAppstoreController.java 0 → 100644
package com.hwstudio.antaile.controller;
import com.hwstudio.antaile.dto.AtlAppstoreDTO;
import com.hwstudio.antaile.queryparam.QueryAppstoreIsBuyParam;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreParam;
import com.hwstudio.antaile.service.AtlAppStoreService;
import com.hwstudio.antaile.utils.JsonResult;
import com.hwstudio.antaile.utils.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@CrossOrigin(value = "*", maxAge = 3600)
@RequestMapping(value = "/atlAppstore")
@RestController
@Api(tags = "atl应用相关接口")
public class AtlAppstoreController extends BaseController {
@Autowired
private AtlAppStoreService atlAppStoreService;
@ApiOperation("根据传入参数查询 应用List，不传分页参数不分页")
@RequestMapping(value = "/selectAtlAppstoreListByOther", method = RequestMethod.GET)
public JsonResult<List<AtlAppstoreDTO>> selectAtlAppstoreListByOther(@ModelAttribute QueryAtlAppstoreParam queryAtlAppstoreParam, @ModelAttribute Page page) {
return JsonResult.success("查询成功", this.atlAppStoreService.selectAtlAppstoreListByOther(queryAtlAppstoreParam, page));
}
@ApiOperation("查询appIds(多个appid逗号隔开) 与 userId是否购买过")
@RequestMapping(value = "/checkAppIsbuy", method = RequestMethod.GET)
public JsonResult checkAppIsbuy(@ModelAttribute QueryAppstoreIsBuyParam queryAppstoreIsBuyParam) {
return this.atlAppStoreService.checkAppIsbuy(queryAppstoreIsBuyParam);
}
}
src/main/java/com/hwstudio/antaile/controller/AtlAppstoreOrderController.java 0 → 100644
package com.hwstudio.antaile.controller;
import com.hwstudio.antaile.InsertParam.InsertAppstoreOrderParam;
import com.hwstudio.antaile.dto.AtlAppstoreDTO;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreOrderParam;
import com.hwstudio.antaile.service.AtlAppStoreOrderService;
import com.hwstudio.antaile.utils.JsonResult;
import com.hwstudio.antaile.utils.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@CrossOrigin(value = "*", maxAge = 3600)
@RequestMapping(value = "/atlAppstoreOrder")
@RestController
@Api(tags = "atl应用商店订单相关接口")
public class AtlAppstoreOrderController extends BaseController {
@Autowired
private AtlAppStoreOrderService atlAppStoreOrderService;
@ApiOperation("根据订单id 修改订单相关数据")
@RequestMapping(value = "/updateAppstoreOrderById", method = RequestMethod.POST)
public JsonResult updateAppstoreOrderById(@ApiParam(value = "传入对象") @RequestBody AtlAppstoreOrder atlAppstoreOrder,HttpServletRequest request) {
String token = request.getHeader("token");
if(token == null){
return JsonResult.notLogin();
}
return this.atlAppStoreOrderService.updateAppstoreOrderById(atlAppstoreOrder);
}
@ApiOperation("生成订单")
@RequestMapping(value = "/generateAppstoreOrder", method = RequestMethod.POST)
public JsonResult<AtlAppstoreOrder> generateAppstoreOrder(@ApiParam(value = "传入对象") @RequestBody InsertAppstoreOrderParam insertAppstoreOrderParam,HttpServletRequest request) {
String token = request.getHeader("token");
if(token == null){
return JsonResult.notLogin();
}
return this.atlAppStoreOrderService.generateAppstoreOrder(insertAppstoreOrderParam);
}
@ApiOperation("用户查询我的订单数据，不传分页参数不分页")
@RequestMapping(value = "/selectAtlAppstoreOrderList", method = RequestMethod.GET)
public JsonResult<List<AtlAppstoreDTO>> selectAtlAppstoreOrderList(@ModelAttribute QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam, @ModelAttribute Page page,HttpServletRequest request) {
String token = request.getHeader("token");
if(token == null){
return JsonResult.notLogin();
}
return JsonResult.success("查询成功", this.atlAppStoreOrderService.selectAtlAppstoreOrderList(queryAtlAppstoreOrderParam, page));
}
@ApiOperation("根据参数（可以只查菜单）查询我的应用 ，不传分页参数不分页")
@RequestMapping(value = "/selectMyAtlAppstore", method = RequestMethod.GET)
public JsonResult<List<AtlAppstoreDTO>> selectMyAtlAppstore(@ModelAttribute QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam, @ModelAttribute Page page,HttpServletRequest request) {
String token = request.getHeader("token");
if(token == null){
return JsonResult.notLogin();
}
return JsonResult.success("查询成功", this.atlAppStoreOrderService.selectMyAtlAppstore(queryAtlAppstoreOrderParam, page));
}
}
src/main/java/com/hwstudio/antaile/controller/AtlTimeMenuController.java 0 → 100644
package com.hwstudio.antaile.controller;
import com.hwstudio.antaile.InsertParam.InsertAtlAppAliossParam;
import com.hwstudio.antaile.InsertParam.InsertAtlTimeMenuParam;
import com.hwstudio.antaile.mbg.po.AtlAppAlioss;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
import com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam;
import com.hwstudio.antaile.queryparam.QueryAtlTimeMenuParam;
import com.hwstudio.antaile.service.AtlAppAliossService;
import com.hwstudio.antaile.service.AtlTimeMenuService;
import com.hwstudio.antaile.utils.JsonResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@CrossOrigin(value = "*", maxAge = 3600)
@RequestMapping(value = "/atlTimeMenu")
@RestController
@Api(tags = "atl时光纪菜单相关接口")
public class AtlTimeMenuController extends BaseController {
@Autowired
private AtlTimeMenuService atlTimeMenuService;
@ApiOperation("插入时光纪与菜单关系")
@RequestMapping(value = "/insertAtlTimeMenu", method = RequestMethod.POST)
public JsonResult insertAtlTimeMenu(@ApiParam(value = "传入对象") @RequestBody InsertAtlTimeMenuParam insertAtlTimeMenuParam, HttpServletRequest request) {
String token = request.getHeader("token");
if (token == null) {
return JsonResult.notLogin();
}
return this.atlTimeMenuService.insertAtlTimeMenu(insertAtlTimeMenuParam);
}
@ApiOperation("查询时光纪相关菜单")
@RequestMapping(value = "/selectTimeMenu", method = RequestMethod.GET)
public JsonResult selectTimeMenu(@ModelAttribute QueryAtlTimeMenuParam queryAtlTimeMenuParam) {
return this.atlTimeMenuService.selectTimeMenu(queryAtlTimeMenuParam);
}
}
src/main/java/com/hwstudio/antaile/dto/AtlAppAliossDTO.java 0 → 100644
package com.hwstudio.antaile.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author xh
* @Date 2021/7/12
* description:
*/
@Data
public class AtlAppAliossDTO implements Serializable {
@ApiModelProperty(value = "id")
private Long id;
@ApiModelProperty(value = "关联app应用订单id")
private Long appOrderId;
@ApiModelProperty(value = "oss相关配置AccessKey")
private String accessKeyId;
@ApiModelProperty(value = "oss相关配置AccessKeySecret")
private String accessKeySecret;
@ApiModelProperty(value = "oss相关配置endpoint")
private String endpoint;
@ApiModelProperty(value = "oss相关配置bucket")
private String bucket;
@ApiModelProperty(value = "oss相关配置ossUrl")
private String ossUrl;
@ApiModelProperty(value = "本地服务器是否存储 0否 1是")
private Integer isSaveLocal;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "是否安装(0是|1否)")
private Integer isInstall;
@ApiModelProperty(value = "是否开启(0是|1否)")
private Integer isOpen;
}
src/main/java/com/hwstudio/antaile/dto/AtlAppstoreDTO.java 0 → 100644
package com.hwstudio.antaile.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author xh
* @Date 2021/7/8
* description:
*/
@Data
public class AtlAppstoreDTO implements Serializable {
@ApiModelProperty(value = "应用商店id")
private Long id;
@ApiModelProperty(value = "应用分类id")
private Long catsId;
@ApiModelProperty(value = "应用图片")
private String appImages;
@ApiModelProperty(value = "应用编号")
private String appId;
@ApiModelProperty(value = "应用名称")
private String appName;
@ApiModelProperty(value = "开发者")
private String appDeveloper;
@ApiModelProperty(value = "销量")
private Long saleNum;
@ApiModelProperty(value = "菜单名称")
private String menuName;
@ApiModelProperty(value = "菜单链接")
private String menuUrl;
@ApiModelProperty(value = "菜单其他链接")
private String menuOtherUrl;
@ApiModelProperty(value = "菜单设置链接")
private String menuSetUrl;
@ApiModelProperty(value = "原价")
private BigDecimal appPrice1;
@ApiModelProperty(value = "现售价")
private BigDecimal app_price2;
@ApiModelProperty(value = "是否上架(0是|1否)")
private Integer isSale;
@ApiModelProperty(value = "是否推荐(0是|1否)")
private Integer isRecom;
@ApiModelProperty(value = "是否菜单(0是|1否)")
private Integer isMenu;
@ApiModelProperty(value = "关联菜单id")
private Long menuId;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "应用商店分类名称")
private String catsName;
}
src/main/java/com/hwstudio/antaile/dto/AtlAppstoreOrderDTO.java 0 → 100644
package com.hwstudio.antaile.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@Data
public class AtlAppstoreOrderDTO implements Serializable {
@ApiModelProperty(value = "应用商店订单id")
private Long id;
@ApiModelProperty(value = "订单编号")
private String orderId;
@ApiModelProperty(value = "支付类型 0免费 1微信 2支付宝 3其他")
private Integer payType;
@ApiModelProperty(value = "是否支付(0是|1否)")
private Integer isPay;
@ApiModelProperty(value = "关联appid")
private String appId;
@ApiModelProperty(value = "是否安装(0是|1否)")
private Integer isInstall;
@ApiModelProperty(value = "是否开启(0是|1否)")
private Integer isOpen;
@ApiModelProperty(value = "支付时间")
private Date payTime;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "应用名称")
private String appName;
@ApiModelProperty(value = "开发者")
private String appDeveloper;
@ApiModelProperty(value = "应用分类名称")
private String catsName;
@ApiModelProperty(value = "应用相关图片集，多个根据英文逗号分开")
private String appImages;
@ApiModelProperty(value = "应用介绍")
private String appIntroduce;
@ApiModelProperty(value = "购买数量")
private Long buyNumber;
@ApiModelProperty(value = "是否菜单(0是|1否)")
private Integer isMenu;
@ApiModelProperty(value = "菜单id")
private Long menuId;
@ApiModelProperty(value = "菜单名称")
private String menuName;
}
src/main/java/com/hwstudio/antaile/dto/AtlTimeMenuDTO.java 0 → 100644
package com.hwstudio.antaile.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/13
* description:
*/
@Data
public class AtlTimeMenuDTO implements Serializable {
}
src/main/java/com/hwstudio/antaile/dto/OfficialWebsiteAtlTimeParam.java
...@@ -16,6 +16,10 @@ public class OfficialWebsiteAtlTimeParam implements Serializable { ...@@ -16,6 +16,10 @@ public class OfficialWebsiteAtlTimeParam implements Serializable {
@ApiModelProperty(value = "是否首页推荐 0-否 1-是") @ApiModelProperty(value = "是否首页推荐 0-否 1-是")
private Integer isCommend; private Integer isCommend;
@ApiModelProperty(value = "是否发现页推荐 0-否 1-是")
private Integer isFindCommend;
@ApiModelProperty(value = "是否过世 0 过世 1 在世")
private Integer livingState;
@ApiModelProperty(value = "分页对象,不传递不分页") @ApiModelProperty(value = "分页对象,不传递不分页")
private Page page; private Page page;
} }
src/main/java/com/hwstudio/antaile/mapper/AtlAppAliossDao.java 0 → 100644
package com.hwstudio.antaile.mapper;
import com.hwstudio.antaile.dto.AtlAppAliossDTO;
import com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam;
/**
* @Author xh
* @Date 2021/7/12
* description:
*/
public interface AtlAppAliossDao {
/**
* 根据所需条件查询 oss配置数据
*
* @param queryAliossAndOrderParam
* @return
*/
AtlAppAliossDTO selectAtlAppAliossByOther(QueryAliossAndOrderParam queryAliossAndOrderParam);
}
src/main/java/com/hwstudio/antaile/mapper/AtlAppstoreDao.java 0 → 100644
package com.hwstudio.antaile.mapper;
import com.hwstudio.antaile.dto.AtlAppstoreDTO;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreParam;
import java.util.List;
public interface AtlAppstoreDao {
/**
* 根据其他参数查询应用商店list
*
* @param queryAtlAppstoreParam
* @return
*/
List<AtlAppstoreDTO> selectAtlAppstoreListByOther(QueryAtlAppstoreParam queryAtlAppstoreParam);
}
\ No newline at end of file
src/main/java/com/hwstudio/antaile/mapper/AtlAppstoreOrderDao.java 0 → 100644
package com.hwstudio.antaile.mapper;
import com.hwstudio.antaile.dto.AtlAppstoreOrderDTO;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreOrderParam;
import java.util.List;
public interface AtlAppstoreOrderDao {
/**
* 根据其他参数查询应用应用订单数据
*
* @param queryAtlAppstoreOrderParam
* @return
*/
List<AtlAppstoreOrderDTO> selectAtlAppstoreOrderList(QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam);
/**
* 查询我的应用 根据appid分组 并且已支付的订单
*
* @param queryAtlAppstoreOrderParam
* @return
*/
List<AtlAppstoreOrderDTO> selectMyAtlAppstore(QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam);
}
\ No newline at end of file
src/main/java/com/hwstudio/antaile/mapper/AtlTimeMenuDao.java 0 → 100644
package com.hwstudio.antaile.mapper;
/**
* @Author xh
* @Date 2021/7/13
* description:
*/
public interface AtlTimeMenuDao {
}
src/main/java/com/hwstudio/antaile/mbg/po/AtlAppAlioss.java
...@@ -16,8 +16,8 @@ public class AtlAppAlioss implements Serializable { ...@@ -16,8 +16,8 @@ public class AtlAppAlioss implements Serializable {
@ApiModelProperty(value = "关联应用分类表id") @ApiModelProperty(value = "关联应用分类表id")
private Long catsId; private Long catsId;
@ApiModelProperty(value = "关联时光纪id") @ApiModelProperty(value = "关联app应用订单Id")
private Long timeId; private Long appOrderId;
@ApiModelProperty(value = "oss相关配置AccessKey") @ApiModelProperty(value = "oss相关配置AccessKey")
private String accessKeyId; private String accessKeyId;
...@@ -37,9 +37,6 @@ public class AtlAppAlioss implements Serializable { ...@@ -37,9 +37,6 @@ public class AtlAppAlioss implements Serializable {
@ApiModelProperty(value = "本地服务器是否存储 0否 1是") @ApiModelProperty(value = "本地服务器是否存储 0否 1是")
private Integer isSaveLocal; private Integer isSaveLocal;
@ApiModelProperty(value = "是否开启 0否 1是")
private Integer isOpen;
@ApiModelProperty(value = "删除标志(0|正常|1删除)") @ApiModelProperty(value = "删除标志(0|正常|1删除)")
private Integer isDelete; private Integer isDelete;
...@@ -72,12 +69,12 @@ public class AtlAppAlioss implements Serializable { ...@@ -72,12 +69,12 @@ public class AtlAppAlioss implements Serializable {
this.catsId = catsId; this.catsId = catsId;
} }
public Long getTimeId() { public Long getAppOrderId() {
return timeId; return appOrderId;
} }
public void setTimeId(Long timeId) { public void setAppOrderId(Long appOrderId) {
this.timeId = timeId; this.appOrderId = appOrderId;
} }
public String getAccessKeyId() { public String getAccessKeyId() {
...@@ -128,14 +125,6 @@ public class AtlAppAlioss implements Serializable { ...@@ -128,14 +125,6 @@ public class AtlAppAlioss implements Serializable {
this.isSaveLocal = isSaveLocal; this.isSaveLocal = isSaveLocal;
} }
public Integer getIsOpen() {
return isOpen;
}
public void setIsOpen(Integer isOpen) {
this.isOpen = isOpen;
}
public Integer getIsDelete() { public Integer getIsDelete() {
return isDelete; return isDelete;
} }
...@@ -176,14 +165,13 @@ public class AtlAppAlioss implements Serializable { ...@@ -176,14 +165,13 @@ public class AtlAppAlioss implements Serializable {
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", catsId=").append(catsId); sb.append(", catsId=").append(catsId);
sb.append(", timeId=").append(timeId); sb.append(", appOrderId=").append(appOrderId);
sb.append(", accessKeyId=").append(accessKeyId); sb.append(", accessKeyId=").append(accessKeyId);
sb.append(", accessKeySecret=").append(accessKeySecret); sb.append(", accessKeySecret=").append(accessKeySecret);
sb.append(", endpoint=").append(endpoint); sb.append(", endpoint=").append(endpoint);
sb.append(", bucket=").append(bucket); sb.append(", bucket=").append(bucket);
sb.append(", ossUrl=").append(ossUrl); sb.append(", ossUrl=").append(ossUrl);
sb.append(", isSaveLocal=").append(isSaveLocal); sb.append(", isSaveLocal=").append(isSaveLocal);
sb.append(", isOpen=").append(isOpen);
sb.append(", isDelete=").append(isDelete); sb.append(", isDelete=").append(isDelete);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
......
src/main/java/com/hwstudio/antaile/mbg/po/AtlAppAliossExample.java
...@@ -225,63 +225,63 @@ public class AtlAppAliossExample { ...@@ -225,63 +225,63 @@ public class AtlAppAliossExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdIsNull() { public Criteria andAppOrderIdIsNull() {
addCriterion("time_id is null"); addCriterion("app_order_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdIsNotNull() { public Criteria andAppOrderIdIsNotNull() {
addCriterion("time_id is not null"); addCriterion("app_order_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdEqualTo(Long value) { public Criteria andAppOrderIdEqualTo(Long value) {
addCriterion("time_id =", value, "timeId"); addCriterion("app_order_id =", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdNotEqualTo(Long value) { public Criteria andAppOrderIdNotEqualTo(Long value) {
addCriterion("time_id <>", value, "timeId"); addCriterion("app_order_id <>", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdGreaterThan(Long value) { public Criteria andAppOrderIdGreaterThan(Long value) {
addCriterion("time_id >", value, "timeId"); addCriterion("app_order_id >", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdGreaterThanOrEqualTo(Long value) { public Criteria andAppOrderIdGreaterThanOrEqualTo(Long value) {
addCriterion("time_id >=", value, "timeId"); addCriterion("app_order_id >=", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdLessThan(Long value) { public Criteria andAppOrderIdLessThan(Long value) {
addCriterion("time_id <", value, "timeId"); addCriterion("app_order_id <", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdLessThanOrEqualTo(Long value) { public Criteria andAppOrderIdLessThanOrEqualTo(Long value) {
addCriterion("time_id <=", value, "timeId"); addCriterion("app_order_id <=", value, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdIn(List<Long> values) { public Criteria andAppOrderIdIn(List<Long> values) {
addCriterion("time_id in", values, "timeId"); addCriterion("app_order_id in", values, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdNotIn(List<Long> values) { public Criteria andAppOrderIdNotIn(List<Long> values) {
addCriterion("time_id not in", values, "timeId"); addCriterion("app_order_id not in", values, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdBetween(Long value1, Long value2) { public Criteria andAppOrderIdBetween(Long value1, Long value2) {
addCriterion("time_id between", value1, value2, "timeId"); addCriterion("app_order_id between", value1, value2, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTimeIdNotBetween(Long value1, Long value2) { public Criteria andAppOrderIdNotBetween(Long value1, Long value2) {
addCriterion("time_id not between", value1, value2, "timeId"); addCriterion("app_order_id not between", value1, value2, "appOrderId");
return (Criteria) this; return (Criteria) this;
} }
...@@ -695,66 +695,6 @@ public class AtlAppAliossExample { ...@@ -695,66 +695,6 @@ public class AtlAppAliossExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsOpenIsNull() {
addCriterion("is_open is null");
return (Criteria) this;
}
public Criteria andIsOpenIsNotNull() {
addCriterion("is_open is not null");
return (Criteria) this;
}
public Criteria andIsOpenEqualTo(Integer value) {
addCriterion("is_open =", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenNotEqualTo(Integer value) {
addCriterion("is_open <>", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenGreaterThan(Integer value) {
addCriterion("is_open >", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenGreaterThanOrEqualTo(Integer value) {
addCriterion("is_open >=", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenLessThan(Integer value) {
addCriterion("is_open <", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenLessThanOrEqualTo(Integer value) {
addCriterion("is_open <=", value, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenIn(List<Integer> values) {
addCriterion("is_open in", values, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenNotIn(List<Integer> values) {
addCriterion("is_open not in", values, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenBetween(Integer value1, Integer value2) {
addCriterion("is_open between", value1, value2, "isOpen");
return (Criteria) this;
}
public Criteria andIsOpenNotBetween(Integer value1, Integer value2) {
addCriterion("is_open not between", value1, value2, "isOpen");
return (Criteria) this;
}
public Criteria andIsDeleteIsNull() { public Criteria andIsDeleteIsNull() {
addCriterion("is_delete is null"); addCriterion("is_delete is null");
return (Criteria) this; return (Criteria) this;
......
src/main/java/com/hwstudio/antaile/mbg/po/AtlAppstore.java
...@@ -29,18 +29,6 @@ public class AtlAppstore implements Serializable { ...@@ -29,18 +29,6 @@ public class AtlAppstore implements Serializable {
@ApiModelProperty(value = "开发者") @ApiModelProperty(value = "开发者")
private String appDeveloper; private String appDeveloper;
@ApiModelProperty(value = "菜单名")
private String menuName;
@ApiModelProperty(value = "菜单链接")
private String menuUrl;
@ApiModelProperty(value = "菜单其他链接")
private String menuOtherUrl;
@ApiModelProperty(value = "菜单设置链接")
private String menuSetUrl;
@ApiModelProperty(value = "原价") @ApiModelProperty(value = "原价")
private BigDecimal appPrice1; private BigDecimal appPrice1;
...@@ -59,8 +47,8 @@ public class AtlAppstore implements Serializable { ...@@ -59,8 +47,8 @@ public class AtlAppstore implements Serializable {
@ApiModelProperty(value = "是否菜单(0是|1否)") @ApiModelProperty(value = "是否菜单(0是|1否)")
private Integer isMenu; private Integer isMenu;
@ApiModelProperty(value = "是否默认菜单(0是|1否)") @ApiModelProperty(value = "关联菜单id")
private Integer defaultMenu; private Long menuId;
@ApiModelProperty(value = "删除标志(0|正常|1删除)") @ApiModelProperty(value = "删除标志(0|正常|1删除)")
private Integer isDelete; private Integer isDelete;
...@@ -129,38 +117,6 @@ public class AtlAppstore implements Serializable { ...@@ -129,38 +117,6 @@ public class AtlAppstore implements Serializable {
this.appDeveloper = appDeveloper; this.appDeveloper = appDeveloper;
} }
public String getMenuName() {
return menuName;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public String getMenuUrl() {
return menuUrl;
}
public void setMenuUrl(String menuUrl) {
this.menuUrl = menuUrl;
}
public String getMenuOtherUrl() {
return menuOtherUrl;
}
public void setMenuOtherUrl(String menuOtherUrl) {
this.menuOtherUrl = menuOtherUrl;
}
public String getMenuSetUrl() {
return menuSetUrl;
}
public void setMenuSetUrl(String menuSetUrl) {
this.menuSetUrl = menuSetUrl;
}
public BigDecimal getAppPrice1() { public BigDecimal getAppPrice1() {
return appPrice1; return appPrice1;
} }
...@@ -209,12 +165,12 @@ public class AtlAppstore implements Serializable { ...@@ -209,12 +165,12 @@ public class AtlAppstore implements Serializable {
this.isMenu = isMenu; this.isMenu = isMenu;
} }
public Integer getDefaultMenu() { public Long getMenuId() {
return defaultMenu; return menuId;
} }
public void setDefaultMenu(Integer defaultMenu) { public void setMenuId(Long menuId) {
this.defaultMenu = defaultMenu; this.menuId = menuId;
} }
public Integer getIsDelete() { public Integer getIsDelete() {
...@@ -269,17 +225,13 @@ public class AtlAppstore implements Serializable { ...@@ -269,17 +225,13 @@ public class AtlAppstore implements Serializable {
sb.append(", appName=").append(appName); sb.append(", appName=").append(appName);
sb.append(", appIntroduce=").append(appIntroduce); sb.append(", appIntroduce=").append(appIntroduce);
sb.append(", appDeveloper=").append(appDeveloper); sb.append(", appDeveloper=").append(appDeveloper);
sb.append(", menuName=").append(menuName);
sb.append(", menuUrl=").append(menuUrl);
sb.append(", menuOtherUrl=").append(menuOtherUrl);
sb.append(", menuSetUrl=").append(menuSetUrl);
sb.append(", appPrice1=").append(appPrice1); sb.append(", appPrice1=").append(appPrice1);
sb.append(", appPrice2=").append(appPrice2); sb.append(", appPrice2=").append(appPrice2);
sb.append(", saleNum=").append(saleNum); sb.append(", saleNum=").append(saleNum);
sb.append(", isSale=").append(isSale); sb.append(", isSale=").append(isSale);
sb.append(", isRecom=").append(isRecom); sb.append(", isRecom=").append(isRecom);
sb.append(", isMenu=").append(isMenu); sb.append(", isMenu=").append(isMenu);
sb.append(", defaultMenu=").append(defaultMenu); sb.append(", menuId=").append(menuId);
sb.append(", isDelete=").append(isDelete); sb.append(", isDelete=").append(isDelete);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
......
src/main/java/com/hwstudio/antaile/mbg/po/AtlAppstoreCats.java
...@@ -13,7 +13,7 @@ public class AtlAppstoreCats implements Serializable { ...@@ -13,7 +13,7 @@ public class AtlAppstoreCats implements Serializable {
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
private Long id; private Long id;
@ApiModelProperty(value = "所属模块 0 app板块 1时光纪 2自传书") @ApiModelProperty(value = "所属模块 1时光纪 2自传书")
private Integer module; private Integer module;
@ApiModelProperty(value = "应用商店分类名称") @ApiModelProperty(value = "应用商店分类名称")
......
src/main/java/com/hwstudio/antaile/mbg/po/AtlAppstoreOrder.java
...@@ -2,6 +2,7 @@ package com.hwstudio.antaile.mbg.po; ...@@ -2,6 +2,7 @@ package com.hwstudio.antaile.mbg.po;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import javax.persistence.*; import javax.persistence.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -14,47 +15,42 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -14,47 +15,42 @@ public class AtlAppstoreOrder implements Serializable {
private Long id; private Long id;
@ApiModelProperty(value = "用户id") @ApiModelProperty(value = "用户id")
private Long timeId; private Long userId;
@ApiModelProperty(value = "菜单名称") @ApiModelProperty(value = "订单编号")
private String menuName; private String orderId;
@ApiModelProperty(value = "菜单入口url") @ApiModelProperty(value = "订单金额")
private String menuUrl; private BigDecimal orderMoney;
@ApiModelProperty(value = "菜单外部url") @ApiModelProperty(value = "支付类型 0免费 1微信 2支付宝 3其他")
private String menuOtherUrl; private Integer payType;
@ApiModelProperty(value = "菜单类型: 0展示端") @ApiModelProperty(value = "是否支付(0是|1否)")
private Integer menuType; private Integer isPay;
@ApiModelProperty(value = "是否显示 0隐藏 1显示") @ApiModelProperty(value = "状态")
private Integer isShow; private Integer orderStatus;
@ApiModelProperty(value = "是否打开 0是 1否") @ApiModelProperty(value = "关联appid")
private Integer isOpen; private String appId;
@ApiModelProperty(value = "是否安装(0是|1否)") @ApiModelProperty(value = "是否安装(0是|1否)")
private Integer isInstall; private Integer isInstall;
@ApiModelProperty(value = "菜单排序：1最大 9999最小 顺序") @ApiModelProperty(value = "是否开启(0是|1否)")
private Integer menuSort; private Integer isOpen;
@ApiModelProperty(value = "数据标识 0无效 1有效")
private Integer dataFlag;
@ApiModelProperty(value = "菜单所属应用")
private Long appId;
@ApiModelProperty(value = "删除标志(0|正常|1删除)") @ApiModelProperty(value = "删除标志(0|正常|1删除)")
private Integer isDelete; private Integer isDelete;
@ApiModelProperty(value = "菜单备用字段")
private String menuMark;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "支付时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
...@@ -73,60 +69,60 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -73,60 +69,60 @@ public class AtlAppstoreOrder implements Serializable {
this.id = id; this.id = id;
} }
public Long getTimeId() { public Long getUserId() {
return timeId; return userId;
} }
public void setTimeId(Long timeId) { public void setUserId(Long userId) {
this.timeId = timeId; this.userId = userId;
} }
public String getMenuName() { public String getOrderId() {
return menuName; return orderId;
} }
public void setMenuName(String menuName) { public void setOrderId(String orderId) {
this.menuName = menuName; this.orderId = orderId;
} }
public String getMenuUrl() { public BigDecimal getOrderMoney() {
return menuUrl; return orderMoney;
} }
public void setMenuUrl(String menuUrl) { public void setOrderMoney(BigDecimal orderMoney) {
this.menuUrl = menuUrl; this.orderMoney = orderMoney;
} }
public String getMenuOtherUrl() { public Integer getPayType() {
return menuOtherUrl; return payType;
} }
public void setMenuOtherUrl(String menuOtherUrl) { public void setPayType(Integer payType) {
this.menuOtherUrl = menuOtherUrl; this.payType = payType;
} }
public Integer getMenuType() { public Integer getIsPay() {
return menuType; return isPay;
} }
public void setMenuType(Integer menuType) { public void setIsPay(Integer isPay) {
this.menuType = menuType; this.isPay = isPay;
} }
public Integer getIsShow() { public Integer getOrderStatus() {
return isShow; return orderStatus;
} }
public void setIsShow(Integer isShow) { public void setOrderStatus(Integer orderStatus) {
this.isShow = isShow; this.orderStatus = orderStatus;
} }
public Integer getIsOpen() { public String getAppId() {
return isOpen; return appId;
} }
public void setIsOpen(Integer isOpen) { public void setAppId(String appId) {
this.isOpen = isOpen; this.appId = appId;
} }
public Integer getIsInstall() { public Integer getIsInstall() {
...@@ -137,28 +133,12 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -137,28 +133,12 @@ public class AtlAppstoreOrder implements Serializable {
this.isInstall = isInstall; this.isInstall = isInstall;
} }
public Integer getMenuSort() { public Integer getIsOpen() {
return menuSort; return isOpen;
}
public void setMenuSort(Integer menuSort) {
this.menuSort = menuSort;
}
public Integer getDataFlag() {
return dataFlag;
}
public void setDataFlag(Integer dataFlag) {
this.dataFlag = dataFlag;
}
public Long getAppId() {
return appId;
} }
public void setAppId(Long appId) { public void setIsOpen(Integer isOpen) {
this.appId = appId; this.isOpen = isOpen;
} }
public Integer getIsDelete() { public Integer getIsDelete() {
...@@ -169,14 +149,6 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -169,14 +149,6 @@ public class AtlAppstoreOrder implements Serializable {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public String getMenuMark() {
return menuMark;
}
public void setMenuMark(String menuMark) {
this.menuMark = menuMark;
}
public String getRemark() { public String getRemark() {
return remark; return remark;
} }
...@@ -185,6 +157,14 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -185,6 +157,14 @@ public class AtlAppstoreOrder implements Serializable {
this.remark = remark; this.remark = remark;
} }
public Date getPayTime() {
return payTime;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
...@@ -208,20 +188,18 @@ public class AtlAppstoreOrder implements Serializable { ...@@ -208,20 +188,18 @@ public class AtlAppstoreOrder implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", timeId=").append(timeId); sb.append(", userId=").append(userId);
sb.append(", menuName=").append(menuName); sb.append(", orderId=").append(orderId);
sb.append(", menuUrl=").append(menuUrl); sb.append(", orderMoney=").append(orderMoney);
sb.append(", menuOtherUrl=").append(menuOtherUrl); sb.append(", payType=").append(payType);
sb.append(", menuType=").append(menuType); sb.append(", isPay=").append(isPay);
sb.append(", isShow=").append(isShow); sb.append(", orderStatus=").append(orderStatus);
sb.append(", isOpen=").append(isOpen);
sb.append(", isInstall=").append(isInstall);
sb.append(", menuSort=").append(menuSort);
sb.append(", dataFlag=").append(dataFlag);
sb.append(", appId=").append(appId); sb.append(", appId=").append(appId);
sb.append(", isInstall=").append(isInstall);
sb.append(", isOpen=").append(isOpen);
sb.append(", isDelete=").append(isDelete); sb.append(", isDelete=").append(isDelete);
sb.append(", menuMark=").append(menuMark);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", payTime=").append(payTime);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", serialVersionUID=").append(serialVersionUID); sb.append(", serialVersionUID=").append(serialVersionUID);
......
src/main/java/com/hwstudio/antaile/mbg/po/AtlTimeMenu.java
...@@ -13,44 +13,11 @@ public class AtlTimeMenu implements Serializable { ...@@ -13,44 +13,11 @@ public class AtlTimeMenu implements Serializable {
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
private Long id; private Long id;
@ApiModelProperty(value = "用户id") @ApiModelProperty(value = "时光纪id")
private Long timeId; private Long timeId;
@ApiModelProperty(value = "菜单名称") @ApiModelProperty(value = "关联菜单id")
private String menuName; private Long menuId;
@ApiModelProperty(value = "菜单入口url")
private String menuUrl;
@ApiModelProperty(value = "菜单外部url")
private String menuOtherUrl;
@ApiModelProperty(value = "菜单类型: 0展示端")
private Integer menuType;
@ApiModelProperty(value = "是否显示 0隐藏 1显示")
private Integer isShow;
@ApiModelProperty(value = "是否打开 0是 1否")
private Integer isOpen;
@ApiModelProperty(value = "是否安装(0是|1否)")
private Integer isInstall;
@ApiModelProperty(value = "菜单排序：1最大 9999最小 顺序")
private Integer menuSort;
@ApiModelProperty(value = "数据标识 0无效 1有效")
private Integer dataFlag;
@ApiModelProperty(value = "菜单所属应用")
private Long appId;
@ApiModelProperty(value = "删除标志(0|正常|1删除)")
private Integer isDelete;
@ApiModelProperty(value = "菜单备用字段")
private String menuMark;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
...@@ -81,100 +48,12 @@ public class AtlTimeMenu implements Serializable { ...@@ -81,100 +48,12 @@ public class AtlTimeMenu implements Serializable {
this.timeId = timeId; this.timeId = timeId;
} }
public String getMenuName() { public Long getMenuId() {
return menuName; return menuId;
}
public void setMenuName(String menuName) {
this.menuName = menuName;
}
public String getMenuUrl() {
return menuUrl;
}
public void setMenuUrl(String menuUrl) {
this.menuUrl = menuUrl;
}
public String getMenuOtherUrl() {
return menuOtherUrl;
}
public void setMenuOtherUrl(String menuOtherUrl) {
this.menuOtherUrl = menuOtherUrl;
}
public Integer getMenuType() {
return menuType;
}
public void setMenuType(Integer menuType) {
this.menuType = menuType;
}
public Integer getIsShow() {
return isShow;
}
public void setIsShow(Integer isShow) {
this.isShow = isShow;
}
public Integer getIsOpen() {
return isOpen;
}
public void setIsOpen(Integer isOpen) {
this.isOpen = isOpen;
}
public Integer getIsInstall() {
return isInstall;
}
public void setIsInstall(Integer isInstall) {
this.isInstall = isInstall;
}
public Integer getMenuSort() {
return menuSort;
}
public void setMenuSort(Integer menuSort) {
this.menuSort = menuSort;
}
public Integer getDataFlag() {
return dataFlag;
}
public void setDataFlag(Integer dataFlag) {
this.dataFlag = dataFlag;
}
public Long getAppId() {
return appId;
}
public void setAppId(Long appId) {
this.appId = appId;
}
public Integer getIsDelete() {
return isDelete;
}
public void setIsDelete(Integer isDelete) {
this.isDelete = isDelete;
}
public String getMenuMark() {
return menuMark;
} }
public void setMenuMark(String menuMark) { public void setMenuId(Long menuId) {
this.menuMark = menuMark; this.menuId = menuId;
} }
public String getRemark() { public String getRemark() {
...@@ -209,18 +88,7 @@ public class AtlTimeMenu implements Serializable { ...@@ -209,18 +88,7 @@ public class AtlTimeMenu implements Serializable {
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", timeId=").append(timeId); sb.append(", timeId=").append(timeId);
sb.append(", menuName=").append(menuName); sb.append(", menuId=").append(menuId);
sb.append(", menuUrl=").append(menuUrl);
sb.append(", menuOtherUrl=").append(menuOtherUrl);
sb.append(", menuType=").append(menuType);
sb.append(", isShow=").append(isShow);
sb.append(", isOpen=").append(isOpen);
sb.append(", isInstall=").append(isInstall);
sb.append(", menuSort=").append(menuSort);
sb.append(", dataFlag=").append(dataFlag);
sb.append(", appId=").append(appId);
sb.append(", isDelete=").append(isDelete);
sb.append(", menuMark=").append(menuMark);
sb.append(", remark=").append(remark); sb.append(", remark=").append(remark);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
......
src/main/java/com/hwstudio/antaile/queryparam/QueryAliossAndOrderParam.java 0 → 100644
package com.hwstudio.antaile.queryparam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/12
* description: 查询应用订单与oss配置数据
*/
@Data
public class QueryAliossAndOrderParam implements Serializable {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "是否支付(0是|1否)")
private Integer isPay;
}
src/main/java/com/hwstudio/antaile/queryparam/QueryAppstoreIsBuyParam.java 0 → 100644
package com.hwstudio.antaile.queryparam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/12
* description: 查询应用商店是否购买 所需要的传递的参数
*/
@Data
public class QueryAppstoreIsBuyParam implements Serializable {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "appIds 多个appId根据逗号隔开")
private String appIds;
}
src/main/java/com/hwstudio/antaile/queryparam/QueryAtlAppstoreOrderParam.java 0 → 100644
package com.hwstudio.antaile.queryparam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@Data
public class QueryAtlAppstoreOrderParam implements Serializable {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "是否菜单(0是|1否)")
private Integer isMenu;
}
src/main/java/com/hwstudio/antaile/queryparam/QueryAtlAppstoreParam.java 0 → 100644
package com.hwstudio.antaile.queryparam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@Data
public class QueryAtlAppstoreParam implements Serializable {
@ApiModelProperty(value = "应用商店分类id 1基础模块(时光纪)2应用模块(时光纪)3插件模块(时光纪)4展示端模块(时光纪)5应用模块（自传书）6阅读模块(自传书)")
private Long catsId;
}
src/main/java/com/hwstudio/antaile/queryparam/QueryAtlTimeMenuParam.java 0 → 100644
package com.hwstudio.antaile.queryparam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Author xh
* @Date 2021/7/13
* description:
*/
@Data
public class QueryAtlTimeMenuParam implements Serializable {
@ApiModelProperty(value = "时光纪id")
private Long timeId;
@ApiModelProperty(value = "是否需要查询默认菜单 0是 1否")
private Integer isQueryDefault;
}
src/main/java/com/hwstudio/antaile/service/AtlAppAliossService.java 0 → 100644
package com.hwstudio.antaile.service;
import com.hwstudio.antaile.InsertParam.InsertAtlAppAliossParam;
import com.hwstudio.antaile.common.BeanUtils;
import com.hwstudio.antaile.common.Constants;
import com.hwstudio.antaile.dto.AtlAppAliossDTO;
import com.hwstudio.antaile.mapper.AtlAppAliossDao;
import com.hwstudio.antaile.mapper.AtlAppstoreDao;
import com.hwstudio.antaile.mbg.mapper.AtlAppAliossMapper;
import com.hwstudio.antaile.mbg.mapper.AtlAppstoreOrderMapper;
import com.hwstudio.antaile.mbg.po.AtlAppAlioss;
import com.hwstudio.antaile.mbg.po.AtlAppAliossExample;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
import com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam;
import com.hwstudio.antaile.utils.JsonResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/12
* description:
*/
@Service
public class AtlAppAliossService {
@Resource
private AtlAppAliossMapper atlAppAliossMapper;
@Resource
private AtlAppstoreOrderMapper atlAppstoreOrderMapper;
@Resource
private AtlAppAliossDao atlAppAliossDao;
/**
* 校验用户是使用自己的oss还是平台的
* @param queryAliossAndOrderParam
* @return
*/
public JsonResult checkUserOss(QueryAliossAndOrderParam queryAliossAndOrderParam){
//查询已支付的订单
queryAliossAndOrderParam.setIsPay(0);
AtlAppAliossDTO atlAppAliossDTO = this.selectAtlAppAliossByOther(queryAliossAndOrderParam);
if(atlAppAliossDTO == null){
return JsonResult.failed("没有相关订单数据");
}
if(!atlAppAliossDTO.getIsInstall().equals(0)){
return JsonResult.failed("没有安装oss插件");
}
if(!atlAppAliossDTO.getIsOpen().equals(0)){
return JsonResult.failed("没有开启oss");
}
return JsonResult.success("查询oss成功",atlAppAliossDTO );
}
/**
* 根据所需条件查询 oss配置数据
* @param queryAliossAndOrderParam
* @return
*/
public AtlAppAliossDTO selectAtlAppAliossByOther(QueryAliossAndOrderParam queryAliossAndOrderParam){
return this.atlAppAliossDao.selectAtlAppAliossByOther(queryAliossAndOrderParam);
}
/**
* 新增一条阿里云oss订单配置数据
*
* @param insertAtlAppAliossParam
* @return
*/
public JsonResult insertAtlAppAlioss(InsertAtlAppAliossParam insertAtlAppAliossParam) {
JsonResult res = this.checkAtlAppAlioss(insertAtlAppAliossParam);
if (res.getStatus().equals(Constants.RESPONSE_STATUS_500)) {
return res;
}
AtlAppAlioss atlAppAlioss = new AtlAppAlioss();
BeanUtils.copyProperties(insertAtlAppAliossParam, atlAppAlioss);
this.atlAppAliossMapper.insertSelective(atlAppAlioss);
return JsonResult.success("新增成功");
}
/**
* 根据appOrderId 查询一条oss数据
*
* @param appOrderId
* @return
*/
public AtlAppAlioss selectOneByAppOrderId(Long appOrderId) {
if (appOrderId == null) {
return null;
}
AtlAppAliossExample example = new AtlAppAliossExample();
AtlAppAliossExample.Criteria criteria = example.createCriteria();
criteria.andAppOrderIdEqualTo(appOrderId);
criteria.andIsDeleteEqualTo(0);
List<AtlAppAlioss> atlAppAliossList = this.atlAppAliossMapper.selectByExample(example);
if (atlAppAliossList == null || atlAppAliossList.size() <= 0) {
return null;
}
return atlAppAliossList.get(0);
}
/**
* 根据阿里云oss订单配置id 修改配置数据
*
* @param atlAppAlioss
* @return
*/
public JsonResult updateByAtlAppAliossId(AtlAppAlioss atlAppAlioss) {
if (atlAppAlioss.getId() == null) {
return JsonResult.failed("传入id为空");
}
this.atlAppAliossMapper.updateByPrimaryKeySelective(atlAppAlioss);
return JsonResult.success("修改成功");
}
public JsonResult checkAtlAppAlioss(InsertAtlAppAliossParam insertAtlAppAliossParam) {
if (insertAtlAppAliossParam.getAppOrderId() == null) {
return JsonResult.failed("传入订单id为空");
} else {
AtlAppstoreOrder atlAppstoreOrder = this.atlAppstoreOrderMapper.selectByPrimaryKey(insertAtlAppAliossParam.getAppOrderId());
if (atlAppstoreOrder == null) {
return JsonResult.failed("传入订单id有误");
}
}
if (insertAtlAppAliossParam.getAccessKeyId() == null || insertAtlAppAliossParam.getAccessKeyId().isEmpty()) {
return JsonResult.failed("传入AccessKey为空");
}
if (insertAtlAppAliossParam.getAccessKeySecret() == null || insertAtlAppAliossParam.getAccessKeySecret().isEmpty()) {
return JsonResult.failed("传入AccessKeySecret为空");
}
if (insertAtlAppAliossParam.getEndpoint() == null || insertAtlAppAliossParam.getEndpoint().isEmpty()) {
return JsonResult.failed("传入endpoint为空");
}
if (insertAtlAppAliossParam.getBucket() == null || insertAtlAppAliossParam.getBucket().isEmpty()) {
return JsonResult.failed("传入bucket为空");
}
return JsonResult.success("校验通过");
}
}
src/main/java/com/hwstudio/antaile/service/AtlAppStoreOrderService.java 0 → 100644
package com.hwstudio.antaile.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hwstudio.antaile.InsertParam.InsertAppstoreOrderParam;
import com.hwstudio.antaile.common.BeanUtils;
import com.hwstudio.antaile.common.Constants;
import com.hwstudio.antaile.dto.AtlAppstoreOrderDTO;
import com.hwstudio.antaile.mapper.AtlAppstoreOrderDao;
import com.hwstudio.antaile.mbg.mapper.AtlAppstoreOrderMapper;
import com.hwstudio.antaile.mbg.po.AtlAppstore;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
import com.hwstudio.antaile.mbg.po.AtlAppstoreOrderExample;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreOrderParam;
import com.hwstudio.antaile.utils.CommonPage;
import com.hwstudio.antaile.utils.JsonResult;
import com.hwstudio.antaile.utils.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/8
* description:
*/
@Service
public class AtlAppStoreOrderService {
@Resource
private AtlAppstoreOrderMapper atlAppstoreOrderMapper;
@Resource
private AtlAppstoreOrderDao atlAppstoreOrderDao;
@Autowired
private AtlAppStoreService atlAppStoreService;
/**
* 根据应用订单id修改一条订单数据
*
* @param atlAppstoreOrder
* @return
*/
@Transactional(rollbackFor = Exception.class)
public JsonResult updateAppstoreOrderById(AtlAppstoreOrder atlAppstoreOrder) {
if (atlAppstoreOrder.getId() == null) {
return JsonResult.failed("传入订单id为空");
}
this.atlAppstoreOrderMapper.updateByPrimaryKeySelective(atlAppstoreOrder);
return JsonResult.success("修改成功");
}
/**
* 用户查询我的订单数据
*
* @param queryAtlAppstoreOrderParam
* @param page
* @return
*/
public CommonPage<AtlAppstoreOrderDTO> selectAtlAppstoreOrderList(QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam, Page page) {
if (page != null && page.getPageNum() != null && page.getPageSize() != null) {
PageHelper.startPage(page.getPageNum(), page.getPageSize());
}
List<AtlAppstoreOrderDTO> atlAppstoreOrderDTOList = this.atlAppstoreOrderDao.selectAtlAppstoreOrderList(queryAtlAppstoreOrderParam);
//记录下 pagehelper第一次分页查询的 返回得总条数 等信息
PageInfo<AtlAppstoreOrderDTO> pageInfo = new PageInfo<>(atlAppstoreOrderDTOList);
//因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
CommonPage<AtlAppstoreOrderDTO> result = new CommonPage<AtlAppstoreOrderDTO>();
result.setTotalPage(pageInfo.getPages());
result.setPageNum(pageInfo.getPageNum());
result.setPageSize(pageInfo.getPageSize());
result.setTotal(pageInfo.getTotal());
result.setList(atlAppstoreOrderDTOList);
return result;
}
/**
* 生成订单
*
* @param insertAppstoreOrderParam
* @return
*/
public JsonResult generateAppstoreOrder(InsertAppstoreOrderParam insertAppstoreOrderParam) {
JsonResult res = this.checkAppstoreOrder(insertAppstoreOrderParam);
if (res.getStatus().equals(Constants.RESPONSE_STATUS_500)) {
return res;
}
AtlAppstoreOrder atlAppstoreOrder = new AtlAppstoreOrder();
BeanUtils.copyProperties(insertAppstoreOrderParam, atlAppstoreOrder);
//插入 生成订单号
atlAppstoreOrder.setOrderId(this.generateOrderNo());
//如果支付类型是免费的 跳过支付流程完成订单
if (insertAppstoreOrderParam.getPayType().equals(0)) {
atlAppstoreOrder.setPayTime(new Date());
atlAppstoreOrder.setIsPay(0);
}
this.atlAppstoreOrderMapper.insertSelective(atlAppstoreOrder);
//判断是否菜单 如果是菜单还需要将其加入到 时光纪菜单相关信息数据
return JsonResult.success("生成订单成功", atlAppstoreOrder);
}
/**
* 校验生成订单
*
* @param insertAppstoreOrderParam
* @return
*/
public JsonResult checkAppstoreOrder(InsertAppstoreOrderParam insertAppstoreOrderParam) {
if (insertAppstoreOrderParam.getUserId() == null) {
return JsonResult.failed("传入用户id为空");
}
if (insertAppstoreOrderParam.getOrderMoney() == null) {
return JsonResult.failed("传入订单金额为空");
}
if (insertAppstoreOrderParam.getPayType() == null) {
return JsonResult.failed("传入支付方式为空");
}
if(insertAppstoreOrderParam.getAppId() == null || insertAppstoreOrderParam.getAppId().isEmpty()){
return JsonResult.failed("传入appId为空");
}
if(this.checkIsBuyOrder(insertAppstoreOrderParam.getUserId(),insertAppstoreOrderParam.getAppId() )){
return JsonResult.failed("您已经购买过此应用，无需重复购买啦！");
}
return JsonResult.success("校验通过");
}
/**
* 生成订单号 生成规则：年月日时分秒 + 后4位时间戳 + 4位随机数
*
* @return
*/
public String generateOrderNo() {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String date = sdf.format(new Date());
String timeStamp = System.currentTimeMillis() + "";
String random = Math.round((Math.random() + 1) * 1000) + "";
return date + timeStamp.substring(timeStamp.length() - 4) + random;
}
/**
* 查询用户是否有无购买过此appId
*
* @param userId
* @param appId
* @return
*/
public Boolean checkIsBuyOrder(Long userId, String appId) {
AtlAppstoreOrderExample example = new AtlAppstoreOrderExample();
AtlAppstoreOrderExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId);
criteria.andAppIdEqualTo(appId);
//是否支付(0是|1否)
criteria.andIsPayEqualTo(0);
List<AtlAppstoreOrder> atlAppstoreOrders = this.atlAppstoreOrderMapper.selectByExample(example);
if (atlAppstoreOrders != null && atlAppstoreOrders.size() >= 0) {
return true;
}
return false;
}
/**
* 查询我的应用 根据appid分组 并且已支付的订单
*
* @param queryAtlAppstoreOrderParam
* @param page
* @return
*/
public CommonPage<AtlAppstoreOrderDTO> selectMyAtlAppstore(QueryAtlAppstoreOrderParam queryAtlAppstoreOrderParam, Page page) {
if (page != null && page.getPageNum() != null && page.getPageSize() != null) {
PageHelper.startPage(page.getPageNum(), page.getPageSize());
}
List<AtlAppstoreOrderDTO> atlAppstoreOrderDTOList = this.atlAppstoreOrderDao.selectMyAtlAppstore(queryAtlAppstoreOrderParam);
//记录下 pagehelper第一次分页查询的 返回得总条数 等信息
PageInfo<AtlAppstoreOrderDTO> pageInfo = new PageInfo<>(atlAppstoreOrderDTOList);
//因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
CommonPage<AtlAppstoreOrderDTO> result = new CommonPage<AtlAppstoreOrderDTO>();
result.setTotalPage(pageInfo.getPages());
result.setPageNum(pageInfo.getPageNum());
result.setPageSize(pageInfo.getPageSize());
result.setTotal(pageInfo.getTotal());
result.setList(atlAppstoreOrderDTOList);
return result;
}
}
src/main/java/com/hwstudio/antaile/service/AtlAppStoreService.java 0 → 100644
package com.hwstudio.antaile.service;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hwstudio.antaile.dto.AtlAppstoreDTO;
import com.hwstudio.antaile.mapper.AtlAppstoreDao;
import com.hwstudio.antaile.mbg.mapper.AtlAppstoreMapper;
import com.hwstudio.antaile.mbg.po.AtlAppstore;
import com.hwstudio.antaile.mbg.po.AtlAppstoreExample;
import com.hwstudio.antaile.queryparam.QueryAppstoreIsBuyParam;
import com.hwstudio.antaile.queryparam.QueryAtlAppstoreParam;
import com.hwstudio.antaile.utils.CommonPage;
import com.hwstudio.antaile.utils.JsonResult;
import com.hwstudio.antaile.utils.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author xh
* @Date 2021/7/8
* description:
*/
@Service
public class AtlAppStoreService {
@Resource
private AtlAppstoreMapper atlAppstoreMapper;
@Resource
private AtlAppstoreDao atlAppstoreDao;
@Autowired
private AtlAppStoreOrderService atlAppStoreOrderService;
/**
* 根据appId查询一条应用数据信息
*
* @param appId
* @return
*/
public AtlAppstore selectOneByAppId(String appId) {
AtlAppstoreExample example = new AtlAppstoreExample();
AtlAppstoreExample.Criteria criteria = example.createCriteria();
criteria.andAppIdEqualTo(appId);
List<AtlAppstore> atlAppstoreList = this.atlAppstoreMapper.selectByExample(example);
if(atlAppstoreList == null || atlAppstoreList.size()<= 0){
return null;
}
return atlAppstoreList.get(0);
}
/**
* 分页查询留言List 不分页不传递分页参数
*
* @param queryAtlAppstoreParam
* @param page
* @return
*/
public CommonPage<AtlAppstoreDTO> selectAtlAppstoreListByOther(QueryAtlAppstoreParam queryAtlAppstoreParam, Page page) {
if (page != null && page.getPageNum() != null && page.getPageSize() != null) {
PageHelper.startPage(page.getPageNum(), page.getPageSize());
}
List<AtlAppstoreDTO> atlAppstoreDTOList = this.atlAppstoreDao.selectAtlAppstoreListByOther(queryAtlAppstoreParam);
//记录下 pagehelper第一次分页查询的 返回得总条数 等信息
PageInfo<AtlAppstoreDTO> pageInfo = new PageInfo<>(atlAppstoreDTOList);
//因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
CommonPage<AtlAppstoreDTO> result = new CommonPage<AtlAppstoreDTO>();
result.setTotalPage(pageInfo.getPages());
result.setPageNum(pageInfo.getPageNum());
result.setPageSize(pageInfo.getPageSize());
result.setTotal(pageInfo.getTotal());
result.setList(atlAppstoreDTOList);
return result;
}
/**
* 查询appIds(多个appid逗号隔开) 与 userId是否购买过
*
* @param queryAppstoreIsBuyParam
* @return
*/
public JsonResult checkAppIsbuy(QueryAppstoreIsBuyParam queryAppstoreIsBuyParam) {
if (queryAppstoreIsBuyParam.getAppIds() == null || queryAppstoreIsBuyParam.getAppIds().isEmpty()) {
return JsonResult.failed("传入appids为空");
}
if (queryAppstoreIsBuyParam.getUserId() == null) {
return JsonResult.failed("传入用户id为空");
}
Map<String, Boolean> map = new HashMap<>();
String[] appIdList = queryAppstoreIsBuyParam.getAppIds().split(",");
for (String appId : appIdList) {
map.put(appId, this.atlAppStoreOrderService.checkIsBuyOrder(queryAppstoreIsBuyParam.getUserId(), appId));
}
return JsonResult.success("查询成功", map);
}
}
src/main/java/com/hwstudio/antaile/service/AtlTimeMenuService.java 0 → 100644
package com.hwstudio.antaile.service;
import com.hwstudio.antaile.InsertParam.InsertAtlTimeMenuParam;
import com.hwstudio.antaile.mbg.mapper.AtlMenuMapper;
import com.hwstudio.antaile.mbg.mapper.AtlTimeMenuMapper;
import com.hwstudio.antaile.mbg.po.AtlMenu;
import com.hwstudio.antaile.mbg.po.AtlMenuExample;
import com.hwstudio.antaile.mbg.po.AtlTimeMenu;
import com.hwstudio.antaile.mbg.po.AtlTimeMenuExample;
import com.hwstudio.antaile.queryparam.QueryAtlTimeMenuParam;
import com.hwstudio.antaile.utils.JsonResult;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
* @Author xh
* @Date 2021/7/13
* description:
*/
@Service
public class AtlTimeMenuService {
@Resource
private AtlTimeMenuMapper atlTimeMenuMapper;
@Resource
private AtlMenuMapper atlMenuMapper;
/**
* 插入时光纪与菜单关系
*
* @param insertAtlTimeMenuParam
* @return
*/
@Transactional(rollbackFor = Exception.class)
public JsonResult insertAtlTimeMenu(InsertAtlTimeMenuParam insertAtlTimeMenuParam) {
if (insertAtlTimeMenuParam.getTimeId() == null) {
return JsonResult.failed("传入时光纪id为空");
}
if (insertAtlTimeMenuParam.getMenuIds() == null || insertAtlTimeMenuParam.getMenuIds().isEmpty()) {
return JsonResult.failed("传入菜单ids为空");
}
//插入前先将之前时光纪id 与菜单清除
AtlTimeMenuExample example = new AtlTimeMenuExample();
AtlTimeMenuExample.Criteria criteria = example.createCriteria();
criteria.andTimeIdEqualTo(insertAtlTimeMenuParam.getTimeId());
this.atlTimeMenuMapper.deleteByExample(example);
//循环插入
String[] menuIdList = insertAtlTimeMenuParam.getMenuIds().split(",");
AtlTimeMenu atlTimeMenu = new AtlTimeMenu();
atlTimeMenu.setTimeId(insertAtlTimeMenuParam.getTimeId());
for (String menuId : menuIdList) {
atlTimeMenu.setMenuId(Long.valueOf(menuId));
this.atlTimeMenuMapper.insertSelective(atlTimeMenu);
}
return JsonResult.success("操作成功");
}
/**
* 查询时光纪相关菜单
*
* @param queryAtlTimeMenuParam
* @return
*/
public JsonResult selectTimeMenu(QueryAtlTimeMenuParam queryAtlTimeMenuParam) {
//如果有传默认查询默认菜单 将查询默认菜单 否则只查询时光纪以相关的菜单
if (queryAtlTimeMenuParam.getTimeId() == null) {
return JsonResult.failed("传入时光纪id为空");
}
//查询时光纪相关的菜单
AtlTimeMenuExample example = new AtlTimeMenuExample();
AtlTimeMenuExample.Criteria criteria = example.createCriteria();
criteria.andTimeIdEqualTo(queryAtlTimeMenuParam.getTimeId());
List<AtlTimeMenu> atlTimeMenuList = this.atlTimeMenuMapper.selectByExample(example);
//要返回的菜单List
List<AtlMenu> atlMenuList = new ArrayList<>();
if (atlTimeMenuList != null && atlTimeMenuList.size() > 0) {
for (AtlTimeMenu atlTimeMenu : atlTimeMenuList) {
AtlMenu atlMenu = this.atlMenuMapper.selectByPrimaryKey(atlTimeMenu.getMenuId());
if (atlMenu != null) {
atlMenuList.add(atlMenu);
}
}
}
//如果需要查询默认菜单
if (queryAtlTimeMenuParam.getIsQueryDefault().equals(0)) {
//查询默认菜单 一起返回
AtlMenuExample exampleMenu = new AtlMenuExample();
AtlMenuExample.Criteria criteriaMenu = exampleMenu.createCriteria();
//是否显示 0隐藏 1显示
criteriaMenu.andIsShowEqualTo(1);
//数据标识 0无效 1有效
criteriaMenu.andDataFlagEqualTo(1);
//是否默认菜单(0是|1否)
criteriaMenu.andDefaultMenuEqualTo(0);
//删除标志(0|正常|1删除)
criteriaMenu.andIsDeleteEqualTo(0);
List<AtlMenu> atlMenuList1 = this.atlMenuMapper.selectByExample(exampleMenu);
//全部加入到上面的List去
atlMenuList.addAll(atlMenuList1);
}
return JsonResult.success("查询菜单成功", atlMenuList);
}
}
src/main/java/com/hwstudio/antaile/utils/AppleUtil.java 0 → 100644
package com.hwstudio.antaile.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.auth0.jwk.Jwk;
import io.jsonwebtoken.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.tomcat.util.codec.binary.Base64;
import org.junit.Test;
import org.springframework.web.client.RestTemplate;
import java.nio.charset.StandardCharsets;
import java.security.PublicKey;
import java.util.stream.Collectors;
/**
* @Author xh
* @Date 2021/7/9
* description:
*/
@Slf4j
public class AppleUtil {
/**
* 获取苹果的公钥
*
* @return
* @throws Exception
*/
private static JSONArray getAuthKeys() {
String url = "https://appleid.apple.com/auth/keys";
RestTemplate restTemplate = new RestTemplate();
JSONObject json = restTemplate.getForObject(url, JSONObject.class);
JSONArray arr = json.getJSONArray("keys");
return arr;
}
@Test
public void test1() {
String identityToken = "eyJraWQiOiJlWGF1bm1MIiwiYWxnIjoiUlMyNTYifQ.eyJpc3MiOiJodHRwczovL2FwcGxlaWQuYXBwbGUuY29tIiwiYXVkIjoiY29tLmRpeWl5aW4ub25saW5lNTMiLCJleHAiOjE1OTc2NTAxNzQsImlhdCI6MTU5NzY0OTU3NCwic3ViIjoiMDAxMzc3LmQ0ZDVmMTAwODQ0ZTQzZjdiMWM1OWRiMzUyZWZkZmI4LjAyNTkiLCJjX2hhc2giOiJkTDVRdld2VTNjVHBxczNSazlUTnRBIiwiZW1haWwiOiI0OTk4OTY1MDdAcXEuY29tIiwiZW1haWxfdmVyaWZpZWQiOiJ0cnVlIiwiYXV0aF90aW1lIjoxNTk3NjQ5NTc0LCJub25jZV9zdXBwb3J0ZWQiOnRydWV9.hM9HjNsMJW2PjYP7SfbzF-GqOt0VnMjYGq4BoU68rkQ-K2lPp_ae5ziX6Bbr3WHg6cc3Z8OzGO63OfExvSj9gQTR596CZLvNGXhbI3piTK6597-cYsPCTbY7xHxgdHLuL8XhD-9dXPn9rouVYu4QA18JBQG1Q4sGsRzLEJ5DjOM9x1bkBz4Vu_5LEOefHFHkWN_RPCh_AOJGviDzm81kTkCTWn8jpm0tGdevMR93MOf44f7bjP2T8yezl0Vbv09TrnkdAqG0BsihCD0VN9JV7X2eagyumoxTdFfoRiOflFKAaQqohVzcqy9tHOGm_6w5h8bsRCmtBC4PnqIFqNy_AQ";
boolean flag = this.verify(identityToken);
String str1 = new String(Base64.decodeBase64(identityToken), StandardCharsets.UTF_8);
String objStr=str1.substring(str1.indexOf("{")+1,str1.indexOf("}"));
str1 = "{"+objStr+"}";
JSONObject str1Json = JSON.parseObject(str1);
String kid = str1Json.get("kid")+"";
System.out.println(str1);
String url = "https://appleid.apple.com/auth/keys";
RestTemplate restTemplate = new RestTemplate();
JSONObject json = restTemplate.getForObject(url, JSONObject.class);
JSONArray arrKeys = json.getJSONArray("keys");
String authKey = "";
Object choose = null;
for (Object item : arrKeys){
JSONObject str2Json = JSON.parseObject(item+"");
String kidKey = str2Json.get("kid")+"";
if(kid.equals(kidKey)){
authKey = str2Json.get("n")+"";
choose = item;
}
}
boolean flag2 = this.verifyExc(identityToken,JSON.parseObject(choose+"") );
String[] arr = identityToken.split("\\.");
String decode = new String(Base64.decodeBase64(arr[1]));
String substring = decode.substring(0, decode.indexOf("}") + 1);
JSONObject jsonObject = JSON.parseObject(substring);
System.out.println(jsonObject);
}
public Boolean verify(String jwt) {
JSONArray arr = getAuthKeys();
if (arr == null) {
return false;
}
JSONObject authKey = null;
//先取苹果第一个key进行校验
authKey = JSONObject.parseObject(arr.getString(0));
if (verifyExc(jwt, authKey)) {
return true;
} else {
//再取第二个key校验
authKey = JSONObject.parseObject(arr.getString(1));
return verifyExc(jwt, authKey);
}
}
/**
* 对前端传来的identityToken进行验证
*
* @param jwt 对应前端传来的 identityToken
* @param authKey 苹果的公钥 authKey
* @return
* @throws Exception
*/
public Boolean verifyExc(String jwt, JSONObject authKey) {
Jwk jwa = Jwk.fromValues(authKey);
PublicKey publicKey = null;
try {
publicKey = jwa.getPublicKey();
} catch (Exception e) {
log.error("苹果公钥获取失败：" + e.toString());
e.printStackTrace();
}
String aud = "";
String sub = "";
if (jwt.split("\\.").length > 1) {
String claim = new String(Base64.decodeBase64(jwt.split("\\.")[1]));
aud = JSONObject.parseObject(claim).get("aud").toString();
sub = JSONObject.parseObject(claim).get("sub").toString();
}
JwtParser jwtParser = Jwts.parser().setSigningKey(publicKey);
jwtParser.requireIssuer("https://appleid.apple.com");
jwtParser.requireAudience(aud);
jwtParser.requireSubject(sub);
try {
Jws<Claims> claim = jwtParser.parseClaimsJws(jwt);
if (claim != null && claim.getBody().containsKey("auth_time")) {
System.out.println(claim);
return true;
}
return false;
} catch (ExpiredJwtException e) {
log.error("apple identityToken expired", e);
return false;
} catch (Exception e) {
log.error("apple identityToken illegal", e);
return false;
}
}
/**
* 对前端传来的JWT字符串identityToken的第二部分进行解码
* 主要获取其中的aud和sub，aud大概对应ios前端的包名，sub大概对应当前用户的授权的openID
*
* @param identityToken
* @return {"aud":"com.xkj.****","sub":"000***.8da764d3f9e34d2183e8da08a1057***.0***","c_hash":"UsKAuEoI-****","email_verified":"true","auth_time":1574673481,"iss":"https://appleid.apple.com","exp":1574674081,"iat":1574673481,"email":"****@qq.com"}
* sub : 用户openid
*/
public static JSONObject parserIdentityToken(String identityToken) {
String[] arr = identityToken.split("\\.");
String decode = new String(Base64.decodeBase64(arr[1]));
String substring = decode.substring(0, decode.indexOf("}") + 1);
JSONObject jsonObject = JSON.parseObject(substring);
return jsonObject;
}
/**
* 获取publicKey 的算法id
*
* @param identityToken 苹果token的第一部分
* @return String
*/
public static String getKid(String identityToken) {
String kid = null;
try {
String str1 = new String(Base64.decodeBase64(identityToken), StandardCharsets.UTF_8);
System.out.println(str1);
} catch (Exception e) {
log.error("get kid fail,e={}", e);
}
return kid;
}
}
src/main/resources/mapping/AtlAppAliossDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.hwstudio.antaile.mapper.AtlAppAliossDao" >
<select id="selectAtlAppAliossByOther" parameterType="com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam" resultType="com.hwstudio.antaile.dto.AtlAppAliossDTO">
select
a.id,a.app_order_id appOrderId,a.access_key_id accessKeyId,
a.access_key_secret accessKeySecret,a.endpoint,a.bucket,a.oss_url ossUrl,
a.is_save_local isSaveLocal,a.create_time createTime,
b.is_install isInstall,b.is_open isOpen
from atl_app_alioss a
inner join atl_appstore_order b ON a.app_order_id = b.id
where 1 = 1
<if test="userId != null">
and b.user_id = #{userId}
</if>
<if test="isPay != null">
and b.is_pay =#{isPay}
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapping/AtlAppstoreDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.hwstudio.antaile.mapper.AtlAppstoreDao" >
<select id="selectAtlAppstoreListByOther" parameterType="com.hwstudio.antaile.queryparam.QueryAtlAppstoreParam" resultType="com.hwstudio.antaile.dto.AtlAppstoreDTO">
select
a.id,a.cats_id catsId,a.app_id appId,a.app_images appImages,a.app_developer appDeveloper,a.app_price1 appPrice1,a.app_price2 appPrice2,
a.sale_num saleNum,a.is_sale isSale,a.is_recom isRecom,a.is_menu isMenu,a.menu_id menuId,a.create_time createTime,
b.name catsName
from atl_appstore a
left join atl_appstore_cats b ON a.cats_id = b.id
where 1 = 1
and a.is_sale = 0
<if test=" catsId != null">
and a.cats_id =#{catsId}
</if>
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapping/AtlAppstoreOrderDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.hwstudio.antaile.mapper.AtlAppstoreOrderDao" >
<select id="selectAtlAppstoreOrderList" parameterType="com.hwstudio.antaile.queryparam.QueryAtlAppstoreOrderParam" resultType="com.hwstudio.antaile.dto.AtlAppstoreOrderDTO">
select
a.id,a.user_id userId,a.order_id orderId,a.order_money orderMoney,
a.pay_type payType,a.is_pay isPay,a.app_id appId,a.is_install isInstall,
a.is_open isOpen,a.pay_time payTime,a.create_time createTime,
b.app_name appName,b.app_developer appDeveloper,b.app_name appName
from
atl_appstore_order a
left join atl_appstore b ON a.app_id = b.app_id
where 1 = 1
<if test="userId != null">
and a.user_id = #{userId}
</if>
</select>
<select id="selectMyAtlAppstore" parameterType="com.hwstudio.antaile.queryparam.QueryAtlAppstoreOrderParam" resultType="com.hwstudio.antaile.dto.AtlAppstoreOrderDTO">
select
a.id,a.user_id userId,a.order_id orderId,a.order_money orderMoney,
a.pay_type payType,a.is_pay isPay,a.app_id appId,a.is_install isInstall,
a.is_open isOpen,a.pay_time payTime,a.create_time createTime,
b.app_name appName,b.app_developer appDeveloper,b.app_name appName,
b.app_introduce appIntroduce,b.app_images appImages,b.is_menu isMenu,b.menu_id menuId,
c.menu_name menuName,
count(a.app_id) buyNumber
from
atl_appstore_order a
left join atl_appstore b ON a.app_id = b.app_id
left join atl_menu c ON b.menu_id = c.id
where 1 = 1
and a.is_pay = 0
<if test="userId != null">
and a.user_id = #{userId}
</if>
<if test="isMenu != null">
and b.is_menu =#{isMenu}
</if>
group by a.app_id
order by a.create_time asc
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapping/AtlTimeMapper.xml
...@@ -282,10 +282,17 @@ ...@@ -282,10 +282,17 @@
select select
a.id,a.template_id templateId,a.name,a.cover_url coverUrl a.id,a.template_id templateId,a.name,a.cover_url coverUrl
from atl_time a from atl_time a
left join atl_time_owner b ON a.id = b.time_id
where a.status = 1 where a.status = 1
<if test="isCommend != null"> <if test="isCommend != null">
and a.is_commend =#{isCommend} and a.is_commend =#{isCommend}
</if> </if>
<if test="isFindCommend != null">
and a.is_find_commend =#{isFindCommend}
</if>
<if test="livingState != null">
and b.living_state =#{livingState}
</if>
order by a.create_date desc order by a.create_date desc
</select> </select>
......
src/main/resources/mapping/AtlTimeMenuDao.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.hwstudio.antaile.mapper.AtlTimeMenuDao" >
</mapper>
\ No newline at end of file
src/main/resources/mapping/mbg/AtlAppAliossMapper.xml
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
<resultMap id="BaseResultMap" type="com.hwstudio.antaile.mbg.po.AtlAppAlioss"> <resultMap id="BaseResultMap" type="com.hwstudio.antaile.mbg.po.AtlAppAlioss">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="cats_id" jdbcType="BIGINT" property="catsId" /> <result column="cats_id" jdbcType="BIGINT" property="catsId" />
<result column="time_id" jdbcType="BIGINT" property="timeId" /> <result column="app_order_id" jdbcType="BIGINT" property="appOrderId" />
<result column="access_key_id" jdbcType="VARCHAR" property="accessKeyId" /> <result column="access_key_id" jdbcType="VARCHAR" property="accessKeyId" />
<result column="access_key_secret" jdbcType="VARCHAR" property="accessKeySecret" /> <result column="access_key_secret" jdbcType="VARCHAR" property="accessKeySecret" />
<result column="endpoint" jdbcType="VARCHAR" property="endpoint" /> <result column="endpoint" jdbcType="VARCHAR" property="endpoint" />
<result column="bucket" jdbcType="VARCHAR" property="bucket" /> <result column="bucket" jdbcType="VARCHAR" property="bucket" />
<result column="oss_url" jdbcType="VARCHAR" property="ossUrl" /> <result column="oss_url" jdbcType="VARCHAR" property="ossUrl" />
<result column="is_save_local" jdbcType="TINYINT" property="isSaveLocal" /> <result column="is_save_local" jdbcType="TINYINT" property="isSaveLocal" />
<result column="is_open" jdbcType="TINYINT" property="isOpen" />
<result column="is_delete" jdbcType="TINYINT" property="isDelete" /> <result column="is_delete" jdbcType="TINYINT" property="isDelete" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
...@@ -76,8 +75,8 @@ ...@@ -76,8 +75,8 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, cats_id, time_id, access_key_id, access_key_secret, endpoint, bucket, oss_url, id, cats_id, app_order_id, access_key_id, access_key_secret, endpoint, bucket, oss_url,
is_save_local, is_open, is_delete, remark, create_time, update_time is_save_local, is_delete, remark, create_time, update_time
</sql> </sql>
<select id="selectByExample" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAliossExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAliossExample" resultMap="BaseResultMap">
select select
...@@ -113,16 +112,16 @@ ...@@ -113,16 +112,16 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into atl_app_alioss (cats_id, time_id, access_key_id, insert into atl_app_alioss (cats_id, app_order_id, access_key_id,
access_key_secret, endpoint, bucket, access_key_secret, endpoint, bucket,
oss_url, is_save_local, is_open, oss_url, is_save_local, is_delete,
is_delete, remark, create_time, remark, create_time, update_time
update_time) )
values (#{catsId,jdbcType=BIGINT}, #{timeId,jdbcType=BIGINT}, #{accessKeyId,jdbcType=VARCHAR}, values (#{catsId,jdbcType=BIGINT}, #{appOrderId,jdbcType=BIGINT}, #{accessKeyId,jdbcType=VARCHAR},
#{accessKeySecret,jdbcType=VARCHAR}, #{endpoint,jdbcType=VARCHAR}, #{bucket,jdbcType=VARCHAR}, #{accessKeySecret,jdbcType=VARCHAR}, #{endpoint,jdbcType=VARCHAR}, #{bucket,jdbcType=VARCHAR},
#{ossUrl,jdbcType=VARCHAR}, #{isSaveLocal,jdbcType=TINYINT}, #{isOpen,jdbcType=TINYINT}, #{ossUrl,jdbcType=VARCHAR}, #{isSaveLocal,jdbcType=TINYINT}, #{isDelete,jdbcType=TINYINT},
#{isDelete,jdbcType=TINYINT}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
#{updateTime,jdbcType=TIMESTAMP}) )
</insert> </insert>
<insert id="insertSelective" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAlioss"> <insert id="insertSelective" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAlioss">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
...@@ -133,8 +132,8 @@ ...@@ -133,8 +132,8 @@
<if test="catsId != null"> <if test="catsId != null">
cats_id, cats_id,
</if> </if>
<if test="timeId != null"> <if test="appOrderId != null">
time_id, app_order_id,
</if> </if>
<if test="accessKeyId != null"> <if test="accessKeyId != null">
access_key_id, access_key_id,
...@@ -154,9 +153,6 @@ ...@@ -154,9 +153,6 @@
<if test="isSaveLocal != null"> <if test="isSaveLocal != null">
is_save_local, is_save_local,
</if> </if>
<if test="isOpen != null">
is_open,
</if>
<if test="isDelete != null"> <if test="isDelete != null">
is_delete, is_delete,
</if> </if>
...@@ -174,8 +170,8 @@ ...@@ -174,8 +170,8 @@
<if test="catsId != null"> <if test="catsId != null">
#{catsId,jdbcType=BIGINT}, #{catsId,jdbcType=BIGINT},
</if> </if>
<if test="timeId != null"> <if test="appOrderId != null">
#{timeId,jdbcType=BIGINT}, #{appOrderId,jdbcType=BIGINT},
</if> </if>
<if test="accessKeyId != null"> <if test="accessKeyId != null">
#{accessKeyId,jdbcType=VARCHAR}, #{accessKeyId,jdbcType=VARCHAR},
...@@ -195,9 +191,6 @@ ...@@ -195,9 +191,6 @@
<if test="isSaveLocal != null"> <if test="isSaveLocal != null">
#{isSaveLocal,jdbcType=TINYINT}, #{isSaveLocal,jdbcType=TINYINT},
</if> </if>
<if test="isOpen != null">
#{isOpen,jdbcType=TINYINT},
</if>
<if test="isDelete != null"> <if test="isDelete != null">
#{isDelete,jdbcType=TINYINT}, #{isDelete,jdbcType=TINYINT},
</if> </if>
...@@ -227,8 +220,8 @@ ...@@ -227,8 +220,8 @@
<if test="record.catsId != null"> <if test="record.catsId != null">
cats_id = #{record.catsId,jdbcType=BIGINT}, cats_id = #{record.catsId,jdbcType=BIGINT},
</if> </if>
<if test="record.timeId != null"> <if test="record.appOrderId != null">
time_id = #{record.timeId,jdbcType=BIGINT}, app_order_id = #{record.appOrderId,jdbcType=BIGINT},
</if> </if>
<if test="record.accessKeyId != null"> <if test="record.accessKeyId != null">
access_key_id = #{record.accessKeyId,jdbcType=VARCHAR}, access_key_id = #{record.accessKeyId,jdbcType=VARCHAR},
...@@ -248,9 +241,6 @@ ...@@ -248,9 +241,6 @@
<if test="record.isSaveLocal != null"> <if test="record.isSaveLocal != null">
is_save_local = #{record.isSaveLocal,jdbcType=TINYINT}, is_save_local = #{record.isSaveLocal,jdbcType=TINYINT},
</if> </if>
<if test="record.isOpen != null">
is_open = #{record.isOpen,jdbcType=TINYINT},
</if>
<if test="record.isDelete != null"> <if test="record.isDelete != null">
is_delete = #{record.isDelete,jdbcType=TINYINT}, is_delete = #{record.isDelete,jdbcType=TINYINT},
</if> </if>
...@@ -272,14 +262,13 @@ ...@@ -272,14 +262,13 @@
update atl_app_alioss update atl_app_alioss
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
cats_id = #{record.catsId,jdbcType=BIGINT}, cats_id = #{record.catsId,jdbcType=BIGINT},
time_id = #{record.timeId,jdbcType=BIGINT}, app_order_id = #{record.appOrderId,jdbcType=BIGINT},
access_key_id = #{record.accessKeyId,jdbcType=VARCHAR}, access_key_id = #{record.accessKeyId,jdbcType=VARCHAR},
access_key_secret = #{record.accessKeySecret,jdbcType=VARCHAR}, access_key_secret = #{record.accessKeySecret,jdbcType=VARCHAR},
endpoint = #{record.endpoint,jdbcType=VARCHAR}, endpoint = #{record.endpoint,jdbcType=VARCHAR},
bucket = #{record.bucket,jdbcType=VARCHAR}, bucket = #{record.bucket,jdbcType=VARCHAR},
oss_url = #{record.ossUrl,jdbcType=VARCHAR}, oss_url = #{record.ossUrl,jdbcType=VARCHAR},
is_save_local = #{record.isSaveLocal,jdbcType=TINYINT}, is_save_local = #{record.isSaveLocal,jdbcType=TINYINT},
is_open = #{record.isOpen,jdbcType=TINYINT},
is_delete = #{record.isDelete,jdbcType=TINYINT}, is_delete = #{record.isDelete,jdbcType=TINYINT},
remark = #{record.remark,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -294,8 +283,8 @@ ...@@ -294,8 +283,8 @@
<if test="catsId != null"> <if test="catsId != null">
cats_id = #{catsId,jdbcType=BIGINT}, cats_id = #{catsId,jdbcType=BIGINT},
</if> </if>
<if test="timeId != null"> <if test="appOrderId != null">
time_id = #{timeId,jdbcType=BIGINT}, app_order_id = #{appOrderId,jdbcType=BIGINT},
</if> </if>
<if test="accessKeyId != null"> <if test="accessKeyId != null">
access_key_id = #{accessKeyId,jdbcType=VARCHAR}, access_key_id = #{accessKeyId,jdbcType=VARCHAR},
...@@ -315,9 +304,6 @@ ...@@ -315,9 +304,6 @@
<if test="isSaveLocal != null"> <if test="isSaveLocal != null">
is_save_local = #{isSaveLocal,jdbcType=TINYINT}, is_save_local = #{isSaveLocal,jdbcType=TINYINT},
</if> </if>
<if test="isOpen != null">
is_open = #{isOpen,jdbcType=TINYINT},
</if>
<if test="isDelete != null"> <if test="isDelete != null">
is_delete = #{isDelete,jdbcType=TINYINT}, is_delete = #{isDelete,jdbcType=TINYINT},
</if> </if>
...@@ -336,14 +322,13 @@ ...@@ -336,14 +322,13 @@
<update id="updateByPrimaryKey" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAlioss"> <update id="updateByPrimaryKey" parameterType="com.hwstudio.antaile.mbg.po.AtlAppAlioss">
update atl_app_alioss update atl_app_alioss
set cats_id = #{catsId,jdbcType=BIGINT}, set cats_id = #{catsId,jdbcType=BIGINT},
time_id = #{timeId,jdbcType=BIGINT}, app_order_id = #{appOrderId,jdbcType=BIGINT},
access_key_id = #{accessKeyId,jdbcType=VARCHAR}, access_key_id = #{accessKeyId,jdbcType=VARCHAR},
access_key_secret = #{accessKeySecret,jdbcType=VARCHAR}, access_key_secret = #{accessKeySecret,jdbcType=VARCHAR},
endpoint = #{endpoint,jdbcType=VARCHAR}, endpoint = #{endpoint,jdbcType=VARCHAR},
bucket = #{bucket,jdbcType=VARCHAR}, bucket = #{bucket,jdbcType=VARCHAR},
oss_url = #{ossUrl,jdbcType=VARCHAR}, oss_url = #{ossUrl,jdbcType=VARCHAR},
is_save_local = #{isSaveLocal,jdbcType=TINYINT}, is_save_local = #{isSaveLocal,jdbcType=TINYINT},
is_open = #{isOpen,jdbcType=TINYINT},
is_delete = #{isDelete,jdbcType=TINYINT}, is_delete = #{isDelete,jdbcType=TINYINT},
remark = #{remark,jdbcType=VARCHAR}, remark = #{remark,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment